Remove the IO layer ":utf8" that re-encodes in utf8

* scripts/dpkg-genchanges.pl, scripts/dpkg-gencontrol.pl,
scripts/dpkg-source.pl: Remove the IO-layer that converts to
UTF-8. It's not as smart as I expected.

diff --git a/ChangeLog b/ChangeLog
index 153a90affc256b79da861decf9edfd1522138adf..1d7ee914092fa30e67958dffccd24c551092bc77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-22  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/dpkg-genchanges.pl, scripts/dpkg-gencontrol.pl,
+       scripts/dpkg-source.pl: Remove the IO-layer that converts to
+       UTF-8. It's not as smart as I expected.
+
 2008-01-22  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Release 1.14.16.2.

diff --git a/debian/changelog b/debian/changelog
index a22bb1bd3c5a82354dc086c943cdafc66ca6407c..9d9dd446e1bcfa78842fd917bc80717c978cd0f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpkg (1.14.16.3) UNRELEASED; urgency=low
+
+  * Remove the ":utf8" layer that utf8-encodes already valid utf8.
+    Closes: #462098
+
+ -- Raphael Hertzog <hertzog@debian.org>  Tue, 22 Jan 2008 18:15:42 +0100
+
 dpkg (1.14.16.2) unstable; urgency=low
 
   * Change uid after changing gid and initializing supplementary groups in

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 1fc7787f0f4fc3d3edb1d82f050f8c8880293cda..597bed424d345bcc3363c1e90bd2d69cd23ede33 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -510,7 +510,6 @@ for my $f (keys %remove) {
     delete $fields->{$f};
 }
 
-binmode(STDOUT, ":utf8");
 $substvars->parse($varlistfile) if -e $varlistfile;
 tied(%{$fields})->set_field_importance(@changes_fields);
 tied(%{$fields})->output(\*STDOUT, $substvars);

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index d6e8bef2fe5f9f4545ed6bda1367dea83fbedb9b..c6e38cc81bba3f84c0ae8625819a1dee11778c42 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -348,11 +348,10 @@ my $fh_output;
 if (!$stdout) {
     $cf= "$packagebuilddir/DEBIAN/control";
     $cf= "./$cf" if $cf =~ m/^\s/;
-    open($fh_output, ">:utf8", "$cf.new") ||
+    open($fh_output, ">", "$cf.new") ||
         syserr(_g("cannot open new output control file \`%s'"), "$cf.new");
 } else {
     $fh_output = \*STDOUT;
-    binmode(STDOUT, ":utf8");
 }
 
 tied(%{$fields})->set_field_importance(@control_fields);

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index cbab570ec806880194feca65e40cb2604eb5a0ed..48f12bab66ef8ee635947cfe2053aaa6619f63e3 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -768,7 +768,7 @@ if ($opmode eq 'build') {
     printf(_g("%s: building %s in %s")."\n",
            $progname, $sourcepackage, "$basenamerev.dsc")
         || &syserr(_g("write building message"));
-    open(DSC, ">:utf8", "$basenamerev.dsc") ||
+    open(DSC, ">", "$basenamerev.dsc") ||
         syserr(_g("create %s"), "$basenamerev.dsc");
 
     $substvars->parse($varlistfile) if $varlistfile && -e $varlistfile;