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

ChangeLog

@@ -1,3 +1,7 @@
+2007-10-14  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Version.pm: mark compare_versions as exportable.
+
 2007-10-13  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-gensymbols.pl: Use new Dpkg::Arch module.

scripts/.gitignore

@@ -7,6 +7,7 @@ dpkg-distaddfile
 dpkg-divert
 dpkg-genchanges
 dpkg-gencontrol
+dpkg-gensymbols
 dpkg-name
 dpkg-parsechangelog
 dpkg-scanpackages

scripts/Dpkg/Version.pm

@@ -23,7 +23,7 @@ use warnings;
 
 use Exporter;
 our @ISA = qw(Exporter);
-our @EXPORT_OK = qw(vercmp);
+our @EXPORT_OK = qw(vercmp compare_versions);
 
 =head1 NAME