Prep v224: Sync root build files with upstream

diff --git a/.gitignore b/.gitignore
index 6a51fbbdcd94035ee59adf8e4140ec9dfbab63f9..009923cb9ed6c8d324f5c845e7905f3a2999f627 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -73,7 +73,6 @@
 /systemd-debug-generator
 /systemd-delta
 /systemd-detect-virt
-/systemd-efi-boot-generator
 /systemd-escape
 /systemd-export
 /systemd-firstboot

diff --git a/Makefile.am b/Makefile.am
index 9292e78a33ffb41a6b946228aee598a08b267743..6234d4bff938db82d2c6bed36b4a7de49ecd9dd5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=10
-LIBELOGIND_REVISION=0
+LIBELOGIND_REVISION=1
 LIBELOGIND_AGE=10
 
 # Dirs of external packages

diff --git a/NEWS b/NEWS
index 9fc6cc6e0003403cd886b5f53cd26280646be828..97dd000d4e86015af2398bcd8c3c6f5ab15ee9f7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
 systemd System and Service Manager
 
+CHANGES WITH 224:
+
+        * The systemd-efi-boot-generator functionality was merged into
+          systemd-gpt-auto-generator.
+
+        * systemd-networkd now supports Group Policy for vxlan devices. It can
+          be enabled via the new boolean configuration option called
+          'GroupPolicyExtension='.
+
+        Contributions from: Andreas Kempf, Christian Hesse, Daniel Mack, David
+        Herrmann, Herman Fries, Johannes Nixdorf, Kay Sievers, Lennart
+        Poettering, Peter Hutterer, Susant Sahani, Tom Gundersen
+
+        -- Berlin, 2015-07-31
+
 CHANGES WITH 223:
 
         * The python-systemd code has been removed from the systemd repository.
@@ -53,16 +68,17 @@ CHANGES WITH 223:
           mapped as 'vg-foo-TGID'.
 
         Contributions from: Beniamino Galvani, cee1, Christian Hesse, Daniel
-        Buch, Daniel Mack, daurnimator, David Herrmann, Dimitri John Ledkov, Jan
-        Alexander Steffens (heftig), Johan Ouwerkerk, Jose Carlos Venegas Munoz,
-        Kay Sievers, Lennart Poettering, Lidong Zhong, Martin Pitt, Michael
-        Biebl, Michael Olbrich, Michal Schmidt, Mike Gilbert, Namhyung Kim, Nick
-        Owens, Peter Hutterer, Richard Maw, Steven Allen, Sungbae Yoo, Susant
-        Sahani, Thomas Blume, Thomas Hindoe Paaboel Andersen, Tom Gundersen,
-        Umut Tezduyar Lindskog, Vito Caputo, Vivenzio Pagliari, Zbigniew
-        Jędrzejewski-Szmek
-
-        -- Berlin, 2015-XX-XX
+        Buch, Daniel Mack, daurnimator, David Herrmann, Dimitri John Ledkov,
+        HATAYAMA Daisuke, Ivan Shapovalov, Jan Alexander Steffens (heftig),
+        Johan Ouwerkerk, Jose Carlos Venegas Munoz, Karel Zak, Kay Sievers,
+        Lennart Poettering, Lidong Zhong, Martin Pitt, Michael Biebl, Michael
+        Olbrich, Michal Schmidt, Michal Sekletar, Mike Gilbert, Namhyung Kim,
+        Nick Owens, Peter Hutterer, Richard Maw, Steven Allen, Sungbae Yoo,
+        Susant Sahani, Thomas Blume, Thomas Hindoe Paaboel Andersen, Tom
+        Gundersen, Torstein Husebø, Umut Tezduyar Lindskog, Vito Caputo,
+        Vivenzio Pagliari, Zbigniew Jędrzejewski-Szmek
+
+        -- Berlin, 2015-07-29
 
 CHANGES WITH 222:
 

diff --git a/configure.ac b/configure.ac
index 8c5168b1296dcff7185b85e7d72e579a0875b9d5..8143f74a948ac4c001b6645192b064ea235c382a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([elogind],
-        [223],
+        [224],
         [https://github.com/elogind/elogind/issues],
         [elogind],
         [https://github.com/elogind/elogind])