Package: gdis
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 0c9d54e3439038594c04640a49f932d3d72ad099 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 6 Apr 2012 17:29:50 +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/README.source | 7 -------
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
debian/patches/01-elem-path-change.patch | 18 ++++++++++++++++++
debian/patches/Debian_make.dpatch | 22 ----------------------
debian/patches/series | 2 ++
debian/rules | 13 ++++++++-----
debian/source.lintian-overrides | 3 ---
debian/source/format | 1 +
makefile.debian | 19 -------------------
12 files changed, 43 insertions(+), 60 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-elem-path-change.patch
delete mode 100644 debian/patches/Debian_make.dpatch
create mode 100644 debian/patches/series
delete mode 100644 debian/source.lintian-overrides
create mode 100644 debian/source/format
delete mode 100644 makefile.debian
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 6898665..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-gdis source for Debian
-----------------------
-
-This package uses the `dpatch' patch management solution. See
-/usr/share/doc/dpatch/README.source.gz.
-
- -- Daniel Leidert (dale) <[email protected]>, Mar 2009
diff --git a/debian/changelog b/debian/changelog
index fba886d..ad480d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gdis (0.90-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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * New Patch 10: convert in-line changes into a separate patch.
+ * Remove *-overrides files; no longer needed in format "3.0 quilt".
+
+ -- Jari Aalto <[email protected]> Fri, 06 Apr 2012 17:28:59 +0300
+
gdis (0.90-3) unstable; urgency=low
* debian/control (Build-Depends): Removed spurious depends (closes: #563792).
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 82019fe..5c05902 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
Priority: optional
Maintainer: Debichem Team <[email protected]>
Uploaders: Daniel Leidert (dale) <[email protected]>
-Build-Depends: debhelper (>> 5), dpatch, libgtkglext1-dev, libgtk2.0-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libgtkglext1-dev, libgtk2.0-dev
+Standards-Version: 3.9.3.1
Homepage: http://gdis.sourceforge.net/
Vcs-Browser: http://svn.debian.org/wsvn/debichem/
Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/gdis/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7e41390..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-Debian_make
diff --git a/debian/patches/01-elem-path-change.patch b/debian/patches/01-elem-path-change.patch
new file mode 100644
index 0000000..d586677
--- /dev/null
+++ b/debian/patches/01-elem-path-change.patch
@@ -0,0 +1,18 @@
+From: Noèl Köthe <[email protected]>
+Subject: Fix gdis.elements path, so it is not expected in /usr/bin
+
+<URL:http://bugs.debian.org/399132>
+<URL:http://packages.debian.org/changelogs/pool/main/g/gdis/gdis_0.89-2.1/changelog#versionversion0.89-2>
+
+diff -urNad gdis~/gdis.h gdis/gdis.h
+--- gdis~/gdis.h 2008-09-25 03:35:40.000000000 +0200
++++ gdis/gdis.h 2009-04-01 01:52:29.000000000 +0200
+@@ -92,7 +92,7 @@
+ #define INIT_FILE ".gdisrc"
+ #endif
+
+-#define ELEM_FILE "gdis.elements"
++#define ELEM_FILE "../share/gdis/gdis.elements"
+ #define LIBRARY_FILE "gdis.library"
+
+ /*
diff --git a/debian/patches/Debian_make.dpatch b/debian/patches/Debian_make.dpatch
deleted file mode 100644
index 929ae1f..0000000
--- a/debian/patches/Debian_make.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Debian_make.dpatch by Noèl Köthe <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix gdis.elements path, so it is not expected in /usr/bin
-## DP:
-## DP: <URL:http://bugs.debian.org/399132>
-## DP: <URL:http://packages.debian.org/changelogs/pool/main/g/gdis/gdis_0.89-2.1/changelog#versionversion0.89-2>
-
-@DPATCH@
-diff -urNad gdis~/gdis.h gdis/gdis.h
---- gdis~/gdis.h 2008-09-25 03:35:40.000000000 +0200
-+++ gdis/gdis.h 2009-04-01 01:52:29.000000000 +0200
-@@ -92,7 +92,7 @@
- #define INIT_FILE ".gdisrc"
- #endif
-
--#define ELEM_FILE "gdis.elements"
-+#define ELEM_FILE "../share/gdis/gdis.elements"
- #define LIBRARY_FILE "gdis.library"
-
- /*
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b86879b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-elem-path-change.patch
+10-makefile.patch
diff --git a/debian/rules b/debian/rules
index 92df349..9136575 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,27 +5,30 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
override CFLAGS += -Wall -g
override LDFLAGS += -Wl,--as-needed
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE) -f makefile.debian
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
$(MAKE) -f makefile.debian clean
- dh_clean build-stamp patch-stamp
+ dh_clean build-stamp
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
binary-indep: build install
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index aae8c4d..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is created for Debian. I could also ship it inside debian/ to make
-# lintian happy. But there it is better.
-gdis source: patch-system-but-direct-changes-in-diff makefile.debian
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)
diff --git a/makefile.debian b/makefile.debian
deleted file mode 100644
index 5924ce3..0000000
--- a/makefile.debian
+++ /dev/null
@@ -1,19 +0,0 @@
-CFLAGS ?= -g -Wall -O2
-
-override CFLAGS += `pkg-config --cflags gtk+-2.0 gthread-2.0 gtkglext-1.0 gmodule-2.0`
-override LDLIBS += `pkg-config --libs gtk+-2.0 gthread-2.0 gtkglext-1.0 gmodule-2.0`
-
-USE_GUI = YES
-override CFLAGS += -DWITH_GUI
-USE_GRISU = NO
-override CFLAGS += -UWITH_GRISU
-
-include makefile.src
-
-OBJ = $(SRC:.c=.o)
-
-gdis: $(OBJ)
- $(CC) $^ $(LDFLAGS) -o $@ $(LDLIBS)
-
-clean:
- $(RM) $(OBJ) gdis
--
1.7.9.1
