tags 777403 + pending patch
tags 967002 + pending patch
tags 999259 + pending patch
thanks

I've just uploaded leave 1.12-2.2 to DELAYED/10:
  
  leave (1.12-2.2) unstable; urgency=medium
  .
    * Non-maintainer upload.
    * Pass -n to gzip(1) to make the manual page and changelog reproducible, as
      well as pass CFLAGS to the C compiler to ensure that, for instance,
      -ffile-prefix-map is used. (Closes: #777403)
    * Apply a patch by Helmut Grohne to correctly cross-build the leave binary.
      (Closes: #967002)
    * Add the missing required debian/rules targets, build-arch and build-indep.
      (Closes: #999259)
    * Remove a "debian/changelog~" editor backup file.

The full debdiff is attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
diffstat for leave_1.12-2.1 leave_1.12-2.2

 debian/changelog~           |   88 --------------------------------------------
 leave-1.12/debian/changelog |   14 +++++++
 leave-1.12/debian/rules     |   17 ++++----
 3 files changed, 23 insertions(+), 96 deletions(-)

diff -u leave-1.12/debian/changelog leave-1.12/debian/changelog
--- leave-1.12/debian/changelog
+++ leave-1.12/debian/changelog
@@ -1,3 +1,17 @@
+leave (1.12-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass -n to gzip(1) to make the manual page and changelog reproducible, as
+    well as pass CFLAGS to the C compiler to ensure that, for instance,
+    -ffile-prefix-map is used. (Closes: #777403)
+  * Apply a patch by Helmut Grohne to correctly cross-build the leave binary.
+    (Closes: #967002)
+  * Add the missing required debian/rules targets, build-arch and build-indep.
+    (Closes: #999259)
+  * Remove a "debian/changelog~" editor backup file.
+
+ -- Chris Lamb <la...@debian.org>  Thu, 06 Oct 2022 10:59:51 -0700
+
 leave (1.12-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
reverted:
--- leave-1.12/debian/changelog~
+++ leave-1.12.orig/debian/changelog~
@@ -1,88 +0,0 @@
-leave (1.12-2) unstable; urgency=low
-
-  * Exited with 0 instead of 1 for binary-indep, just for people who obsess
-    with pointless details, closes: #395734.
-
- -- Josip Rodin <joy-packa...@debian.org>  Sat, 28 Oct 2006 00:10:22 +0200
-
-leave (1.12-1) unstable; urgency=low
-
-  * New upstream version.
-  * Added an unportable glibc-only variable to get the program name,
-    because the unportable NetBSD-only variable didn't work.
-
- -- Josip Rodin <joy-packa...@debian.org>  Fri, 15 Aug 2003 21:10:23 +0200
-
-leave (1.10-1) unstable; urgency=low
-
-  * New upstream version, closes: #143720.
-    Abolished our patches for handling 24-hour time formats, and used
-    the upstream's. The behaviour is unchanged, AFAICT.
-  * Updated for Policy 3.5.6. debian/rules in shell,
-    removed the use of both debhelper and pmake -> no Build-Depends :)
-
- -- Josip Rodin <jro...@jagor.srce.hr>  Mon, 26 Aug 2002 14:40:30 +0200
-
-leave (1.8-2) unstable; urgency=low
-
-  * Fixed those long standing bugs in the handling of 24h-clock
-    arguments, by making leave not convert times to 12h clock, but check
-    whether the time is between 1 and 12, and then interpret it according
-    to a 12-hour clock. Let's hope it all works.
-    Thanks to Sergio Gelato <debe...@zwicky.freeserve.co.uk>, who provided
-    the patch both for the code and for the manual page.
-    (closes #25150 #26000 #31250 #31872)
-  * Updated for Policy 3.x. Removed the full text of the BSD license from
-    the copyright file and referenced the /usr/share/common-licenses/BSD
-    file.
-
- -- Josip Rodin <jro...@jagor.srce.hr>  Mon, 18 Oct 1999 23:13:16 +0200
-
-leave (1.8-1) unstable; urgency=low
-
-  * New maintainer, new upstream source (with exactly two (2) new lines
-    of code), new debian/* files.
-
- -- Josip Rodin <jro...@jagor.srce.hr>  Wed, 19 May 1999 18:13:22 +0200
-
-leave (1.6-2) unstable; urgency=low
-
-  * debian/control (Maintainer): new address.
-  * debian/copyright: ditto.
-  * debian/control (Standards-Version): updated to 2.5.0.0.
-  * debian/rules: replace $(package) with a string literal and other minor
-    clean ups.
-
- -- James Troup <ja...@nocrew.org>  Tue, 10 Nov 1998 15:46:23 +0000
-
-leave (1.6-1) unstable; urgency=low
-
-  * New upstream version.
-  * debian/rules: Use BSD make not GNU make to build.
-  * debian/rules: Build with -g.
-  * debian/rules: Call dpkg-gencontrol with -isp.
-  * debian/rules: remove leave.cat1 on clean.
-  * debian/rules: no more {,} usage.
-  * debian/rules: chmod go=rX not g-ws.
-  * debian/control: Standards-Version 2.3.0.1.
-  * debian/control: section is really utils not misc.
-  * debian/copyright: removed over-keen "famous" from description.
-
- -- James Troup <jjtr...@comp.brad.ac.uk>  Mon,  8 Dec 1997 21:03:01 +0000
-
-leave (1.4-3) unstable; urgency=low
- 
-  * Rebuilt libc6. 
-
- -- James Troup <jjtr...@comp.brad.ac.uk>  Wed, 25 Jan 1997 18:30:06 +0000
-
-leave (1.4-2) unstable; urgency=low
- 
-  * New Maintainer.
-  * Updated package to standards version 2.1.1.2.
-
- -- James Troup <jjtr...@comp.brad.ac.uk>  Wed, 22 Jan 1997 00:30:17 +0000
-
-Local variables:
-mode: debian-changelog
-End:
diff -u leave-1.12/debian/rules leave-1.12/debian/rules
--- leave-1.12/debian/rules
+++ leave-1.12/debian/rules
@@ -1,20 +1,21 @@
 #!/usr/bin/make -f
 
-tmp=$(shell pwd)/debian/leave
+-include /usr/share/dpkg/buildtools.mk
+STRIP ?= strip
 
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  optflag=-O2
-endif
+tmp=$(shell pwd)/debian/leave
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-  stripflag=-s
+  stripflag=-s --strip-program=$(STRIP)
 endif
 
 leave: leave.c
-       cc -g $(optflag) -Wall -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= leave.c -o 
leave
+       $(CC) $(shell dpkg-buildflags --get CFLAGS) -D__COPYRIGHT\(x\)= 
-D__RCSID\(x\)= leave.c -o leave
 # used to have 'pmake CFLAGS="..." leave' here, but why?
 
 build: leave
+build-arch: build
+build-indep: build
 
 clean:
        test -f leave.c || { echo not in the right dir\!; exit 1; }
@@ -28,8 +29,8 @@
        install -d -m 755 $(tmp)/usr/bin $(tmp)/usr/share/man/man1 \
                $(tmp)/DEBIAN $(tmp)/usr/share/doc/leave
        install $(stripflag) -m 755 leave $(tmp)/usr/bin
-       gzip -c9 leave.1 > $(tmp)/usr/share/man/man1/leave.1.gz
-       gzip -c9 debian/changelog > 
$(tmp)/usr/share/doc/leave/changelog.Debian.gz
+       gzip -c9n leave.1 > $(tmp)/usr/share/man/man1/leave.1.gz
+       gzip -c9n debian/changelog > 
$(tmp)/usr/share/doc/leave/changelog.Debian.gz
        install -m 644 debian/copyright $(tmp)/usr/share/doc/leave
        dpkg-shlibdeps $(tmp)/usr/bin/leave
        dpkg-gencontrol -isp -P$(tmp)

Reply via email to