Просмотр исходного кода

Merge branch 'stable'

Conflicts:

	configure.ac
	debian/changelog
Guillem Jover лет назад: 18
Родитель
Сommit
2ce6cb89b9
3 измененных файлов с 15 добавлено и 1 удалено
  1. 8 0
      ChangeLog
  2. 6 0
      debian/changelog
  3. 1 1
      scripts/Dpkg/Cdata.pm

+ 8 - 0
ChangeLog

@@ -1,3 +1,11 @@
+2008-01-23  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Release 1.14.16.4.
+
+2008-01-23  Guillem Jover  <guillem@debian.org>
+
+	* scripts/Dpkg/Cdata.pm: Import capit from Dpkg::Fields.
+
 2008-01-22  Guillem Jover  <guillem@debian.org>
 
 	* dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy

+ 6 - 0
debian/changelog

@@ -16,6 +16,12 @@ dpkg (1.14.17) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 21 Jan 2008 10:11:55 +0200
 
+dpkg (1.14.16.4) unstable; urgency=low
+
+  * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 23 Jan 2008 08:44:32 +0200
+
 dpkg (1.14.16.3) unstable; urgency=low
 
   [ Raphael Hertzog ]

+ 1 - 1
scripts/Dpkg/Cdata.pm

@@ -21,7 +21,7 @@ use warnings;
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(syntaxerr);
-use Dpkg::Fields;
+use Dpkg::Fields qw(capit);;
 
 use Exporter;
 our @ISA = qw(Exporter);