Sfoglia il codice sorgente

Use -Z option for patch and set TZ to UTC0 when calling diff. This gives us reliable timestamps in diffs.

Wichert Akkerman 24 anni fa
parent
commit
86f21f91a4
3 ha cambiato i file con 9 aggiunte e 1 eliminazioni
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 1
      scripts/dpkg-source.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Fri Jan 18 20:40:42 CET 2002 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-source.pl: Use -Z option for patch and set TZ to UTC0
+    when calling diff. This gives us reliable timestamps in diffs.
+
 Thu Jan  3 15:49:14 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-genchanges.pl, scripts/dpkg-scanpackages.pl,

+ 2 - 0
debian/changelog

@@ -67,6 +67,8 @@ dpkg (1.10) unstable; urgency=low
   * Update default ignore expression in dpkg-source to also match *~ and
     *.swp in subdirs. Closes: Bug#127458
   * Handle errors when verifying md5sums. Closes: Bug#102367
+  * dpkg-source now uses reliable timestamps for changed files.
+    Closes: Bug#105750
 
  -- Wichert Akkerman <wakkerma@debian.org>  Mon, 20 Aug 2001 14:54:38 +0200
 

+ 2 - 1
scripts/dpkg-source.pl

@@ -389,6 +389,7 @@ if ($opmode eq 'build') {
                 if (!$c3) {
 		    $ENV{'LC_ALL'}= 'C';
 		    $ENV{'LANG'}= 'C';
+		    $ENV{'TZ'}= 'UTC0';
                     exec('diff','-u',
                          '-L',"$basedirname.orig/$fn",
                          '-L',"$basedirname/$fn",
@@ -675,7 +676,7 @@ if ($opmode eq 'build') {
 	    $ENV{'LC_ALL'}= 'C';
 	    $ENV{'LANG'}= 'C';
             exec('patch','-s','-t','-F','0','-N','-p1','-u',
-                 '-V','never','-g0','-b','-z','.dpkg-orig');
+                 '-V','never','-g0','-b','-Z','-z','.dpkg-orig');
             &syserr("exec patch");
         }
         close(GZIP);