gbp-pq patch noise

No-change import/export.

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 d6897716f216a3bc3c598b116b5afd875a3338d9..56ef61a1751f2b3860873edd22c90021fbd5da48 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 dd861c1..63f4812 100644
+index e5b4ff8..81d6aea 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -41,6 +41,7 @@
@@ -78,7 +78,7 @@ index dd861c1..63f4812 100644
                  if (other->sysv_start_priority < s->sysv_start_priority) {
                          r = strv_extend(&s->after, other->name);
                          if (r < 0)
-@@ -835,8 +851,12 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+@@ -839,8 +855,12 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                                  }
  
                                  if (de->d_name[0] == 'S')  {

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 d5fcb5ba778190cfe83547fa1673c63a26c1e393..ddf083b63548492b5723e1446f2f46004a0d8351 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,7 +8,7 @@ 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 63f4812..619d08e 100644
+index 81d6aea..f33c8d8 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -723,6 +723,25 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
@@ -50,7 +50,7 @@ index 63f4812..619d08e 100644
                          service = new0(SysvStub, 1);
                          if (!service)
                                  return log_oom();
-@@ -846,7 +871,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+@@ -850,7 +875,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 6ff0415e0ac773d258925641732f800425c6e408..b659c05cecd1f48b80763b1f8face08960152798 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 619d08e..077f895 100644
+index f33c8d8..932edd4 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/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch b/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
index 98a9db4dd893a654ebef906ea72317b8efa52ad4..c59a02ae9eb8b8b4d9815f2fa829f8e8c56a1f0d 100644 (file)
--- a/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
+++ b/debian/patches/Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
@@ -7,7 +7,7 @@ Subject: Map rcS.d init script dependencies to their systemd equivalent.
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 077f895..40325fc 100644
+index 932edd4..9747566 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
 @@ -264,8 +264,15 @@ static int sysv_translate_facility(const char *name, const char *filename, char

diff --git a/debian/patches/sysv-generator-Avoid-wrong-dependencies-for-failing-.patch b/debian/patches/sysv-generator-Avoid-wrong-dependencies-for-failing-.patch
index 9469a3f0dbf58ebd5a55da2f5134fb60233e4a1f..45056af79ea457100f4592f3e954636c18bc2d0c 100644 (file)
--- a/debian/patches/sysv-generator-Avoid-wrong-dependencies-for-failing-.patch
+++ b/debian/patches/sysv-generator-Avoid-wrong-dependencies-for-failing-.patch
@@ -12,10 +12,10 @@ Bug-Debian: https://bugs.debian.org/771118
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 40325fc..9747566 100644
+index dd861c1..e5b4ff8 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
-@@ -800,6 +800,10 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
+@@ -755,6 +755,10 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                          service->name = name;
                          service->path = fpath;
  
@@ -26,7 +26,7 @@ index 40325fc..9747566 100644
                          r = hashmap_put(all_services, service->name, service);
                          if (r < 0)
                                  return log_oom();
-@@ -989,10 +993,6 @@ int main(int argc, char *argv[]) {
+@@ -939,10 +943,6 @@ int main(int argc, char *argv[]) {
          }
  
          HASHMAP_FOREACH(service, all_services, j) {