Source: time
Version: 1.7-25
Severity: normal
Tags: patch

Hi,

First of all, thanks for taking care of "time" in Debian!

What do you think about the attached trivial patches that improve the
packaging of time in various minor ways?  The most important one, the
reason for filing this bug at all, is the first one - it makes the
binary package declare "Multi-Arch: foreign", so that it may satisfy
other packages' dependencies on multiarch systems and also, in some
cases, help cross-building.

The rest of the patches should be quite self-explanatory and were just
the result of my attempt to make both Lintian and "cme check dpkg" happy
with a minimum of effort :)

Thanks again for your work on time and Debian in general!

G'luck,
Peter

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Peter Pentchev  [email protected] [email protected] [email protected]
PGP key:        http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
From 7a5a657c8fef63dd860e6565e46ad8870aa498e4 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <[email protected]>
Date: Mon, 16 Jun 2014 15:02:46 +0300
Subject: [PATCH 1/4] Mark the binary package as Multi-Arch: foreign.

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 61e9a24..7ab9d4f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), texinfo, automake | automaken, 
autoconf, dh-aut
 
 Package: time
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GNU time program for measuring CPU resource usage
  The 'time' command runs another program, then displays information
-- 
2.0.0

From 6874209b325133fd4c7bcbd4634d0080331d2cd2 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <[email protected]>
Date: Mon, 16 Jun 2014 15:35:40 +0300
Subject: [PATCH 2/4] Move the Homepage field to the Source stanza.

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7ab9d4f..a1a2506 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: time
 Section: utils
 Priority: standard
 Maintainer: Bob Proulx <[email protected]>
+Homepage: http://www.gnu.org/software/time
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), texinfo, automake | automaken, autoconf, 
dh-autoreconf
 
@@ -21,4 +22,3 @@ Description: GNU time program for measuring CPU resource usage
  .
  The GNU version can format the output in arbitrary ways by using a
  printf-style format string to include various resource measurements.
-Homepage: http://www.gnu.org/software/time
-- 
2.0.0

From ed8b5faf4d544741250a1b9a4a567040700f1c58 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <[email protected]>
Date: Mon, 16 Jun 2014 15:38:36 +0300
Subject: [PATCH 3/4] Hyphenate "License: freely-distributable".

The machine-readable copyright file format does not really like a space
in a license identifier.
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 1f17a2a..72eb248 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,7 +28,7 @@ License: GPL-2+
 
 Files: debian/time.1
 Copyright: Copyright 1996 Dirk Eddelbuettel <[email protected]>
-License: freely redistributable
+License: freely-redistributable
  Copyright Dirk Eddelbuettel but freely redistributable
 
 License: GPL-2+
-- 
2.0.0

From 89f4be23f330644598457eff03d43a7b3be970f9 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <[email protected]>
Date: Mon, 16 Jun 2014 15:47:53 +0300
Subject: [PATCH 4/4] Bring the patch headers a bit closer to DEP-3.

Change "Subject:" to "Description:" and remove two stray blank lines in
the non-normal-exit patch.
---
 debian/patches/non-normal-exit.patch     | 4 +---
 debian/patches/option-p-texi.patch       | 2 +-
 debian/patches/ru_maxrss.patch           | 2 +-
 debian/patches/rusage-portability.patch  | 2 +-
 debian/patches/time-include-time_h.patch | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/non-normal-exit.patch 
b/debian/patches/non-normal-exit.patch
index 69084eb..9ef34f7 100644
--- a/debian/patches/non-normal-exit.patch
+++ b/debian/patches/non-normal-exit.patch
@@ -1,10 +1,8 @@
-Subject: Adjust non-normal exit code
-
+Description: Adjust non-normal exit code
   * Introduced in Debian time version 1.7-16
   * time.c: When time exits in a non-normal way, return 128 plus the 
     number of the signal which caused time to stop or abort. Thanks to
     Steve Greenland and Herbert Xu for some clarification in this matter.
-
 Author: Dirk Eddelbuettel
 
 --- time-1.7.orig/time.c
diff --git a/debian/patches/option-p-texi.patch 
b/debian/patches/option-p-texi.patch
index 0f6006a..bbb8a19 100644
--- a/debian/patches/option-p-texi.patch
+++ b/debian/patches/option-p-texi.patch
@@ -1,4 +1,4 @@
-Subject: Improve option -p documentation.
+Description: Improve option -p documentation.
  Improve the wording of the documentation concerning use of the
  -p,--portability option.
 Author: Jonathan Nieder
diff --git a/debian/patches/ru_maxrss.patch b/debian/patches/ru_maxrss.patch
index fed57ad..93bd8b6 100644
--- a/debian/patches/ru_maxrss.patch
+++ b/debian/patches/ru_maxrss.patch
@@ -1,4 +1,4 @@
-Subject: Fix ru_maxrss reporting
+Description: Fix ru_maxrss reporting
 Author: Richard Kettlewell
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649402
 
diff --git a/debian/patches/rusage-portability.patch 
b/debian/patches/rusage-portability.patch
index c87f4b2..0977771 100644
--- a/debian/patches/rusage-portability.patch
+++ b/debian/patches/rusage-portability.patch
@@ -1,4 +1,4 @@
-Subject: struct rusage and sys/resource.h portability fix
+Description: struct rusage and sys/resource.h portability fix
 Author: Dirk Eddelbuettel
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=144819
 
diff --git a/debian/patches/time-include-time_h.patch 
b/debian/patches/time-include-time_h.patch
index 9272490..b57cbdc 100644
--- a/debian/patches/time-include-time_h.patch
+++ b/debian/patches/time-include-time_h.patch
@@ -1,4 +1,4 @@
-Subject: Search for time.h, and use it in !HAVE_WAIT3 case.
+Description: Search for time.h, and use it in !HAVE_WAIT3 case.
  This helps getting a correct define for HZ when wait3 is detected to not be
  properly filling in rusage.
 Author: Pino Toscano
-- 
2.0.0

Attachment: signature.asc
Description: Digital signature

Reply via email to