dpkg-source: fix an error message about unrepresentable changes to source

* scripts/Dpkg/Source/Patch.pm (_fail_not_same_type): Fix
inversion between new/old filetype.

diff --git a/ChangeLog b/ChangeLog
index 6f04675ab0e9fa86114d217dfe23d5f0b9a027cb..1ad0cafcacff3c37edd0cffd0fc6a0840f6303b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Source/Patch.pm (_fail_not_same_type): Fix
+       inversion between new/old filetype.
+
 2008-04-12  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Path.pm (check_files_are_the_same): Add a new

diff --git a/debian/changelog b/debian/changelog
index 8819e92338c1f2574bc63f14b81f55eeca424460..c9b72933870f24c5089afa08aa85d2673cbda52c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.14.19) UNRELEASED; urgency=low
     Joachim for the patch.
   * Handle symlinks better when deciding if dpkg-source has to copy the
     original tarball in the current extraction directory. Closes: #475668
+  * Fix the dpkg-source error message about unrepresentable changes to
+    source because the type of a file changed (new and old were inverted).
 
   [ Updated dpkg translations ]
   * Galician (Jacobo Tarrio).

diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index f3d0e840d7a1277230842b17f439107d6a12fdd9..6a3ac90fb72aeedad84bb4d7ae2a6f4f2ddb28fc 100644 (file)
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -264,8 +264,8 @@ sub _fail_not_same_type {
     my $old_type = get_type($old);
     my $new_type = get_type($new);
     errormsg(_g("cannot represent change to %s:"), $new);
-    errormsg(_g("  new version is %s"), $old_type);
-    errormsg(_g("  old version is %s"), $new_type);
+    errormsg(_g("  new version is %s"), $new_type);
+    errormsg(_g("  old version is %s"), $old_type);
     $self->register_error();
 }