diffstat for systemd-232 systemd-232 changelog | 8 ++++++ control | 45 ++++++++++++++++-------------------- patches/10-ignore-ucs-divered.quilt | 22 +++++++++++++++++ patches/series | 1 4 files changed, 52 insertions(+), 24 deletions(-) diff -Nru systemd-232/debian/changelog systemd-232/debian/changelog --- systemd-232/debian/changelog 2017-07-05 20:31:25.000000000 +0000 +++ systemd-232/debian/changelog 2017-11-22 18:02:08.000000000 +0000 @@ -1,3 +1,11 @@ +systemd (232-25+deb9u1A~4.3.0.201711221833) ucs4-3-0-0; urgency=low + + * UCS auto build. The following patches have been applied to the original source package + 01-fix-ftbfs + 10-ignore-ucs-divered + + -- Univention builddaemon Wed, 22 Nov 2017 19:02:08 +0100 + systemd (232-25+deb9u1) stretch; urgency=medium [ Dimitri John Ledkov ] diff -Nru systemd-232/debian/control systemd-232/debian/control --- systemd-232/debian/control 2017-07-05 20:31:25.000000000 +0000 +++ systemd-232/debian/control 2017-11-22 18:02:08.000000000 +0000 @@ -25,36 +25,36 @@ gnu-efi [amd64 i386 arm64], libcap-dev (>= 1:2.24-9~), libpam0g-dev, - libapparmor-dev (>= 2.9.0-3+exp2) , - libidn11-dev , - libiptc-dev | iptables-dev , - libaudit-dev , - libdbus-1-dev (>= 1.3.2) , - libcryptsetup-dev (>= 2:1.6.0) , + libapparmor-dev (>= 2.9.0-3+exp2), + libidn11-dev, + libiptc-dev | iptables-dev, + libaudit-dev, + libdbus-1-dev (>= 1.3.2), + libcryptsetup-dev (>= 2:1.6.0), libselinux1-dev (>= 2.1.9), libacl1-dev, liblzma-dev, liblz4-dev (>= 0.0~r125), - liblz4-tool , - libbz2-dev , - zlib1g-dev | libz-dev , - libcurl4-gnutls-dev | libcurl-dev , - libmicrohttpd-dev , - libgnutls28-dev , + liblz4-tool, + libbz2-dev, + zlib1g-dev | libz-dev, + libcurl4-gnutls-dev | libcurl-dev, + libmicrohttpd-dev, + libgnutls28-dev, libgcrypt20-dev, libkmod-dev (>= 15), libblkid-dev (>= 2.24), libmount-dev (>= 2.27.1), libseccomp-dev (>= 2.3.1) [amd64 arm64 armel armhf i386 mips mipsel mips64 mips64el x32 powerpc ppc64 ppc64el s390x], - libdw-dev (>= 0.158) , - linux-base , - acl , - python3:native, - python3-lxml:native, - python3-pyparsing , - tzdata , - libcap2-bin , - iproute2 , + libdw-dev (>= 0.158), + linux-base, + acl, + python3, + python3-lxml, + python3-pyparsing, + tzdata, + libcap2-bin, + iproute2, Package: systemd Architecture: linux-any @@ -128,7 +128,6 @@ link to systemd. Package: systemd-container -Build-Profiles: Architecture: linux-any Multi-Arch: foreign Section: admin @@ -148,7 +147,6 @@ * systemd-importd Package: systemd-journal-remote -Build-Profiles: Architecture: linux-any Multi-Arch: foreign Section: admin @@ -164,7 +162,6 @@ * systemd-journal-gatewayd Package: systemd-coredump -Build-Profiles: Architecture: linux-any Multi-Arch: foreign Section: admin diff -Nru systemd-232/debian/patches/10-ignore-ucs-divered.quilt systemd-232/debian/patches/10-ignore-ucs-divered.quilt --- systemd-232/debian/patches/10-ignore-ucs-divered.quilt 1970-01-01 00:00:00.000000000 +0000 +++ systemd-232/debian/patches/10-ignore-ucs-divered.quilt 2017-11-22 18:02:03.000000000 +0000 @@ -0,0 +1,22 @@ +Original patch adjusted for new upstream (Bug #45709) + +From: Philipp Hahn +Date: Wed, 11 Jan 2016 14:51:01 +0100 +Subject: util: Ignore files diverted by UCR + + +--- + src/basic/path-util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/path-util.c b/src/basic/path-util.c +--- a/src/basic/path-util.c ++++ b/src/basic/path-util.c +@@ -804,6 +804,7 @@ bool hidden_or_backup_file(const char *f + "dpkg-bak", + "dpkg-backup", + "dpkg-remove", ++ "debian", + "ucf-new", + "ucf-old", + "ucf-dist", diff -Nru systemd-232/debian/patches/series systemd-232/debian/patches/series --- systemd-232/debian/patches/series 2017-07-05 20:31:25.000000000 +0000 +++ systemd-232/debian/patches/series 2017-11-22 18:02:08.000000000 +0000 @@ -97,3 +97,4 @@ debian/Let-graphical-session-pre.target-be-manually-started.patch debian/Add-env-variable-for-machine-ID-path.patch cryptsetup-generator-run-cryptsetup-service-before-swap-u.patch +10-ignore-ucs-divered.quilt