[Reproducible-commits] [dpkg] 04/08: dpkg-source: minor update to "3.0 (quilt)" format

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag 1.14.27
in repository dpkg.

commit 795c43e3023df7091ccb2d5b0e2c889a7b6d1f25
Author: Raphael Hertzog <hertzog at debian.org>
Date:   Sun May 10 19:15:29 2009 +0200

    dpkg-source: minor update to "3.0 (quilt)" format
    
    Do not update/create debian/patches/.dpkg-source-applied during build,
    it's only meant to document what patches have been applied at extraction
    time.
    
    Also try to cleanup in case the patch serie is empty after removal of the
    automatic patch. First remove debian/patches/series if it's empty and then
    debian/patches/ itself in case it's empty as well.
---
 debian/changelog                        | 3 +++
 scripts/Dpkg/Source/Package/V2.pm       | 1 +
 scripts/Dpkg/Source/Package/V3/quilt.pm | 5 ++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ddc303..9c78f0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ dpkg (1.14.27) UNRELEASED; urgency=low
       always well registered with quilt even when it's updated by a new call
       to dpkg-source. Thanks to Goswin von Brederlow for the initial patch.
       Closes: #525858
+    - do not update/create debian/patches/.dpkg-source-applied during build,
+      it's only meant to document what patches have been applied at extraction
+      time. Closes: #525835
 
  -- Raphael Hertzog <hertzog at debian.org>  Thu, 09 Apr 2009 20:32:31 +0200
 
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 87ee729..e9bdfc0 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -360,6 +360,7 @@ sub do_build {
                 syserr(_g("unable to change permission of `%s'"), $autopatch);
     }
     $self->register_autopatch($dir);
+    rmdir(File::Spec->catdir($dir, "debian", "patches")); # No check on purpose
     pop @Dpkg::Exit::handlers;
 
     # Remove the temporary directory
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm b/scripts/Dpkg/Source/Package/V3/quilt.pm
index 05c1067..132a850 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -253,9 +253,6 @@ sub register_autopatch {
                 print SERIES "$auto_patch\n";
                 close(SERIES);
             }
-            open(APPLIED, ">>", $applied) || syserr(_g("cannot write %s"), $applied);
-            print APPLIED "$auto_patch\n";
-            close(APPLIED);
         } else {
             # If quilt was used, ensure its meta-information are
             # synchronized with the updated patch
@@ -284,6 +281,8 @@ sub register_autopatch {
                                  wait_child => 1, to_file => '/dev/null');
             }
         }
+        # Clean up empty series
+        unlink($series) if not -s $series;
     }
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git