Package: videogen
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 d026b73f48aaf04067ba71c8143e82b604028222 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 30 Apr 2012 18:01:57 +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 | 6 +++---
debian/copyright | 2 +-
debian/patches/00list | 5 -----
.../{01_print_errors.dpatch => 01-print-errors.patch} | 8 ++------
debian/patches/{02_Makefile.dpatch => 02-Makefile.patch} | 8 ++------
...rs_messages.dpatch => 03-nicer-errors-messages.patch} | 9 ++-------
debian/patches/{04_manpage.dpatch => 04-manpage.patch} | 8 ++------
...z_frame_length.dpatch => 05-horiz-frame-length.patch} | 8 ++------
.../{07_videogen_man.dpatch => 07-videogen-man.patch} | 9 ++-------
debian/patches/series | 5 +++++
debian/rules | 11 +++++++----
debian/source/format | 1 +
14 files changed, 40 insertions(+), 56 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_print_errors.dpatch => 01-print-errors.patch} (97%)
rename debian/patches/{02_Makefile.dpatch => 02-Makefile.patch} (78%)
rename debian/patches/{03_nicer_errors_messages.dpatch => 03-nicer-errors-messages.patch} (94%)
rename debian/patches/{04_manpage.dpatch => 04-manpage.patch} (78%)
rename debian/patches/{05_horiz_frame_length.dpatch => 05-horiz-frame-length.patch} (53%)
rename debian/patches/{07_videogen_man.dpatch => 07-videogen-man.patch} (97%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index eb55fc6..481b98e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+videogen (0.32-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 build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <[email protected]> Mon, 30 Apr 2012 17:59:57 +0300
+
videogen (0.32-5) unstable; urgency=low
* Move to debhelper version 5
@@ -150,7 +160,3 @@ videogen (0.16-1) unstable; urgency=low
* Initial Release.
-- Edvard Majakari <[email protected]> Wed, 5 Jan 2000 16:03:59 +0200
-
-Local variables:
-mode: debian-changelog
-End:
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 b562786..677b587 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: videogen
Section: x11
Priority: optional
Maintainer: Bas Zoetekouw <[email protected]>
-Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 5), flex, bison, dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), flex, bison
Homepage: http://www.dynaweb.hu/opensource/videogen/
Package: videogen
Architecture: any
-Depends: bc, ${shlibs:Depends}
+Depends: ${misc:Depends}, bc, ${shlibs:Depends}
Description: Create arbitrary-res modelines using hardware parameters
Videogen is a small but nice utility to create modelines you can
insert into your xorg.conf and fb.modes files.
diff --git a/debian/copyright b/debian/copyright
index bab5bf1..7148c2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,4 +15,4 @@ All rights reserved.
You are free to distribute this software under the terms of the GNU
General Public License. On Debian systems, the complete text of the
GNU General Public License can be found in
-/usr/share/common-licenses/GPL file on Debian systems.
+/usr/share/common-licenses/GPL-2 file on Debian systems.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d476d2f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_print_errors.dpatch
-02_Makefile.dpatch
-03_nicer_errors_messages.dpatch
-04_manpage.dpatch
-05_horiz_frame_length.dpatch
diff --git a/debian/patches/01_print_errors.dpatch b/debian/patches/01-print-errors.patch
similarity index 97%
rename from debian/patches/01_print_errors.dpatch
rename to debian/patches/01-print-errors.patch
index f64c4de..afa5715 100644
--- a/debian/patches/01_print_errors.dpatch
+++ b/debian/patches/01-print-errors.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_print_errors.dpatch by Bas Zoetekouw <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Actually print out errors, also in non-verbose mode
+From: Bas Zoetekouw <[email protected]>
+Subject: Actually print out errors, also in non-verbose mode
-@DPATCH@
--- videogen-0.32.orig/args.c
+++ videogen-0.32/args.c
diff --git a/debian/patches/02_Makefile.dpatch b/debian/patches/02-Makefile.patch
similarity index 78%
rename from debian/patches/02_Makefile.dpatch
rename to debian/patches/02-Makefile.patch
index 5032245..f97e0c6 100644
--- a/debian/patches/02_Makefile.dpatch
+++ b/debian/patches/02-Makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_Makefile.dpatch by Bas Zoetekouw <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix Makefile for Debian
+From: Bas Zoetekouw <[email protected]>
+Subject: Fix Makefile for Debian
-@DPATCH@
--- videogen-0.32.orig/Makefile
+++ videogen-0.32/Makefile
diff --git a/debian/patches/03_nicer_errors_messages.dpatch b/debian/patches/03-nicer-errors-messages.patch
similarity index 94%
rename from debian/patches/03_nicer_errors_messages.dpatch
rename to debian/patches/03-nicer-errors-messages.patch
index e93daec..67db255 100644
--- a/debian/patches/03_nicer_errors_messages.dpatch
+++ b/debian/patches/03-nicer-errors-messages.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_nicer_error_messages.dpatch by Bas Zoetekouw <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Improved error messages by Michael Sebastian <[email protected]>
-## (closes: #345620)
+From: Bas Zoetekouw <[email protected]>
+Subject: Improved error messages by Michael Sebastian <[email protected]>
-@DPATCH@
diff -urN videogen-0.32/args.c videogen-0.32-new/args.c
--- videogen-0.32/args.c 2006-01-02 00:28:21.000000000 -0800
diff --git a/debian/patches/04_manpage.dpatch b/debian/patches/04-manpage.patch
similarity index 78%
rename from debian/patches/04_manpage.dpatch
rename to debian/patches/04-manpage.patch
index a763be8..2719580 100644
--- a/debian/patches/04_manpage.dpatch
+++ b/debian/patches/04-manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_manpage.dpatch by Bas Zoetekouw <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix man page
+From: Bas Zoetekouw <[email protected]>
+Subject: Fix man page
-@DPATCH@
--- videogen-0.32.orig/videogen.1x
+++ videogen-0.32/videogen.1x
diff --git a/debian/patches/05_horiz_frame_length.dpatch b/debian/patches/05-horiz-frame-length.patch
similarity index 53%
rename from debian/patches/05_horiz_frame_length.dpatch
rename to debian/patches/05-horiz-frame-length.patch
index 299676b..a85ac86 100644
--- a/debian/patches/05_horiz_frame_length.dpatch
+++ b/debian/patches/05-horiz-frame-length.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_horiz_frame_length.dpatch by Bas Zoetekouw <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix max visibly fraction of horizontal frame length
+From: Bas Zoetekouw <[email protected]>
+Subject: Fix max visibly fraction of horizontal frame length
-@DPATCH@
--- videogen-0.32.orig/config.h
+++ videogen-0.32/config.h
diff --git a/debian/patches/07_videogen_man.dpatch b/debian/patches/07-videogen-man.patch
similarity index 97%
rename from debian/patches/07_videogen_man.dpatch
rename to debian/patches/07-videogen-man.patch
index 63bdf0b..67ac46a 100644
--- a/debian/patches/07_videogen_man.dpatch
+++ b/debian/patches/07-videogen-man.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_videomode_man.datch by J S Bygott <[email protected]>
-## fixes: #410361
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix man page
+From: J S Bygott <[email protected]>
+Subject: Fix man page
-@DPATCH@
--- videogen-old/videogen.1x 2006-08-23 14:19:34.000000000 +0100
+++ videogen/videogen.1x 2007-02-10 01:56:42.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f4158d3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01-print-errors.patch
+02-Makefile.patch
+03-nicer-errors-messages.patch
+04-manpage.patch
+05-horiz-frame-length.patch
diff --git a/debian/rules b/debian/rules
index 88f8da3..2edf0cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS=-g -Wall
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14,15 +13,19 @@ else
endif
export CFLAGS
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -36,7 +39,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/videogen.
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
