Browse Source

Merge branch 'master' of git://git.debian.org/git/dpkg/dpkg into sourcev3

Joey Hess 19 years ago
parent
commit
f981f9a22a
6 changed files with 5454 additions and 3 deletions
  1. 6 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 4 0
      man/ChangeLog
  4. 4 0
      po/ChangeLog
  5. 5437 0
      po/th.po
  6. 2 3
      scripts/dpkg-gensymbols.pl

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2007-10-13  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gensymbols.pl: Use new Dpkg::Arch module.
+	($host_arch): Initialize with get_host_arch instead of direct call to
+	'dpkg-architecture'.
+
 2007-10-12  Guillem Jover  <guillem@debian.org>
 
 	* scripts/controllib.pl ($host_arch, get_host_arch, get_valid_arches)

+ 1 - 0
debian/changelog

@@ -48,6 +48,7 @@ dpkg (1.14.8) UNRELEASED; urgency=low
   [ Updated dpkg translations ]
   * Polish (Robert Luberda).
   * Russian (Yuri Kozlov). Closes: #446278
+  * Thai (Theppitak Karoonboonyanan). Closes: #446501
 
   [ Updated man pages translations ]
   * German (Helge Kreutzmann).

+ 4 - 0
man/ChangeLog

@@ -1,3 +1,7 @@
+2007-10-13  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1280t0f63u.
+
 2007-10-12  Helge Kreutzmann  <debian@helgefjell.de>
 
 	* po/de.po: Updated to 1280t0f63u, add lots of fixes from 

+ 4 - 0
po/ChangeLog

@@ -1,3 +1,7 @@
+2007-10-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated to 929t.
+
 2007-10-12  Yuri Kozlov  <kozlov.y@gmail.com>
 
 	* ru.po: Updated to 929t.

File diff suppressed because it is too large
+ 5437 - 0
po/th.po


+ 2 - 3
scripts/dpkg-gensymbols.pl

@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Shlibs qw(@librarypaths);
 use Dpkg::Shlibs::Objdump;
 use Dpkg::Shlibs::SymbolFile;
@@ -19,9 +20,6 @@ our (%f, %fi);
 our %p2i;
 our @librarypaths;
 
-our $host_arch= `dpkg-architecture -qDEB_HOST_ARCH`;
-chomp $host_arch;
-
 my $controlfile = 'debian/control';
 my $changelogfile = 'debian/changelog';
 my $packagebuilddir = 'debian/tmp';
@@ -32,6 +30,7 @@ my $oppackage;
 my $compare = 1; # Bail on missing symbols by default
 my $output;
 my $debug = 0;
+my $host_arch = get_host_arch();
 
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;