On Fri, 19 May 2023 15:53:52 +0200 Bastian Germann <b...@debian.org> wrote:
Most of this was done with -8.1. However, the 3.0 (quilt) conversion is missing.
I am uploading a NMU to DELAYED/10 with the 2.0 change applied. Please note that I leave the debian/patches directory
untouched, which does not have a quilt series file, so the patches are not applied (not before and not after ma NMU).diff -Nru aa3d-1.0/debian/aa3d.manpages aa3d-1.0/debian/aa3d.manpages
--- aa3d-1.0/debian/aa3d.manpages 1970-01-01 01:00:00.000000000 +0100
+++ aa3d-1.0/debian/aa3d.manpages 2022-02-01 14:07:36.000000000 +0100
@@ -0,0 +1 @@
+debian/aa3d.1
diff -Nru aa3d-1.0/debian/changelog aa3d-1.0/debian/changelog
--- aa3d-1.0/debian/changelog 2022-02-01 14:24:53.000000000 +0100
+++ aa3d-1.0/debian/changelog 2022-02-01 14:07:36.000000000 +0100
@@ -1,3 +1,10 @@
+aa3d (1.0-9) unstable; urgency=medium
+
+ * Convert to dh and quilt (Closes: #965400, #965401)
+ * Drop 01_makefile.patch (Closes: #904146)
+
+ -- Tormod Volden <debian.tor...@gmail.com> Tue, 01 Feb 2022 14:07:36 +0100
+
aa3d (1.0-8) unstable; urgency=low
* Add 'Depends: ${misc:Depends}' (lintian).
diff -Nru aa3d-1.0/debian/compat aa3d-1.0/debian/compat
--- aa3d-1.0/debian/compat 2022-02-01 14:24:53.000000000 +0100
+++ aa3d-1.0/debian/compat 2022-02-01 13:55:38.000000000 +0100
@@ -1 +1 @@
-5
+12
diff -Nru aa3d-1.0/debian/control aa3d-1.0/debian/control
--- aa3d-1.0/debian/control 2022-02-01 14:24:53.000000000 +0100
+++ aa3d-1.0/debian/control 2022-02-01 14:07:36.000000000 +0100
@@ -2,8 +2,8 @@
Section: graphics
Priority: optional
Maintainer: Uwe Hermann <u...@debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 12)
+Standards-Version: 4.6.0
Homepage: http://aa-project.sourceforge.net/aa3d/
Package: aa3d
diff -Nru aa3d-1.0/debian/patches/00_typos_and_small_fixes.patch
aa3d-1.0/debian/patches/00_typos_and_small_fixes.patch
--- aa3d-1.0/debian/patches/00_typos_and_small_fixes.patch 2022-02-01
14:24:53.000000000 +0100
+++ aa3d-1.0/debian/patches/00_typos_and_small_fixes.patch 2022-02-01
14:01:09.000000000 +0100
@@ -1,3 +1,8 @@
+Description: Various fixups of text and typos
+ Updated links
+ Add include of string.h to fix build warning
+Author: Uwe Hermann <u...@debian.org>
+
diff -Naur aa3d-1.0.orig/README aa3d-1.0/README
--- aa3d-1.0.orig/README 1998-08-18 18:48:58.000000000 +0200
+++ aa3d-1.0/README 2005-07-08 18:55:34.000000000 +0200
diff -Nru aa3d-1.0/debian/patches/01_makefile.patch
aa3d-1.0/debian/patches/01_makefile.patch
--- aa3d-1.0/debian/patches/01_makefile.patch 2022-02-01 14:24:53.000000000
+0100
+++ aa3d-1.0/debian/patches/01_makefile.patch 1970-01-01 01:00:00.000000000
+0100
@@ -1,17 +0,0 @@
---- Makefile.orig 2006-04-14 18:58:07.000000000 +0200
-+++ Makefile 2006-04-14 18:57:46.000000000 +0200
-@@ -1,3 +1,12 @@
--aa3d: aa3d.c
-+CC=gcc
-+
-+all: aa3d
-+
-+aa3d: aa3d.o
-+ $(CC) $(CFLAGS) -o aa3d aa3d.o
-+
-+aa3d.o: aa3d.c
-+
- clean:
-- rm -f aa3d.o aa3d
-+ rm -f core aa3d.o aa3d
-+
diff -Nru aa3d-1.0/debian/patches/series aa3d-1.0/debian/patches/series
--- aa3d-1.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ aa3d-1.0/debian/patches/series 2022-02-01 13:57:18.000000000 +0100
@@ -0,0 +1 @@
+00_typos_and_small_fixes.patch
diff -Nru aa3d-1.0/debian/rules aa3d-1.0/debian/rules
--- aa3d-1.0/debian/rules 2022-02-01 14:24:53.000000000 +0100
+++ aa3d-1.0/debian/rules 2022-02-01 14:07:36.000000000 +0100
@@ -1,12 +1,8 @@
#!/usr/bin/make -f
-DEB_INSTALL_MANPAGES_aa3d := debian/aa3d.1
+%:
+ dh $@
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-install/aa3d::
+override_dh_install:
install aa3d $(CURDIR)/debian/aa3d/usr/bin
install -m 0644 logo pyramid $(CURDIR)/debian/aa3d/usr/share/aa3d
-
diff -Nru aa3d-1.0/debian/source/format aa3d-1.0/debian/source/format
--- aa3d-1.0/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ aa3d-1.0/debian/source/format 2022-02-01 14:03:59.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
