Package: ytalk
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
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 1b65ca7e7d61babd5f4bb9d84914d07425c66874 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 12:14:20 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 12 +++++++
debian/compat | 2 +-
debian/control | 7 ++--
debian/patches/00list | 4 ---
debian/patches/{man.dpatch => 05-man.patch} | 8 ++---
.../patches/{self-log.dpatch => 10-self-log.patch} | 8 ++---
debian/patches/{shell.dpatch => 15-shell.patch} | 8 ++---
debian/patches/{user.dpatch => 20-user.patch} | 8 ++---
debian/patches/series | 4 +++
debian/rules | 34 ++++++--------------
debian/source/format | 1 +
11 files changed, 40 insertions(+), 56 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{man.dpatch => 05-man.patch} (70%)
rename debian/patches/{self-log.dpatch => 10-self-log.patch} (75%)
rename debian/patches/{shell.dpatch => 15-shell.patch} (74%)
rename debian/patches/{user.dpatch => 20-user.patch} (65%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index bfe97d5..4498f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ytalk (3.3.0-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add depends autotools-dev to use latest config.* files.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 12:14:01 +0300
+
ytalk (3.3.0-5) unstable; urgency=low
* Patches from Marc Glisse <marc.gli...@loria.fr>
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index d0ca683..8a5b73d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: ytalk
Section: net
Priority: optional
Maintainer: Matthew Johnson <mj...@debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), libncurses5-dev, dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), libncurses5-dev, autotools-dev
+Homepage: http://freecode.com/projects/ytalk
Package: ytalk
Architecture: any
-Depends: ${shlibs:Depends}, talkd
+Depends: ${misc:Depends}, ${shlibs:Depends}, talkd
Description: enhanced talk program
Ytalk is a multi-user chat program. It works exactly like the UNIX talk
program and even communicates with the same talk daemons. The primary
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2de2529..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-man.dpatch
-self-log.dpatch
-shell.dpatch
-user.dpatch
diff --git a/debian/patches/man.dpatch b/debian/patches/05-man.patch
similarity index 70%
rename from debian/patches/man.dpatch
rename to debian/patches/05-man.patch
index daa4603..289404b 100644
--- a/debian/patches/man.dpatch
+++ b/debian/patches/05-man.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## man.dpatch by <mj...@adonis.matthew.ath.cx>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a manpage bug
+From: <mj...@adonis.matthew.ath.cx>
+Subject: Fix a manpage bug
-@DPATCH@
--- ytalk-3.3.0.orig/docs/ytalk.1.in
+++ ytalk-3.3.0/docs/ytalk.1.in
diff --git a/debian/patches/self-log.dpatch b/debian/patches/10-self-log.patch
similarity index 75%
rename from debian/patches/self-log.dpatch
rename to debian/patches/10-self-log.patch
index 3b6b94a..e27563d 100644
--- a/debian/patches/self-log.dpatch
+++ b/debian/patches/10-self-log.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## self-log.dpatch by <mj...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: self-log
+From: <mj...@debian.org>
+Subject: self-log
-@DPATCH@
--- ytalk-3.3.0/src/comm.c.orig 2007-12-09 16:06:51.797555519 +0000
+++ ytalk-3.3.0/src/comm.c 2007-12-09 16:07:37.798642716 +0000
diff --git a/debian/patches/shell.dpatch b/debian/patches/15-shell.patch
similarity index 74%
rename from debian/patches/shell.dpatch
rename to debian/patches/15-shell.patch
index f5a4d97..6bc4404 100644
--- a/debian/patches/shell.dpatch
+++ b/debian/patches/15-shell.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## shell.dpatch by <mj...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: shell
+From: <mj...@debian.org>
+Subject: shell
-@DPATCH@
--- ytalk-3.3.0/src/exec.c.orig 2007-12-09 16:08:47.800297534 +0000
+++ ytalk-3.3.0/src/exec.c 2007-12-09 16:10:06.302153849 +0000
diff --git a/debian/patches/user.dpatch b/debian/patches/20-user.patch
similarity index 65%
rename from debian/patches/user.dpatch
rename to debian/patches/20-user.patch
index afd4f3a..571e490 100644
--- a/debian/patches/user.dpatch
+++ b/debian/patches/20-user.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## user.dpatch by <mj...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: user
+From: <mj...@debian.org>
+Subject: user
-@DPATCH@
--- ytalk-3.3.0/src/user.c 2007-12-09 16:08:26.799801039 +0000
+++ ytalk-3.3.0/src/user.c.orig 2007-12-09 16:10:39.302934384 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..224762d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+05-man.patch
+10-self-log.patch
+15-shell.patch
+20-user.patch
diff --git a/debian/rules b/debian/rules
index 772381a..935aae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -20,29 +19,18 @@ else
CFLAGS += -O2
endif
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-config.status: patch configure
+config.status: configure
dh_testdir
# Configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- ln -sf /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- ln -sf /usr/share/misc/config.guess config.guess
-endif
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man --sysconfdir=/etc \
--without-x
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: config.status
@@ -53,21 +41,19 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
- rm -f config.guess config.sub
-
+ rm -f build-stamp
# Clean up after the build process.
- -$(MAKE) distclean
-
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f config.guess config.sub
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs /etc
# Install into debian/ytalk.
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.5
