Bug#664439: [PATCH] nedit: Helping to update to packaging format 3.0

Package: nedit
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

Paul, as we spoke before, here is the proposed NMU patch.

Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.

Thanks,
Jari



From 89d6b683ca57dab6ae147aaa3abfde0faafed693 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 29 Feb 2012 06:07:43 -0500
Subject: [PATCH] format-3.0
Organization: Private

Signed-off-by: Jari Aalto <jari.aalto@cante.net>

debian/README.source | 2 --
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 5 ++
debian/patches/00list | 7 -
...rser_error.dpatch => 10_EOF_Parser_error.patch} | 7 ++--
...le.dpatch => 20_ChangeFlagsLinuxMakefile.patch} | 7 ++--
.../{30_off_by_one.dpatch => 30_off_by_one.patch} | 9 ++-
..._Integer.dpatch => 40_Pointer_to_Integer.patch} | 8 ++
...ChangeNCinMan.dpatch => 50_ChangeNCinMan.patch} | 7 ++--
...VersionText.dpatch => 70_EditVersionText.patch} | 9 ++-
dpatch => 80_Update_version_description.patch} | 7 ++--
debian/patches/series | 7 +++++++
debian/rules | 5 ++
debian/source/format | 1 +
15 files changed, 35 insertions(+), 56 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_EOF_Parser_error.dpatch => 10_EOF_Parser_error.patch} (86%)
rename debian/patches/{20_ChangeFlagsLinuxMakefile.dpatch => 20_ChangeFlagsLinuxMakefile.patch} (75%)
rename debian/patches/{30_off_by_one.dpatch => 30_off_by_one.patch} (79%)
rename debian/patches/{40_Pointer_to_Integer.dpatch => 40_Pointer_to_Integer.patch} (96%)
rename debian/patches/{50_ChangeNCinMan.dpatch => 50_ChangeNCinMan.patch} (96%)
rename debian/patches/{70_EditVersionText.dpatch => 70_EditVersionText.patch} (87%)
rename debian/patches/{80_Update_version_description.dpatch => 80_Update_version_description.patch} (73%)
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 b28c590..0000000
a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-The source of this package is patched using dpatch. For a information, see the
-/usr/share/doc/dpatch/README.source.gz file provided in the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index 2923e32..99f7c90 100644
a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nedit (1:5.6~cvs20081118-7.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.
+
+ -- Jari Aalto <jari.aalto@cante.net> Wed, 29 Feb 2012 05:33:04 -0500
+
nedit (1:5.6~cvs20081118-7) unstable; urgency=low

* Fixed the debian/rules to really create the debugging package
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 51f819a..e1b60f3 100644
a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: nedit
Section: editors
Priority: optional
Maintainer: Paul Gevers <paul@climbing.nl>
-Build-Depends: debhelper (>= 5),
- dpatch,
+Build-Depends: debhelper (>= 9),
lesstif2-dev (>= 1:0.95.0-2.3),
libx11-dev,
libxt-dev,
@@ -12,7 +11,7 @@ Build-Depends: debhelper (>= 5),
bison,
perl
Homepage: http://www.nedit.org/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3

Package: nedit
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 277847c..0000000
a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-10_EOF_Parser_error
-20_ChangeFlagsLinuxMakefile
-30_off_by_one
-40_Pointer_to_Integer
-50_ChangeNCinMan
-70_EditVersionText
-80_Update_version_description
diff --git a/debian/patches/10_EOF_Parser_error.dpatch b/debian/patches/10_EOF_Parser_error.patch
similarity index 86%
rename from debian/patches/10_EOF_Parser_error.dpatch
rename to debian/patches/10_EOF_Parser_error.patch
index 85df352..208c256 100644
a/debian/patches/10_EOF_Parser_error.dpatch
+++ b/debian/patches/10_EOF_Parser_error.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: fix source/tags.c to properly parse EOF
-# Origin: upstream, http://nedit.cvs.sourceforge.net/vi...mp;r2=1.71
-# Bug: https://sourceforge.net/tracker/ind...p;group_id005&atid1005
+From: Paul Gevers <paul@climbing.nl>
+Subject: Fix for SF bug #2687525: tipsfile parser error wrt to eof

-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/ReleaseNotes nedit-5.6~cvs20081118/ReleaseNotes
nedit-5.6~cvs20081118~/ReleaseNotes 2008-11-18 07:10:07.000000000 +0100
+++ nedit-5.6~cvs20081118/ReleaseNotes 2009-09-03 22:47:09.000000000 +0200
diff --git a/debian/patches/20_ChangeFlagsLinuxMakefile.dpatch b/debian/patches/20_ChangeFlagsLinuxMakefile.patch
similarity index 75%
rename from debian/patches/20_ChangeFlagsLinuxMakefile.dpatch
rename to debian/patches/20_ChangeFlagsLinuxMakefile.patch
index 5e069ba..35ae7f0 100644
a/debian/patches/20_ChangeFlagsLinuxMakefile.dpatch
+++ b/debian/patches/20_ChangeFlagsLinuxMakefile.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: Add the debian build CFLAGS to the building CFLAGS
-# Author: Paul Gevers <paul@climbing.nl>
-# Upstream: not-needed
+From: Paul Gevers <paul@climbing.nl>
+Subject: Change flags in Makefile

-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/makefiles/Makefile.linux nedit-5.6~cvs20081118/makefiles/Makefile.linux
nedit-5.6~cvs20081118~/makefiles/Makefile.linux 2009-09-15 22:13:50.000000000 +0200
+++ nedit-5.6~cvs20081118/makefiles/Makefile.linux 2009-09-28 18:20:46.000000000 +0200
diff --git a/debian/patches/30_off_by_one.dpatch b/debian/patches/30_off_by_one.patch
similarity index 79%
rename from debian/patches/30_off_by_one.dpatch
rename to debian/patches/30_off_by_one.patch
index f3498b1..76e332f 100644
a/debian/patches/30_off_by_one.dpatch
+++ b/debian/patches/30_off_by_one.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: Fix for off-by-one error, potentially causing a crash
-# Origin: upstream, http://nedit.cvs.sourceforge.net/vi...view=patch
-# Author: Evan Teran
-# Bug: https://sourceforge.net/tracker/ind...il&aid(58723&group_id005&atid1005
+From: Paul Gevers <paul@climbing.nl>
+Subject: Fix off-by-one error, potentially causing a crash '(SF #2858723)

-
-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/ReleaseNotes nedit-5.6~cvs20081118/ReleaseNotes
nedit-5.6~cvs20081118~/ReleaseNotes 2009-09-15 21:24:31.000000000 +0200
+++ nedit-5.6~cvs20081118/ReleaseNotes 2009-09-15 21:25:24.000000000 +0200
diff --git a/debian/patches/40_Pointer_to_Integer.dpatch b/debian/patches/40_Pointer_to_Integer.patch
similarity index 96%
rename from debian/patches/40_Pointer_to_Integer.dpatch
rename to debian/patches/40_Pointer_to_Integer.patch
index 9081ea3..4934ede 100644
a/debian/patches/40_Pointer_to_Integer.dpatch
+++ b/debian/patches/40_Pointer_to_Integer.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: fix warning: cast from pointer to integer of different size
-# Origin: https://sourceforge.net/tracker/dow...p?group_id005&atid11005&file_id40993&aid(46694
-# Bug: https://sourceforge.net/tracker/?fu...05&aid(46694&group_id005
-# Author: Jack Howarth <jwhowarth@users.sourceforge.net>
+From: Paul Gevers <paul@climbing.nl>
+Subject: fix compiler warning on 64 bit (SF #2846694)

-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c
nedit-5.6~cvs20081118~/Xlt/SlideC.c 2009-09-15 21:27:12.000000000 +0200
+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.000000000 +0200
diff --git a/debian/patches/50_ChangeNCinMan.dpatch b/debian/patches/50_ChangeNCinMan.patch
similarity index 96%
rename from debian/patches/50_ChangeNCinMan.dpatch
rename to debian/patches/50_ChangeNCinMan.patch
index 4f61f34..544980a 100644
a/debian/patches/50_ChangeNCinMan.dpatch
+++ b/debian/patches/50_ChangeNCinMan.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: nedit-nc is upstream called nc, adjusted the man
-# Author: Paul Gevers <paul@climbing.nl>
-# Upstream: not-needed
+From: Paul Gevers <paul@climbing.nl>
+Subject: update manpage to change name of NC in Nedit-NC

-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/doc/nc.pod nedit-5.6~cvs20081118/doc/nc.pod
nedit-5.6~cvs20081118~/doc/nc.pod 2005-03-03 08:49:37.000000000 -0600
+++ nedit-5.6~cvs20081118/doc/nc.pod 2008-11-29 21:02:42.000000000 -0600
diff --git a/debian/patches/70_EditVersionText.dpatch b/debian/patches/70_EditVersionText.patch
similarity index 87%
rename from debian/patches/70_EditVersionText.dpatch
rename to debian/patches/70_EditVersionText.patch
index be66e10..edd6052 100644
a/debian/patches/70_EditVersionText.dpatch
+++ b/debian/patches/70_EditVersionText.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: When nedit is started with the --version option it
-# outputs that the lesstif version in Debian is known to be bad, but
-# the bug (#356017) is fixed.
-# Author: Paul Gevers <paul@climbing.nl>
-# Upstream: not-needed
+From: Paul Gevers <paul@climbing.nl>
+Subject: improve warning string

-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/source/help.c nedit-5.6~cvs20081118/source/help.c
nedit-5.6~cvs20081118~/source/help.c 2008-08-20 00:24:41.000000000 +0200
+++ nedit-5.6~cvs20081118/source/help.c 2009-05-08 19:25:01.000000000 +0200
diff --git a/debian/patches/80_Update_version_description.dpatch b/debian/patches/80_Update_version_description.patch
similarity index 73%
rename from debian/patches/80_Update_version_description.dpatch
rename to debian/patches/80_Update_version_description.patch
index 30aeb43..354d8ac 100644
a/debian/patches/80_Update_version_description.dpatch
+++ b/debian/patches/80_Update_version_description.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: Create a version string which is reconizable as Debian.
-# Author: Paul Gevers <paul@climbing.nl>
-# Upstream: not-needed
+From: Paul Gevers <paul@climbing.nl>
+Subject: Use string reflecting the real version

-@DPATCH@
diff -urNad nedit-5.6~cvs20081118~/source/help_data.h nedit-5.6~cvs20081118/source/help_data.h
nedit-5.6~cvs20081118~/source/help_data.h 2008-01-04 23:11:03.000000000 +0100
+++ nedit-5.6~cvs20081118/source/help_data.h 2009-09-04 19:38:44.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..35641fd
/dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+10_EOF_Parser_error.patch
+20_ChangeFlagsLinuxMakefile.patch
+30_off_by_one.patch
+40_Pointer_to_Integer.patch
+50_ChangeNCinMan.patch
+70_EditVersionText.patch
+80_Update_version_description.patch
diff --git a/debian/rules b/debian/rules
index d89c89c..54950fd 100755
a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@

# define installation dir
export INSTALLDIR=$(shell pwd)/debian/nedit
-include /usr/share/dpatch/dpatch.make

DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -20,7 +19,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif

build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE) CFLAGSD="$(CFLAGS)" linux
(cd doc; $(MAKE) VERSION="NEdit $(VERSION)" all)
@@ -28,7 +27,7 @@ build-stamp: patch-stamp
mv doc/nedit.man doc/nedit.1
touch build-stamp

-clean: unpatch
+clean:
dh_testdir
dh_testdir
rm -f doc/nedit.1 doc/nedit-nc.1 source/nedit-nc
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





To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org