[SCM] dpkg's main repository branch, master, updated. 1.14.14-18-g9e5cec4

[Guillem Jover]

The branch, master has been updated
   via  9e5cec40fd27da067687c1e36aa30f18b1440cb5 (commit)
  from  9ca339d341ab39043d26be6baa028b6b9012c747 (commit)


- Shortlog 
9e5cec4 dpkg-buildpackage: Fix build message for non-gz compressed sources

Summary of changes:
 ChangeLog|5 +
 debian/changelog |2 ++
 scripts/dpkg-buildpackage.pl |9 +
 3 files changed, 12 insertions(+), 4 deletions(-)
---
Details of changes:

commit 9e5cec40fd27da067687c1e36aa30f18b1440cb5
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Tue Jan 1 20:25:39 2008 +0200

dpkg-buildpackage: Fix build message for non-gz compressed sources

Closes: #458519

diff --git a/ChangeLog b/ChangeLog
index 4243fd9..78edaf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Guillem Jover  [EMAIL PROTECTED]
+
+   * scripts/dpkg-buildpackage.pl: Use Dpkg::Compression. Use $comp_regex
+   to match compressed diffs and tarballs.
+
 2008-01-01  Samuel Thibault  [EMAIL PROTECTED]
 
* utils/start-stop-daemon.c (do_stop): Do not print 'failed to kill'
diff --git a/debian/changelog b/debian/changelog
index d08e289..df02cec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Do not print 'failed to kill' warning in start-stop-daemon when polling
 the pid. Closes: #157305, #352554
 Thanks to Samuel Thibault.
+  * Properly print build message in dpkg-buildpackage for lzma and bzip2
+compressed sources. Closes: #458519
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 9d07efa..dfa0041 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -11,6 +11,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(warning error failure syserr subprocerr usageerr
$warnable_error);
 use Dpkg::BuildOptions;
+use Dpkg::Compression;
 
 push (@INC, $dpkglibdir);
 require 'controllib.pl';
