The branch, master has been updated
via 3f0020be7eac8357f5ce53f978b63f1fd4181be2 (commit)
via 25b4639cae981a221b70bb601ecbc6dde4529cfb (commit)
via b10d66f07b63c7d151817b62cc0b5a429fc644d6 (commit)
via f0ea9fec991a03dcd99e6562e6cce8430b1ff5d8 (commit)
via f4c126adf8a8058a977e3a4b4cf9f9aaf714e53b (commit)
via c5d3a32688c7506862d3c9da8fc4489001f10cf9 (commit)
from d550c7c26f09ab834ebc26eb752e5ecc32349b68 (commit)
- Shortlog ------------------------------------------------------------
3f0020b Do not declare $host_arch as an 'our' variable
25b4639 Make %fieldimps private to controllib.pl
b10d66f Document that apt now requires Packages.bz2 instead of Packages.gz
f0ea9fe Add back $dpkglib into @INC, needed by the controllib.pl require in
822-date
f4c126a Try to match history with reality
c5d3a32 Bump version to 1.14.7~.
Summary of changes:
ChangeLog | 21 +++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 22 +++++++++++++++++++---
man/ChangeLog | 5 +++++
man/dpkg-scanpackages.1 | 6 +++---
scripts/822-date.pl | 1 +
scripts/controllib.pl | 3 ++-
scripts/dpkg-genchanges.pl | 2 --
scripts/dpkg-gencontrol.pl | 2 --
scripts/dpkg-source.pl | 2 +-
10 files changed, 53 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 3f0020be7eac8357f5ce53f978b63f1fd4181be2
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 04:50:38 2007 +0300
Do not declare $host_arch as an 'our' variable
diff --git a/ChangeLog b/ChangeLog
index 3f5a792..7984467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-genchanges.pl ($host_arch): Do not declare as 'our'.
+ * scripts/dpkg-gencontrol.pl ($host_arch): Likewise.
+
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-genchanges.pl (%fieldimps): Remove unused variable.
* scripts/dpkg-gencontrol.pl (%fieldimps): Likewise.
* scripts/dpkg-source.pl (%fieldimps): Likewise.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 1709c66..7b54c47 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -15,7 +15,6 @@ our (%f, %fi);
our %p2i;
our %substvar;
our $sourcepackage;
-our $host_arch;
textdomain("dpkg-dev");
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 12ea429..414d8a6 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -16,7 +16,6 @@ our (%f, %fi);
our %p2i;
our @pkg_dep_fields;
our $sourcepackage;
-our $host_arch;
textdomain("dpkg-dev");
commit 25b4639cae981a221b70bb601ecbc6dde4529cfb
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 04:47:02 2007 +0300
Make %fieldimps private to controllib.pl
diff --git a/ChangeLog b/ChangeLog
index c6fd9b8..3f5a792 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-genchanges.pl (%fieldimps): Remove unused variable.
+ * scripts/dpkg-gencontrol.pl (%fieldimps): Likewise.
+ * scripts/dpkg-source.pl (%fieldimps): Likewise.
+ * scripts/controllib.pl (%fieldimps): Switch from 'our' to 'my'.
+
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/822-date.pl: Add $dpkglib into @INC, needed by the
controllib.pl require.
diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index a94ff2b..1b7c52d 100755
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -15,7 +15,6 @@ our %f; # - fields ???
our %fi; # - map of fields values. keys are of the form "S# key"
# where S is source (L is changelog, C is control)
# and # is an index
-our %fieldimps;
our %p2i; # - map from datafile+packagename to index in controlfile
# (used if multiple packages can be listed). Key is
# "S key" where S is the source and key is the
packagename
@@ -340,6 +339,8 @@ sub substvars {
return $v;
}
+my %fieldimps;
+
sub set_field_importance(@)
{
my @fields = @_;
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 93e36aa..1709c66 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -13,7 +13,6 @@ require 'controllib.pl';
our (%f, %fi);
our %p2i;
-our %fieldimps;
our %substvar;
our $sourcepackage;
our $host_arch;
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index c756338..12ea429 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -13,7 +13,6 @@ require 'controllib.pl';
our %substvar;
our (%f, %fi);
-our %fieldimps;
our %p2i;
our @pkg_dep_fields;
our $sourcepackage;
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 70b4682..5c16bc4 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -66,7 +66,7 @@ use Cwd;
push (@INC, $dpkglibdir);
require 'controllib.pl';
-our (%f, %fi, %fieldimps);
+our (%f, %fi);
our $sourcepackage;
our $warnable_error;
our $quiet_warnings;
commit b10d66f07b63c7d151817b62cc0b5a429fc644d6
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 04:38:40 2007 +0300
Document that apt now requires Packages.bz2 instead of Packages.gz
diff --git a/debian/changelog b/debian/changelog
index 773ba39..5e62bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
[ Guillem Jover ]
* Add back $dpkglib into @INC, needed by the controllib.pl require in
822-date. Closes: #440962
+ * Document in dpkg-scanpackages that apt now requires Packages.bz2 instead
+ of Packages.gz. Closes: #440973
[ Updated dpkg translations ]
* German (Sven Joachim). Closes: #440537
diff --git a/man/ChangeLog b/man/ChangeLog
index 4e0f1e8..d3e997d 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
+ * dpkg-scanpackages.1: Replace gzip with bzip2 as the requirement for
+ compressed Packages files for apt.
+
2007-09-04 Peter Karlsson <[EMAIL PROTECTED]>
* po/sv.po: Updated to 1289t.
diff --git a/man/dpkg-scanpackages.1 b/man/dpkg-scanpackages.1
index 2c357ec..195a79a 100644
--- a/man/dpkg-scanpackages.1
+++ b/man/dpkg-scanpackages.1
@@ -13,7 +13,7 @@
.\" You should have received a copy of the GNU General Public
.\" License along with dpkg; if not, write to the Free Software
.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH dpkg\-scanpackages 1 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2007-09-06" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-scanpackages \- create Packages index files
.
@@ -43,8 +43,8 @@ of machines.
If you want to access the generated Packages file with
.B apt
you will probably need to compress the file with
-.BR gzip (1)
-(generating a Packages.gz file). apt ignores uncompressed Packages
+.BR bzip2 (1)
+(generating a Packages.bz2 file). apt ignores uncompressed Packages
files except on local access (i.e.
.B file://
sources).
commit f0ea9fec991a03dcd99e6562e6cce8430b1ff5d8
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 04:33:50 2007 +0300
Add back $dpkglib into @INC, needed by the controllib.pl require in 822-date
diff --git a/ChangeLog b/ChangeLog
index 3879376..c6fd9b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/822-date.pl: Add $dpkglib into @INC, needed by the
+ controllib.pl require.
+
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
* configure.ac: Bump version to 1.14.7~.
2007-09-05 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 7b399cc..773ba39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
dpkg (1.14.7) UNRELEASED; urgency=low
+ [ Guillem Jover ]
+ * Add back $dpkglib into @INC, needed by the controllib.pl require in
+ 822-date. Closes: #440962
+
[ Updated dpkg translations ]
* German (Sven Joachim). Closes: #440537
* Nepali (Shiva Prasad Pokharel). Closes: #437825
diff --git a/scripts/822-date.pl b/scripts/822-date.pl
index 28cfab3..aa83d2a 100755
--- a/scripts/822-date.pl
+++ b/scripts/822-date.pl
@@ -8,6 +8,7 @@ use Dpkg::Gettext;
textdomain("dpkg-dev");
+push(@INC, $dpkglibdir);
require 'controllib.pl';
@ARGV && die _g("Usage: 822-date")."\n";
commit f4c126adf8a8058a977e3a4b4cf9f9aaf714e53b
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 03:48:42 2007 +0300
Try to match history with reality
Few translation commits did not make into the release although they had
been already committed to the repository.
Add a changelog entry for Swedish man page translation.
diff --git a/debian/changelog b/debian/changelog
index 334f901..7b399cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
dpkg (1.14.7) UNRELEASED; urgency=low
- *
+ [ Updated dpkg translations ]
+ * German (Sven Joachim). Closes: #440537
+ * Nepali (Shiva Prasad Pokharel). Closes: #437825
+ * Vietnamese (Clytie Siddall). Closes: #440502
+
+ [ Updated man pages translations ]
+ * Swedish (Peter Karlsson).
-- Guillem Jover <[EMAIL PROTECTED]> Thu, 06 Sep 2007 03:42:40 +0300
@@ -60,12 +66,10 @@ dpkg (1.14.6) unstable; urgency=low
[ Updated dpkg translations ]
* Dzongkha (Tshewang Norbu). Closes: #430931
* French (Frédéric Bothamy).
- * German (Sven Joachim). Closes: #440537
- * Nepali (Shiva Prasad Pokharel). Closes: #435353, #437825
+ * Nepali (Shiva Prasad Pokharel). Closes: #435353
* Polish (Robert Luberda).
* Russian (Yuri Kozlov). Closes: #436147
* Swedish (Peter Karlsson).
- * Vietnamese (Clytie Siddall). Closes: #440502
[ Updated dselect translations ]
* Russian (Yuri Kozlov). Closes: #436149
commit c5d3a32688c7506862d3c9da8fc4489001f10cf9
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 03:43:44 2007 +0300
Bump version to 1.14.7~.
diff --git a/ChangeLog b/ChangeLog
index 3f8033e..3879376 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
+ * configure.ac: Bump version to 1.14.7~.
+
2007-09-05 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.6.
diff --git a/configure.ac b/configure.ac
index 9eddfe3..5e2eb92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.6], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.7~], [EMAIL PROTECTED])
AC_CONFIG_SRCDIR([lib/dpkg.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
diff --git a/debian/changelog b/debian/changelog
index 05a656f..334f901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.14.7) UNRELEASED; urgency=low
+
+ *
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Thu, 06 Sep 2007 03:42:40 +0300
+
dpkg (1.14.6) unstable; urgency=low
[ Frank Lichtenheld ]
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
