Package: rzip
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
Alec, as we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 595b5bf15480777cc77a55b6495f29dc9076f32a Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 09:50:55 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
Makefile | 54 --------------------
config.h | 2 +-
debian/changelog | 9 +++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 5 --
...aintain_times.dpatch => 10maintain_times.patch} | 8 +--
...{20long_options.dpatch => 20long_options.patch} | 8 +--
...{30man_spelling.dpatch => 30man_spelling.patch} | 8 +--
debian/patches/{40runzip.dpatch => 40runzip.patch} | 8 +--
debian/patches/{50fhs.dpatch => 50fhs.patch} | 8 +--
debian/patches/series | 6 ++
debian/rules | 9 +--
debian/source/format | 1 +
14 files changed, 33 insertions(+), 99 deletions(-)
delete mode 100644 Makefile
delete mode 100644 debian/patches/00list
rename debian/patches/{10maintain_times.dpatch => 10maintain_times.patch} (89%)
rename debian/patches/{20long_options.dpatch => 20long_options.patch} (98%)
rename debian/patches/{30man_spelling.dpatch => 30man_spelling.patch} (80%)
rename debian/patches/{40runzip.dpatch => 40runzip.patch} (68%)
rename debian/patches/{50fhs.dpatch => 50fhs.patch} (60%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0d78f3b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# Makefile for rzip. This is processed by configure to produce the final
-# Makefile
-
-prefix=/usr
-exec_prefix=${prefix}
-INSTALL_BIN=$(exec_prefix)/bin
-INSTALL_MAN=$(prefix)/share/man
-
-LIBS=-lbz2
-CC=gcc
-CFLAGS=-Wall -g -O3
-
-INSTALLCMD=/usr/bin/install -c
-
-srcdir=.
-SHELL=/bin/sh
-
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o
-
-# note that the -I. is needed to handle config.h when using VPATH
-.c.o:
- $(CC) -I. -I$(srcdir) $(CFLAGS) -c $< -o $@
-
-all: rzip
-
-man: rzip.1
-
-install: all
- -mkdir -p ${INSTALL_BIN}
- ${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
- ln ${INSTALL_BIN}/rzip ${INSTALL_BIN}/runzip
- -mkdir -p ${INSTALL_MAN}/man1
- ${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
- ln ${INSTALL_MAN}/man1/rzip.1 ${INSTALL_MAN}/man1/runzip.1
-
-rzip: $(OBJS)
- $(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
-
-rzip.1: rzip.yo
- yodl2man -o rzip.1 rzip.yo
-
-web/rzip-man.html: rzip.yo
- mkdir -p man
- yodl2html -o web/rzip-man.html rzip.yo
-
-docs: rzip.1 web/rzip-man.html
-
-clean:
- rm -f *~ $(OBJS) rzip config.cache config.log config.status
diff --git a/config.h b/config.h
index 992e835..587d18b 100644
--- a/config.h
+++ b/config.h
@@ -73,7 +73,7 @@
#define _FILE_OFFSET_BITS 64
/* Define to make ftello visible on some hosts (e.g. HP-UX 10.20). */
-#define _LARGEFILE_SOURCE 1
+/* #undef _LARGEFILE_SOURCE */
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
diff --git a/debian/changelog b/debian/changelog
index e2a9d9b..7703bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rzip (2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Convert in-line patch to individual debian/patches: 05 Makefile.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 09:50:44 -0500
+
rzip (2.1-1) unstable; urgency=low
* New upstream fixes a bug that prevented some files from being
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 7459d61..37dfb0e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: rzip
Section: utils
Priority: optional
Maintainer: Alec Berryman <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), libbz2-dev (>= 1.0.2), dpatch
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 9), libbz2-dev (>= 1.0.2)
+Standards-Version: 3.9.3
Package: rzip
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 80b298b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-10maintain_times.dpatch
-20long_options.dpatch
-30man_spelling.dpatch
-40runzip.dpatch
-50fhs.dpatch
diff --git a/debian/patches/10maintain_times.dpatch b/debian/patches/10maintain_times.patch
similarity index 89%
rename from debian/patches/10maintain_times.dpatch
rename to debian/patches/10maintain_times.patch
index bb5c043..cdf806a 100644
--- a/debian/patches/10maintain_times.dpatch
+++ b/debian/patches/10maintain_times.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_maintain_times.dpatch by David Frey <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Maintain modification times.
+From: David Frey <[email protected]>
+Subject: Maintain modification times.
-@DPATCH@
diff -urNad rzip-2.1~/main.c rzip-2.1/main.c
--- rzip-2.1~/main.c 2006-02-14 00:38:23.000000000 +0000
+++ rzip-2.1/main.c 2006-03-13 15:52:17.000000000 +0000
diff --git a/debian/patches/20long_options.dpatch b/debian/patches/20long_options.patch
similarity index 98%
rename from debian/patches/20long_options.dpatch
rename to debian/patches/20long_options.patch
index 6d23ba4..d4c57f7 100644
--- a/debian/patches/20long_options.dpatch
+++ b/debian/patches/20long_options.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30long_options.dpatch by Alec Berryman <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Implement GNU-style long options.
+From: Alec Berryman <[email protected]>
+Subject: Implement GNU-style long options.
-@DPATCH@
diff -urNad rzip-2.1~/main.c rzip-2.1/main.c
--- rzip-2.1~/main.c 2006-03-18 00:51:20.000000000 +0000
+++ rzip-2.1/main.c 2006-03-18 00:51:21.000000000 +0000
diff --git a/debian/patches/30man_spelling.dpatch b/debian/patches/30man_spelling.patch
similarity index 80%
rename from debian/patches/30man_spelling.dpatch
rename to debian/patches/30man_spelling.patch
index 4c43715..158929a 100644
--- a/debian/patches/30man_spelling.dpatch
+++ b/debian/patches/30man_spelling.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30man_spelling.dpatch by Alec Berryman <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Spelling error.
+From: Alec Berryman <[email protected]>
+Subject: Spelling error.
-@DPATCH@
diff -urNad rzip-2.1~/rzip.1 rzip-2.1/rzip.1
--- rzip-2.1~/rzip.1 2006-03-13 18:47:06.000000000 +0000
+++ rzip-2.1/rzip.1 2006-03-13 18:47:23.000000000 +0000
diff --git a/debian/patches/40runzip.dpatch b/debian/patches/40runzip.patch
similarity index 68%
rename from debian/patches/40runzip.dpatch
rename to debian/patches/40runzip.patch
index c2156c0..cb6e6c7 100644
--- a/debian/patches/40runzip.dpatch
+++ b/debian/patches/40runzip.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40runzip.dpatch by Alec Berryman <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link rzip to runzip for easier unrzipping.
+From: Alec Berryman <[email protected]>
+Subject: Link rzip to runzip for easier unrzipping.
-@DPATCH@
--- rzip/Makefile.in.orig 2005-07-11 19:16:55.028553613 -0400
+++ rzip/Makefile.in 2005-07-11 19:17:36.865728150 -0400
diff --git a/debian/patches/50fhs.dpatch b/debian/patches/50fhs.patch
similarity index 60%
rename from debian/patches/50fhs.dpatch
rename to debian/patches/50fhs.patch
index 4e7aecf..c63978e 100644
--- a/debian/patches/50fhs.dpatch
+++ b/debian/patches/50fhs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50fhs.dpatch by Alec Berryman <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Alec Berryman <[email protected]>
+Subject: Correct INSTALL_MAN prefix
-@DPATCH@
--- rzip-2.1~/Makefile.in 2006-03-13 19:00:46.000000000 +0000
+++ rzip-2.1/Makefile.in 2006-03-13 19:06:15.000000000 +0000
@@ -4,7 +4,7 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cd01e4c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+05makefile
+10maintain_times.patch
+20long_options.patch
+30man_spelling.patch
+40runzip.patch
+50fhs.patch
diff --git a/debian/rules b/debian/rules
index b94a746..8e1c3a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -24,17 +23,15 @@ config.status: configure
build: build-stamp
-build-stamp: patch config.status
+build-stamp: config.status
dh_testdir
$(MAKE)
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp config.h
-$(MAKE) clean
dh_clean
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