@@ -438,9 +439,9 @@ sub fileomitted {
 my $srcmsg;
 if (fileomitted '\.deb') {
 # source only upload
-if (fileomitted '\.diff\.gz') {
+if (fileomitted \.diff\.$comp_regex) {
$srcmsg = _g('source only upload: Debian-native package');
-} elsif (fileomitted '\.orig\.tar\.gz') {
+} elsif (fileomitted \.orig\.tar\.$comp_regex) {
$srcmsg = _g('source only, diff-only upload (original source NOT 
included)');
 } else {
$srcmsg = _g('source only upload (original source is included)');
@@ -449,9 +450,9 @@ if (fileomitted '\.deb') {
 $srcmsg = _g('full upload (original source is included)');
 if (fileomitted '\.dsc') {
$srcmsg = _g('binary only upload (no source included)');
-} elsif (fileomitted '\.diff\.gz') {
+} elsif (fileomitted \.diff\.$comp_regex) {
$srcmsg = _g('full upload; Debian-native package (full source is 
included)');
-} elsif (fileomitted '\.orig\.tar\.gz') {
+} elsif (fileomitted \.orig\.tar\.$comp_regex) {
$srcmsg = _g('binary and diff upload (original source NOT included)');
 } else {
$srcmsg = _g('full upload (original source is included)');

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

[SCM] dpkg's main repository branch, master, updated. 1.14.14-24-g19173d2

[Guillem Jover]

The branch, master has been updated
   via  19173d231c66bd222631a4a86033aa36d88d01a4 (commit)
   via  0f2b6521146c96e83387ce854425d21a4f5979fc (commit)
   via  9bcc24992c7f61ba5ad230f9214554d90dde574f (commit)
   via  c04a83af4a07f5efa7bd56c82183f81b75fd5c7c (commit)
   via  47d1d738543c63564f60e885d57639f6766424f5 (commit)
   via  73aa35745d57c6c682fe742642ce1d7639f1194e (commit)
  from  9e5cec40fd27da067687c1e36aa30f18b1440cb5 (commit)


- Shortlog 
19173d2 Add lzma to dpkg-dev Depends
0f2b652 s-s-d: Remove redundant function declarations
9bcc249 Add a 'struct stat' forward declaration to fix a compilation warning
c04a83a Add missing PRINTFFORMAT attribute to few function declarations
47d1d73 Use NONRETURNING and PRINTFFORMAT instead of NONRETURNPRINTFFORMAT 
attribute
73aa357 Promote bzip2 Recommends to Depends for dpkg-dev

Summary of changes:
 ChangeLog |   31 +++
 debian/changelog  |2 ++
 debian/control|4 ++--
 lib/dpkg-db.h |2 +-
 lib/dpkg.h|   25 +
 src/main.h|2 ++
 utils/start-stop-daemon.c |9 +
 7 files changed, 52 insertions(+), 23 deletions(-)
---
Details of changes:

commit 19173d231c66bd222631a4a86033aa36d88d01a4
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Wed Jan 2 07:24:24 2008 +0200

Add lzma to dpkg-dev Depends

diff --git a/debian/changelog b/debian/changelog
index 6681e7f..3f2dea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Properly print build message in dpkg-buildpackage for lzma and bzip2
 compressed sources. Closes: #458519
   * Promote bzip2 Recommends to Depends for dpkg-dev. Closes: #458521
+  * Add lzma to dpkg-dev Depends.
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/debian/control b/debian/control
index 284964e..9ff6986 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Package: dpkg-dev
 Section: utils
 Priority: optional
 Architecture: all
-Depends: dpkg (= 1.14.6), perl5, perl-modules, cpio (= 2.4.2-2), bzip2,
+Depends: dpkg (= 1.14.6), perl5, perl-modules, cpio (= 2.4.2-2), bzip2, lzma,
  patch (= 2.2-1), make, binutils
 Recommends: gcc | c-compiler
 Suggests: gnupg, debian-keyring

commit 0f2b6521146c96e83387ce854425d21a4f5979fc
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Wed Jan 2 06:52:46 2008 +0200

s-s-d: Remove redundant function declarations

diff --git a/ChangeLog b/ChangeLog
index 294274a..883e436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-02  Guillem Jover  [EMAIL PROTECTED]
 
+   * utils/start-stop-daemon.c [!__GNUC__] (fatal, badusage): Remove
+   redundant function declarations.
+
+2008-01-02  Guillem Jover  [EMAIL PROTECTED]
+
* src/main.h (struct stat): New forward declaration.
 
 2008-01-02  Guillem Jover  [EMAIL PROTECTED]
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index e4bbc41..b5cf162 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -176,15 +176,10 @@ static int pid_is_exec(pid_t pid, const struct stat *esb);
 #endif
 
 
-#ifdef __GNUC__
 static void fatal(const char *format, ...)
NONRETURNING PRINTFFORMAT(1, 2);
 static void badusage(const char *msg)
NONRETURNING;
-#else
-static void fatal(const char *format, ...);
-static void badusage(const char *msg);
-#endif
 
 /* This next part serves only to construct the TVCALC macro, which
  * is used for doing arithmetic on struct timeval's.  It works like this:

commit 9bcc24992c7f61ba5ad230f9214554d90dde574f
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Wed Jan 2 06:46:28 2008 +0200

Add a 'struct stat' forward declaration to fix a compilation warning

diff --git a/ChangeLog b/ChangeLog
index 7ae840d..294274a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-02  Guillem Jover  [EMAIL PROTECTED]
 
+   * src/main.h (struct stat): New forward declaration.
+
+2008-01-02  Guillem Jover  [EMAIL PROTECTED]
+
* lib/dpkg.h (warningf): Add PRINTFFORMAT attribute.
(buffer_copy_setup_PtrInt): Likewise.
(buffer_copy_setup_PtrPtr): Likewise.
diff --git a/src/main.h b/src/main.h
index 1011094..15a8303 100644
--- a/src/main.h
+++ b/src/main.h
@@ -178,6 +178,8 @@ void cu_closepipe(int argc, void **argv);
 void cu_closedir(int argc, void **argv);
 void cu_closefd(int argc, void **argv);
 
+struct stat;
+
 int ignore_depends(struct pkginfo *pkg);
 int force_breaks(struct deppossi *possi);
 int force_depends(struct deppossi *possi);

commit c04a83af4a07f5efa7bd56c82183f81b75fd5c7c
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Wed Jan 2 06:40:27 2008 +0200

Add missing PRINTFFORMAT attribute