gbp-pq export noise

diff --git a/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch b/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
index 34ac112d2f482ab9e4b8d90bc80e1e80cb95c8fb..7aaa6826fc3649fe55ee5db81edcbf5bcbcdfe63 100644 (file)
--- a/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
+++ b/debian/patches/Add-support-for-rcS.d-init-scripts-to-the-sysv-gener.patch
@@ -7,7 +7,7 @@ Subject: Add support for rcS.d init scripts to the sysv-generator
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 6dc8835..6cc2cd5 100644
+index c01d15e..b2a15cf 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -41,6 +41,7 @@
@@ -66,7 +66,7 @@ index 6dc8835..6cc2cd5 100644
                  yes_no(!s->pid_file));
  
          if (s->pid_file)
-@@ -710,6 +721,11 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
+@@ -713,6 +724,11 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
                  if (s->has_lsb && other->has_lsb)
                          continue;
  
@@ -78,7 +78,7 @@ index 6dc8835..6cc2cd5 100644
                  if (other->sysv_start_priority < s->sysv_start_priority) {
                          r = strv_extend(&s->after, other->name);
                          if (r < 0)
-@@ -861,8 +877,12 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+@@ -864,8 +880,12 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                                  }
  
                                  if (de->d_name[0] == 'S')  {

diff --git a/debian/patches/Disable-tests-which-fail-on-buildds.patch b/debian/patches/Disable-tests-which-fail-on-buildds.patch
index 1215b2d1d19a774526b3e77667bf21323ac52455..a3a6110546b183555f803522bf99da2eb0de4a40 100644 (file)
--- a/debian/patches/Disable-tests-which-fail-on-buildds.patch
+++ b/debian/patches/Disable-tests-which-fail-on-buildds.patch
@@ -9,10 +9,10 @@ Presumably these are due to running on too old kernels, misconfigured
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index df99fed..6bc4c58 100644
+index 22acbac..f253078 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1376,13 +1376,12 @@ tests += \
+@@ -1375,13 +1375,12 @@ tests += \
        test-capability \
        test-async \
        test-ratelimit \
@@ -27,7 +27,7 @@ index df99fed..6bc4c58 100644
  
  EXTRA_DIST += \
        test/a.service \
-@@ -2841,10 +2840,8 @@ tests += \
+@@ -2840,10 +2839,8 @@ tests += \
        test-bus-introspect \
        test-bus-objects \
        test-bus-error \
@@ -38,7 +38,7 @@ index df99fed..6bc4c58 100644
        test-local-addresses \
        test-resolve
  
-@@ -3155,7 +3152,6 @@ test_dhcp6_client_LDADD = \
+@@ -3154,7 +3151,6 @@ test_dhcp6_client_LDADD = \
  
  tests += \
        test-dhcp-option \
@@ -46,7 +46,7 @@ index df99fed..6bc4c58 100644
        test-dhcp-server \
        test-ipv4ll \
        test-icmp6-rs \
-@@ -5338,7 +5334,6 @@ test_network_tables_LDADD = \
+@@ -5337,7 +5333,6 @@ test_network_tables_LDADD = \
        libudev-core.la
  
  tests += \

diff --git a/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch b/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch
index 73213959f78094d0120bf2d6d583144ff06524fe..dec8e82a077a78a9513c5313043bdfcae99644ee 100644 (file)
--- a/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch
+++ b/debian/patches/Do-not-generate-systemd-units-from-sysv-init-scripts.patch
@@ -8,10 +8,10 @@ Subject: Do not generate systemd units from sysv init scripts if a native
  1 file changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 6cc2cd5..bd2ee1f 100644
+index b2a15cf..069ac20 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
-@@ -745,6 +745,25 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
+@@ -748,6 +748,25 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
          return 0;
  }
  
@@ -37,7 +37,7 @@ index 6cc2cd5..bd2ee1f 100644
  static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
          char **path;
  
-@@ -785,6 +804,12 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
+@@ -788,6 +807,12 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                          if (hashmap_contains(all_services, name))
                                  continue;
  
@@ -50,7 +50,7 @@ index 6cc2cd5..bd2ee1f 100644
                          service = new0(SysvStub, 1);
                          if (!service)
                                  return log_oom();
-@@ -872,7 +897,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+@@ -875,7 +900,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
  
                                  service = hashmap_get(all_services, name);
                                  if (!service){

diff --git a/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch b/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch
index 133fe60f914ba0eacf09b67705f412de8abfe733..214f3404824961834f3b05a01bb252f13b058693 100644 (file)
--- a/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch
+++ b/debian/patches/Do-not-order-rcS.d-services-after-local-fs.target-if.patch
@@ -57,7 +57,7 @@ index b045047..fd613c6 100644
  #define SPECIAL_INITRD_FS_TARGET "initrd-fs.target"
  #define SPECIAL_INITRD_ROOT_FS_TARGET "initrd-root-fs.target"
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index bd2ee1f..4b87a78 100644
+index 069ac20..3f9dcfa 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -72,9 +72,6 @@ static const struct {

diff --git a/debian/patches/Drop-rc-local-generator.patch b/debian/patches/Drop-rc-local-generator.patch
index 2370f42abe903721c7255eb54a145a83b32c3ced..c7bd425fd79660b8d8b0cbe09ff5c34c9c9583d9 100644 (file)
--- a/debian/patches/Drop-rc-local-generator.patch
+++ b/debian/patches/Drop-rc-local-generator.patch
@@ -14,10 +14,10 @@ Bug-Debian: https://bugs.debian.org/776170
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 6bc4c58..a0fedd7 100644
+index f253078..9cdb1d6 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -617,12 +617,13 @@ CLEANFILES += \
+@@ -616,12 +616,13 @@ CLEANFILES += \
  
  if HAVE_SYSV_COMPAT
  nodist_systemunit_DATA += \

diff --git a/debian/patches/Prefer-etc-X11-default-display-manager-if-present.patch b/debian/patches/Prefer-etc-X11-default-display-manager-if-present.patch
index 97ddb04653e0025afa08db868214c984d2d751d8..50855ca3a72c2b70aaf53721c4167411d2eeee81 100644 (file)
--- a/debian/patches/Prefer-etc-X11-default-display-manager-if-present.patch
+++ b/debian/patches/Prefer-etc-X11-default-display-manager-if-present.patch
@@ -13,7 +13,7 @@ which display-manager is started.
  create mode 100644 src/default-display-manager-generator/default-display-manager-generator.c
 
 diff --git a/Makefile.am b/Makefile.am
-index 11c10dd..df99fed 100644
+index fa01532..22acbac 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -402,7 +402,8 @@ systemgenerator_PROGRAMS = \
@@ -26,7 +26,7 @@ index 11c10dd..df99fed 100644
  
  dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
-@@ -2292,6 +2293,14 @@ systemd_delta_LDADD = \
+@@ -2291,6 +2292,14 @@ systemd_delta_LDADD = \
        libsystemd-shared.la
  
  # ------------------------------------------------------------------------------