The branch, master has been updated
via ca39b2a4cc4b32422453d27030ab86930f51cd4d (commit)
via a7e7e93cdd9c0b3f76a70ff5e36466de6ccd24bc (commit)
via e198bcd50eb4f58db87b652810e1ef598bc8cabf (commit)
from 0638079f21df8b999d8d970e2ac1d13437ab458f (commit)
- Shortlog ------------------------------------------------------------
ca39b2a dpkg-source: Use print instead of printf if printf is not needed
a7e7e93 dpkg-buildpackage: Fix typo in usage
e198bcd Dpkg.pm: Make regex for $progname more robust
Summary of changes:
ChangeLog | 11 +++++++++++
scripts/Dpkg.pm | 2 +-
scripts/dpkg-buildpackage.sh | 2 +-
scripts/dpkg-source.pl | 4 ++--
4 files changed, 15 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit ca39b2a4cc4b32422453d27030ab86930f51cd4d
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Thu Sep 20 03:35:32 2007 +0200
dpkg-source: Use print instead of printf if printf is not needed
diff --git a/ChangeLog b/ChangeLog
index 11c8bc5..043aec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-09-20 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * scripts/dpkg-sources.pl (version): Don't use
+ printf if we don't need it, use print instead.
+
* scripts/dpkg-buildpackage.sh (usage): Fix typo
s/dpkg-genchangs/dpkg-genchanges/
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 898ea83..819c468 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -97,10 +97,10 @@ $SIG{'QUIT'} = \&exit_handler;
sub version {
printf _g("Debian %s version %s.\n"), $progname, $version;
- printf _g("
+ print _g("
Copyright (C) 1996 Ian Jackson and Klee Dienes.");
- printf _g("
+ print _g("
This is free software; see the GNU General Public Licence version 2 or
later for copying conditions. There is NO warranty.
");
commit a7e7e93cdd9c0b3f76a70ff5e36466de6ccd24bc
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Thu Sep 20 03:32:20 2007 +0200
dpkg-buildpackage: Fix typo in usage
s/dpkg-genchangs/dpkg-genchanges/
diff --git a/ChangeLog b/ChangeLog
index 8872864..11c8bc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-09-20 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * scripts/dpkg-buildpackage.sh (usage): Fix typo
+ s/dpkg-genchangs/dpkg-genchanges/
+
* scripts/Dpkg.pm: Make the regex for determining
$progname more robust.
diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index f5e0784..931de3f 100755
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -40,7 +40,7 @@ Options:
-v<version> changes since version <version>. }
-m<maint> maintainer for package is <maint>. }
-e<maint> maintainer for release is <maint>. } only passed
- -C<descfile> changes are described in <descfile>. } to dpkg-genchangs
+ -C<descfile> changes are described in <descfile>. } to dpkg-genchanges
-si (default) src includes orig for rev. 0 or 1. }
-sa uploaded src always includes orig. }
-sd uploaded src is diff and .dsc only. }
commit e198bcd50eb4f58db87b652810e1ef598bc8cabf
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Thu Sep 20 03:30:00 2007 +0200
Dpkg.pm: Make regex for $progname more robust
While it is not very common to have $0 contain no
'/', it may happen on occasion (after all it happened to
me ;).
diff --git a/ChangeLog b/ChangeLog
index 66d76ac..8872864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-20 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg.pm: Make the regex for determining
+ $progname more robust.
+
2007-09-18 Guillem Jover <[EMAIL PROTECTED]>
* lib/mlib.c (checksubprocerr): Warn instead of erroring out in case
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index fc6d875..7886018 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -6,7 +6,7 @@ use warnings;
use base qw(Exporter);
our @EXPORT = qw($version $progname $admindir $dpkglibdir $pkgdatadir);
-our ($progname) = $0 =~ m:.*/(.*):;
+our ($progname) = $0 =~ m#(?:.*/)?([^/]*)#;
# The following lines are automatically fixed at install time
our $version = "1.14";
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
