Package: lsdvd
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 a695c891fe01650d6bbc839a6c9fd8997af85ae4 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 27 Apr 2012 22:39:46 +0300
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]>
---
debian/changelog | 14 ++++++++++++++
debian/compat | 2 +-
debian/control | 7 ++++---
debian/patches/00list | 1 -
.../{40_palettesize.dpatch => 40-palettesize.patch} | 8 ++------
debian/patches/series | 2 ++
.../10-ifo-read.patch} | 8 ++------
debian/rules | 19 ++++++++++---------
debian/source/format | 1 +
9 files changed, 36 insertions(+), 26 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{40_palettesize.dpatch => 40-palettesize.patch} (76%)
create mode 100644 debian/patches/series
rename debian/patches/{10_ifo_read.dpatch => unused/10-ifo-read.patch} (89%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 5ee90be..1bf9756 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+lsdvd (0.16-3.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, debhelper to 9, add autotools-dev.
+ * Add build-arch and build-indep targets; use dh_prep; Adjust manpage
+ install in rules file.
+ * Patches: move disregarded patches under debian/patches/unused directory;
+ 05 contains in-line changes to original sources.
+ * Fix no-homepage-field (Lintian).
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 27 Apr 2012 22:38:21 +0300
+
lsdvd (0.16-3) unstable; urgency=low
* Update to change in libdvdread (closes: #374683).
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 3385cc3..8a5654a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: lsdvd
Section: utils
Priority: optional
Maintainer: Laszlo Boszormenyi (GCS) <[email protected]>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.0.0), dpatch, libdvdread-dev
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), libdvdread-dev, autotools-dev
+Homepage: http://sourceforge.net/projects/acidrip
Package: lsdvd
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: read the content info of a DVD
An application for reading the contents of a DVD and printing the contents
to your terminal or in more machine readable formats.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 61f4507..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-40_palettesize
diff --git a/debian/patches/40_palettesize.dpatch b/debian/patches/40-palettesize.patch
similarity index 76%
rename from debian/patches/40_palettesize.dpatch
rename to debian/patches/40-palettesize.patch
index 2246680..53f9a4e 100644
--- a/debian/patches/40_palettesize.dpatch
+++ b/debian/patches/40-palettesize.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_palettesize.dpatch.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Laszlo Boszormenyi <[email protected]>
+Subject: Make palsize const
-@DPATCH@
diff -Nur lsdvd-0.16.orig/lsdvd.c lsdvd-0.16/lsdvd.c
--- lsdvd-0.16.orig/lsdvd.c 2006-03-12 17:35:01.471273000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..00a0a2d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+05-debian-local-changes.patch
+40-palettesize.patch
diff --git a/debian/patches/10_ifo_read.dpatch b/debian/patches/unused/10-ifo-read.patch
similarity index 89%
rename from debian/patches/10_ifo_read.dpatch
rename to debian/patches/unused/10-ifo-read.patch
index b160591..60fb627 100644
--- a/debian/patches/10_ifo_read.dpatch
+++ b/debian/patches/unused/10-ifo-read.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_ifo_read.dpatch.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Laszlo Boszormenyi <[email protected]>
+Subject: Correct include statements
-@DPATCH@
diff -Nur lsdvd-0.16.orig/configure lsdvd-0.16/configure
--- lsdvd-0.16.orig/configure 2005-12-12 21:22:45.000000000 +0100
+++ lsdvd-0.16/configure 2006-06-20 22:55:56.532398250 +0200
diff --git a/debian/rules b/debian/rules
index 3f50107..9261f2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,15 +19,19 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
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
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -36,23 +40,21 @@ build-stamp: configure-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
[ ! -f Makefile ] || $(MAKE) distclean
-
+ rm -f config.guess config.sub
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
$(MAKE) install DESTDIR=$(CURDIR)/debian/lsdvd
- install -d -m 0755 $(CURDIR)/debian/lsdvd/usr/share/
- mv $(CURDIR)/debian/lsdvd/usr/man/ $(CURDIR)/debian/lsdvd/usr/share/
+ rm -rf debian/lsdvd/usr/man
# Build architecture-independent files here.
binary-indep: build install
@@ -77,4 +79,3 @@ binary-arch: build install
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
-include /usr/share/dpatch/dpatch.make
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
