Package: recordmydesktop
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 ae4fcd33098345542ecbfcf2006ffbe06ffb18b2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 25 Apr 2012 11:01:22 +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/README.source | 7 -------
debian/changelog | 10 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 2 +-
debian/patches/00list | 3 ---
...te_includes.dpatch => 01-update-includes.patch} | 8 ++-----
...x_new_theora.dpatch => 02-fix-new-theora.patch} | 8 ++-----
debian/patches/series | 3 +++
debian/rules | 22 +++++++++-----------
debian/source/format | 1 +
11 files changed, 32 insertions(+), 38 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_update_includes.dpatch => 01-update-includes.patch} (78%)
rename debian/patches/{02_fix_new_theora.dpatch => 02-fix-new-theora.patch} (87%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 35ce936..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses the dpatch system to save and apply patches to the
-upstream source code of the software that is packaged. For details
-about how to use dpatch read
-
- /usr/share/doc/dpatch/README.source.gz
-
-from the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index 43e59ea..1c55250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+recordmydesktop (0.3.8.1+svn602-1.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 build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 25 Apr 2012 11:00:23 +0300
+
recordmydesktop (0.3.8.1+svn602-1) unstable; urgency=low
* New version from upstream svn (Closes: #549263, #544699)
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 80d56f2..d38a111 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: video
Priority: optional
Maintainer: José L. Redrejo Rodríguez <jredr...@debian.org>
Homepage: http://recordmydesktop.sourceforge.net
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libxdamage-dev, libvorbis-dev, libogg-dev, libxext-dev, libtheora-dev (>= 0.0.0.alpha7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libice-dev, libsm-dev, zlib1g-dev, libjack-dev, libpopt-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), autotools-dev, libxdamage-dev, libvorbis-dev, libogg-dev, libxext-dev, libtheora-dev (>= 0.0.0.alpha7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libice-dev, libsm-dev, zlib1g-dev, libjack-dev, libpopt-dev
+Standards-Version: 3.9.3
Package: recordmydesktop
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 5164862..1d72f02 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,4 +25,4 @@ Copyright (C) 2006 John Varouhakis <biocras...@gmail.com>
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0fb9528..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_update_includes.dpatch
-02_fix_new_theora.dpatch
-
diff --git a/debian/patches/01_update_includes.dpatch b/debian/patches/01-update-includes.patch
similarity index 78%
rename from debian/patches/01_update_includes.dpatch
rename to debian/patches/01-update-includes.patch
index 6ddd8e7..6ed3de7 100644
--- a/debian/patches/01_update_includes.dpatch
+++ b/debian/patches/01-update-includes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_update_includes.dpatch by <jredr...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update Xorg includes
+From: José L. Redrejo Rodríguez <jredr...@debian.org>
+Subject: Update Xorg includes
-@DPATCH@
--- recordmydesktop-0.3.8.1+svn602.orig/src/rmd_update_image.c 2010-02-08 18:30:42.000000000 +0100
+++ recordmydesktop-0.3.8.1+svn602.bueno/src/rmd_update_image.c 2010-02-08 19:06:24.000000000 +0100
diff --git a/debian/patches/02_fix_new_theora.dpatch b/debian/patches/02-fix-new-theora.patch
similarity index 87%
rename from debian/patches/02_fix_new_theora.dpatch
rename to debian/patches/02-fix-new-theora.patch
index f543f46..276cc8e 100644
--- a/debian/patches/02_fix_new_theora.dpatch
+++ b/debian/patches/02-fix-new-theora.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_new_theora.dpatch by <root@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix recording with newest libtheora versions
+From: José L. Redrejo Rodríguez <root@localhost>
+Subject: Fix recording with newest libtheora versions
-@DPATCH@
--- recordmydesktop-0.3.8.1+svn602.orig/src/rmd_initialize_data.c 2010-02-08 18:30:42.000000000 +0100
+++ recordmydesktop-0.3.8.1+svn602.bueno/src/rmd_initialize_data.c 2010-02-08 19:12:36.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5300548
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-update-includes.patch
+02-fix-new-theora.patch
+
diff --git a/debian/rules b/debian/rules
index a54a248..e3c118d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -24,12 +22,17 @@ endif
confflags += X_LIBS=" -L/usr/lib -lX11" X_CFLAGS=" -DXTHREADS"
-config.status: configure patch-stamp
+config.status: configure
dh_testdir
+ 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 $(confflags)
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: config.status
@@ -37,24 +40,19 @@ build-stamp: config.status
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
rm -f config.log
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- dh_clean
+ rm -f config.sub config.guess
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/recordmydesktop
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.10
