The branch, master has been updated
via 0fb4c32e8939454039d6cf29e9f154f435fccdcb (commit)
via dee0d1235dcd331e8c0d85a1c48e4468b6206b3f (commit)
via 44c4fb762ff0c4e5c235b90edc22133b12ab0e42 (commit)
via e291f7ea25918e7ac31e627edca8124b01ee29ee (commit)
via 86471e3015c98791cf9865f4fbe1870483573a6e (commit)
via ba38305d44a1489bda27e025a7b764e0c4789f37 (commit)
via ba9e5615ee9575054a38f3c9508e534ae856c501 (commit)
via cd25bdacb47ce0765a9eb5c0dc4fe79a97381b9b (commit)
via 97d8d07351d2fda3a35c0453a6a51f919a04cd64 (commit)
from 0d3c61deb475b1fd731bfea5d8d47a4574db8c7b (commit)
- Shortlog ------------------------------------------------------------
0fb4c32 Bump version to 1.14.12~
dee0d12 Release 1.14.11
44c4fb7 Fix distclean by only running a chmod if the target dir exists
e291f7e ChangeLog police night shift
86471e3 Declare more variables in perl scripts with 'my' instead of 'our'
ba38305 Dpkg::Arch: Do not shadow $gcc_host_gnu_type inside get_raw_host_arch
ba9e561 dpkg-scanpackages: Properly support an optional override file
cd25bda dpkg-scanpackages: Do not require controllib.pl anymore
97d8d07 Set proper authorship in ChangeLog
Summary of changes:
ChangeLog | 129 +++++++++++++++++++++++++++++-------------
configure.ac | 2 +-
debian/changelog | 14 ++++-
scripts/Dpkg/Arch.pm | 2 +-
scripts/Makefile.am | 2 +-
scripts/dpkg-scanpackages.pl | 8 +--
scripts/dpkg-shlibdeps.pl | 3 +-
7 files changed, 108 insertions(+), 52 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 0fb4c32e8939454039d6cf29e9f154f435fccdcb
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 07:38:57 2007 +0200
Bump version to 1.14.12~
diff --git a/ChangeLog b/ChangeLog
index f3501a9..053235c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+ * configure.ac: Bump version to 1.14.12~.
+
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
* configure.ac: Release 1.14.11.
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/configure.ac b/configure.ac
index 19c645e..87e9f8f 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.11], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.12~], [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 51da983..e71a961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.14.12) UNRELEASED; urgency=low
+
+ *
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Sat, 24 Nov 2007 07:38:13 +0200
+
dpkg (1.14.11) unstable; urgency=low
[ Raphael Hertzog ]
commit dee0d1235dcd331e8c0d85a1c48e4468b6206b3f
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 07:20:27 2007 +0200
Release 1.14.11
diff --git a/ChangeLog b/ChangeLog
index 1524057..f3501a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+ * configure.ac: Release 1.14.11.
+
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/Makefile.am (clean-local): Run chmod only if t.tmp exists.
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/configure.ac b/configure.ac
index 07afb54..19c645e 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.11~], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.11], [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 eb0f908..51da983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dpkg (1.14.11) UNRELEASED; urgency=low
+dpkg (1.14.11) unstable; urgency=low
[ Raphael Hertzog ]
* dpkg-shlibdeps now ignores the lack of dependency information in some
@@ -14,7 +14,7 @@ dpkg (1.14.11) UNRELEASED; urgency=low
* Fix dpkg-scanpackages to properly support an optional override file.
Closes: #452621
- -- Guillem Jover <[EMAIL PROTECTED]> Fri, 23 Nov 2007 06:50:02 +0200
+ -- Guillem Jover <[EMAIL PROTECTED]> Sat, 24 Nov 2007 07:19:02 +0200
dpkg (1.14.10) unstable; urgency=low
commit 44c4fb762ff0c4e5c235b90edc22133b12ab0e42
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 07:18:30 2007 +0200
Fix distclean by only running a chmod if the target dir exists
diff --git a/ChangeLog b/ChangeLog
index 5b00328..1524057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/Makefile.am (clean-local): Run chmod only if t.tmp exists.
+
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-scanpackages.pl (%vercache): Declare with 'my' instead
of 'our'.
* scripts/dpkg-shlibdeps.pl ($host_arch): Likewise.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 30ce405..c86e70b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -142,7 +142,7 @@ TEST_FILES= $(srcdir)/t/*.t
TEST_VERBOSE= 0
clean-local:
- chmod -R +w t.tmp
+ [ ! -d t.tmp ] || chmod -R +w t.tmp
rm -fr t.tmp
check: $(TEST_FILES) $(wildcard $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf*)
commit e291f7ea25918e7ac31e627edca8124b01ee29ee
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 07:01:45 2007 +0200
ChangeLog police night shift
diff --git a/ChangeLog b/ChangeLog
index b17920b..5b00328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,8 +35,8 @@
don't complain about missing dependency information if the lib is in
the same package than the binary. Also ignore it if the library is
not versionned and can't have an shlibs file.
- * scripts/Dpkg/Path.pm (guess_pkg_root_dir,
- check_files_are_the_same): Add new helper functions.
+ * scripts/Dpkg/Path.pm (guess_pkg_root_dir)
+ (check_files_are_the_same): New helper functions.
2007-11-23 Guillem Jover <[EMAIL PROTECTED]>
@@ -103,18 +103,20 @@
2007-11-21 Raphael Hertzog <[EMAIL PROTECTED]>
- * scripts/Dpkg/Shlibs/Objdump.pm: Fix the checks in is_executable() and
- is_public_library().
+ * scripts/Dpkg/Shlibs/Objdump.pm (reset): Initialize HASH, GNU_HASH,
+ SONAME and flags.
+ (is_executable, is_public_library): Fix the checks.
* scripts/t/200_Dpkg_Shlibs.t: Add some more tests to make sure
the above functions behave as expected.
* scripts/t/400_Dpkg_Deps.t: Add some more tests to make sure that
empty dependency fields are correctly handled.
- * scripts/Makefile.am: Include the new data files required by the
- tests above.
- * scrips/Dpkg/Fields.pm: New module containing 3 functions moved
- out of controllib.pl (capit(), set_field_importance(),
- sort_by_field_importance()).
- * scripts/controllib.pl: Removed the 3 functions above.
+ * scripts/t/200_Dpkg_Shlibs/objdump.dbd-pg: New file.
+ * scripts/t/200_Dpkg_Shlibs/objdump.ls: Likewise.
+ * scripts/Makefile.am (EXTRA_DIST): Include
+ 't/200_Dpkg_Shlibs/objdump.dbd-pg' and 't/200_Dpkg_Shlibs/objdump.ls'.
+ * scripts/controllib.pl (capit, set_field_importance)
+ (sort_by_field_importance): Move functions to ...
+ * scrips/Dpkg/Fields.pm: ... here. New file.
* scripts/dpkg-shlibdeps.pl: Use Dpkg::Fields for capit().
* scripts/dpkg-genchanges.pl: Use Dpkg::Fields for capit() and
set_field_importance().
@@ -220,18 +222,17 @@
2007-10-18 Raphael Hertzog <[EMAIL PROTECTED]>
- * scripts/Dpkg/Deps.pm: new module to handle dependencies, to
- evaluate them and check implications between them.
- * scripts/t/400_Dpkg_Deps.t: non-regression tests for Dpkg::Deps.
- * scripts/dpkg-checkbuilddeps.pl: adapted to use the new
+ * scripts/controllib.pl (parsedep, showdep): Remove unused functions.
+ (@pkg_dep_fields, @src_dep_fields): Move variables to ...
+ * scripts/Dpkg/Deps.pm: ... here. New file.
+ * scripts/t/400_Dpkg_Deps.t: New file.
+ * scripts/dpkg-checkbuilddeps.pl: Adapted to use the new
Dpkg::Deps module.
* scripts/dpkg-source.pl: Likewise.
* scripts/dpkg-scanpackages.pl: Likewise.
* scripts/dpkg-gencontrol.pl: Likewise. Also gains new features
such as automatic simplification of dependencies.
- * scripts/controllib.pl: remove unused parsedep(), showdep(),
- @pkg_dep_fields and @src_dep_fields.
- * man/dpkg-gencontrol.1: document the new behaviour with
+ * man/dpkg-gencontrol.1: Document the new behaviour with
dependency fields.
2007-10-18 Guillem Jover <[EMAIL PROTECTED]>
@@ -250,17 +251,17 @@
2007-10-15 Raphael Hertzog <[EMAIL PROTECTED]>
- * scripts/Dpkg/Version.pm: fix compare_versions to handle properly
- the >= cases (it was improperly handled like >> due to a bad regexp).
- * debian/rules: include cputable ostable triplettable in
+ * scripts/Dpkg/Version.pm: Fix compare_versions to handle properly
+ the >= cases (it was improperly handled like >> due to a bad regexp).
+ * debian/rules: Include cputable ostable triplettable in
build-tree so that they are available during make check (Dpkg.pm
exports ".." as $pkgdatadir during tests).
- * scripts/dpkg-shlibdeps.pl: bugfix, avoid unwanted modification
- of @pkg_shlibs by my_find_library.
+ * scripts/dpkg-shlibdeps.pl (my_find_library): Avoid unwanted
+ modification of @pkg_shlibs.
2007-10-14 Raphael Hertzog <[EMAIL PROTECTED]>
- * scripts/Dpkg/Version.pm: mark compare_versions as exportable.
+ * scripts/Dpkg/Version.pm: Mark compare_versions as exportable.
2007-10-13 Guillem Jover <[EMAIL PROTECTED]>
@@ -368,7 +369,7 @@
* scripts/dpkg-source.pl (usage): -W is the default
for quite some time already. Adapt the description of
-W and -E.
- * scripts/dpkg-buildpackage.pl (usage): likewise.
+ * scripts/dpkg-buildpackage.pl (usage): Likewise.
* scripts/dpkg-buildpackage.pl: Add -z/-Z to
passthrough opts (will be passed to dpkg-source).
@@ -385,20 +386,37 @@
2007-10-08 Raphael Hertzog <[EMAIL PROTECTED]>
Frank Lichtenheld <[EMAIL PROTECTED]>
- * Merge dpkg-shlibdeps-buxy branch.
+ Merge dpkg-shlibdeps-buxy branch.
- * scripts/dpkg-shlibdeps.pl: heavily reworked to support "symbols"
- files. Lots of the code has been modularized in perl modules
- Dpkg::Shlibs::*.
-
- * scripts/dpkg-gensymbols.pl: new script used to generated symbols
- files at package build time. It shall be used by packages of libraries.
-
- * man/dpkg-{shlibdeps,gensymbols}.1: updated and created manual
- pages documenting the changes above.
-
- * scripts/t/*: Added some non-regression test on many parts of the
- newly introduced perl modules.
+ * scripts/Dpkg/ErrorHandling.pm: New file.
+ * scripts/Dpkg/Gettext.pm: Likewise.
+ * scripts/Dpkg/Path.pm: Likewise.
+ * scripts/Dpkg/Shlibs.pm: Likewise.
+ * scripts/Dpkg/Shlibs/Objdump.pm: Likewise.
+ * scripts/Dpkh/Shlibs/SymbolFile.pm: Likewise.
+ * scripts/Dpkg/Version.pm: Likewise.
+
+ * scripts/dpkg-shlibdeps.pl: Add support for "symbols" files.
+ * man/dpkg-shlibdeps.1: Document "symbols" files support.
+
+ * scripts/dpkg-gensymbols.pl: New file.
+ * man/dpkg-gensymbols.1: Likewise.
+
+ * scripts/t/000_pod.t: New file.
+ * scripts/t/100_Dpkg_Version.t: Likewise.
+ * scripts/t/200_Dpkg_Shlibs.t: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/ld.so.conf: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/ld.so.conf_2: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/objdump.glib-ia64: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.3: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.6: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/symbols.fake-1: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/symbols.fake-2: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/symbols.include-1: Likewise.
+ * scripts/t/200_Dpkg_Shlibs/symbols.include-2: Likewise.
2007-10-08 Guillem Jover <[EMAIL PROTECTED]>
commit 86471e3015c98791cf9865f4fbe1870483573a6e
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 05:48:50 2007 +0200
Declare more variables in perl scripts with 'my' instead of 'our'
diff --git a/ChangeLog b/ChangeLog
index 19e130a..b17920b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-scanpackages.pl (%vercache): Declare with 'my' instead
+ of 'our'.
+ * scripts/dpkg-shlibdeps.pl ($host_arch): Likewise.
+
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/Dpkg/Arch.pm (get_raw_host_arch): Do not shadow
$gcc_host_gnu_type with a local variable.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index f8bab35..d38958d 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -140,7 +140,7 @@ defined($override) and (-e $override or
$pathprefix = '' if not defined $pathprefix;
-our %vercache;
+my %vercache;
sub vercmp {
my ($a,$b)[EMAIL PROTECTED];
return $vercache{$a}{$b} if exists $vercache{$a}{$b};
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 438eaac..039284f 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -18,8 +18,6 @@ use Dpkg::Shlibs::SymbolFile;
use Dpkg::Arch qw(get_host_arch);
use Dpkg::Fields qw(capit);
-our $host_arch= get_host_arch();
-
# By increasing importance
my @depfields= qw(Suggests Recommends Depends Pre-Depends);
my $i=0; my %depstrength = map { $_ => $i++ } @depfields;
@@ -36,6 +34,7 @@ my $varnameprefix= 'shlibs';
my $ignore_missing_info= 0;
my $debug= 0;
my @exclude = ();
+my $host_arch = get_host_arch();
my (@pkg_shlibs, @pkg_symbols);
if (-d "debian") {
commit ba38305d44a1489bda27e025a7b764e0c4789f37
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 05:42:12 2007 +0200
Dpkg::Arch: Do not shadow $gcc_host_gnu_type inside get_raw_host_arch
diff --git a/ChangeLog b/ChangeLog
index b1d440a..19e130a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/Dpkg/Arch.pm (get_raw_host_arch): Do not shadow
+ $gcc_host_gnu_type with a local variable.
+
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-scanpackages.pl: Use parenthesis to force the
precedence when checking if the specified override file exists.
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 3cf0a94..3a2ecf1 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -63,7 +63,7 @@ my %debarch_to_debtriplet;
{
return $host_arch if defined $host_arch;
- my $gcc_host_gnu_type = get_gcc_host_gnu_type();
+ $gcc_host_gnu_type = get_gcc_host_gnu_type();
if ($gcc_host_gnu_type eq '') {
warning(_g("Couldn't determine gcc system type, falling back to " .
commit ba9e5615ee9575054a38f3c9508e534ae856c501
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 05:32:56 2007 +0200
dpkg-scanpackages: Properly support an optional override file
diff --git a/ChangeLog b/ChangeLog
index 9e1f7b3..b1d440a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-scanpackages.pl: Use parenthesis to force the
+ precedence when checking if the specified override file exists.
+
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-scanpackages.pl: Do not require controllib.pl anymore.
2007-11-23 Aaron M. Ucko <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 02f82ae..eb0f908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ dpkg (1.14.11) UNRELEASED; urgency=low
* dpkg-shlibdeps: optimize "dpkg -S" lookups by caching results, patch
from Aaron M. Ucko <[EMAIL PROTECTED]>. Closes: #452577
+ [ Guillem Jover ]
+ * Fix dpkg-scanpackages to properly support an optional override file.
+ Closes: #452621
+
-- Guillem Jover <[EMAIL PROTECTED]> Fri, 23 Nov 2007 06:50:02 +0200
dpkg (1.14.10) unstable; urgency=low
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 08ae4f4..f8bab35 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -135,8 +135,8 @@ my ($binarydir, $override, $pathprefix) = @ARGV;
-d $binarydir or die sprintf(_g("Binary dir %s not found"),
$binarydir)."\n";
-defined $override and -e $override or
- die sprintf(_g("Override file %s not found"), $override)."\n";
+defined($override) and (-e $override or
+ die(sprintf(_g("Override file %s not found"), $override) . "\n"));
$pathprefix = '' if not defined $pathprefix;
commit cd25bdacb47ce0765a9eb5c0dc4fe79a97381b9b
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 05:23:32 2007 +0200
dpkg-scanpackages: Do not require controllib.pl anymore
diff --git a/ChangeLog b/ChangeLog
index 0f5d762..9e1f7b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-24 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-scanpackages.pl: Do not require controllib.pl anymore.
+
2007-11-23 Aaron M. Ucko <[EMAIL PROTECTED]>
* scripts/dpkg-shlibdeps.pl: Optimize "dpkg -S" lookups by caching
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index bc4f19b..08ae4f4 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -9,8 +9,6 @@ use Dpkg;
use Dpkg::Gettext;
use Dpkg::Deps qw(@pkg_dep_fields);
-push(@INC,$dpkglibdir);
-require 'controllib.pl';
textdomain("dpkg-dev");
my (@samemaint, @changedmaint);
commit 97d8d07351d2fda3a35c0453a6a51f919a04cd64
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Nov 24 05:20:29 2007 +0200
Set proper authorship in ChangeLog
The author for commit 0d3c61deb475b1fd731bfea5d8d47a4574db8c7b is still
wrong...
diff --git a/ChangeLog b/ChangeLog
index d62de5a..0f5d762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
-2007-11-23 Raphael Hertzog <[EMAIL PROTECTED]>
+2007-11-23 Aaron M. Ucko <[EMAIL PROTECTED]>
- * scripts/dpkg-shlibdeps.pl: Apply patch from Aaron M. Ucko
- <[EMAIL PROTECTED]> to optimize "dpkg -S" lookups by caching
+ * scripts/dpkg-shlibdeps.pl: Optimize "dpkg -S" lookups by caching
results.
2007-11-23 Raphael Hertzog <[EMAIL PROTECTED]>
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
