diff -Nru ciso-1.0.0/debian/changelog ciso-1.0.0/debian/changelog --- ciso-1.0.0/debian/changelog 2022-03-02 19:23:13.000000000 +0000 +++ ciso-1.0.0/debian/changelog 2022-03-02 16:29:09.000000000 +0000 @@ -1,3 +1,11 @@ +ciso (1.0.0-0ubuntu5) jammy; urgency=medium + + * Move away from dpatch + * Convert to modern debhelper 13. + * Patch the build system to be more sane + + -- Gianfranco Costamagna Wed, 02 Mar 2022 17:29:09 +0100 + ciso (1.0.0-0ubuntu3) bionic; urgency=high * No change rebuild to pick up -fPIE compiler default diff -Nru ciso-1.0.0/debian/ciso.manpages ciso-1.0.0/debian/ciso.manpages --- ciso-1.0.0/debian/ciso.manpages 1970-01-01 00:00:00.000000000 +0000 +++ ciso-1.0.0/debian/ciso.manpages 2022-03-02 16:29:09.000000000 +0000 @@ -0,0 +1 @@ +debian/ciso.1 diff -Nru ciso-1.0.0/debian/compat ciso-1.0.0/debian/compat --- ciso-1.0.0/debian/compat 2022-03-02 19:23:13.000000000 +0000 +++ ciso-1.0.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -5 diff -Nru ciso-1.0.0/debian/control ciso-1.0.0/debian/control --- ciso-1.0.0/debian/control 2022-03-02 19:23:13.000000000 +0000 +++ ciso-1.0.0/debian/control 2022-03-02 16:29:09.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Gaëtan Petit -Build-Depends: debhelper (>= 5), zlib1g-dev, dpatch -Standards-Version: 3.7.2 +Build-Depends: debhelper-compat (= 13), zlib1g-dev +Standards-Version: 4.6.0 Package: ciso Architecture: any diff -Nru ciso-1.0.0/debian/patches/00list ciso-1.0.0/debian/patches/00list --- ciso-1.0.0/debian/patches/00list 2022-03-02 19:23:13.000000000 +0000 +++ ciso-1.0.0/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_mem_alloc_failure_amd64.dpatch diff -Nru ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.dpatch ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.dpatch --- ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.dpatch 2022-03-02 19:23:13.000000000 +0000 +++ ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_mem_alloc_failure_amd64.dpatch by Brian Murray -## -## Ubuntu: http://launchpad.net/bugs/163308 -## Description: Use standard integer types to avoid accidental 8 byte value -## when 4 was intended (32bit vs 64bit long) - -@DPATCH@ -diff -urNad ciso-1.0.0-20081201~/ciso.c ciso-1.0.0-20081201/ciso.c ---- ciso-1.0.0-20081201~/ciso.c 2008-12-01 16:16:21.000000000 -0800 -+++ ciso-1.0.0-20081201/ciso.c 2008-12-01 16:53:07.000000000 -0800 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include /* /usr(/local)/include/zlib.h */ - #include - -diff -urNad ciso-1.0.0-20081201~/ciso.h ciso-1.0.0-20081201/ciso.h ---- ciso-1.0.0-20081201~/ciso.h 2008-12-01 16:16:21.000000000 -0800 -+++ ciso-1.0.0-20081201/ciso.h 2008-12-01 16:52:35.000000000 -0800 -@@ -28,9 +28,9 @@ - typedef struct ciso_header - { - unsigned char magic[4]; /* +00 : 'C','I','S','O' */ -- unsigned long header_size; /* +04 : header size (==0x18) */ -+ uint32_t header_size; /* +04 : header size (==0x18) */ - unsigned long long total_bytes; /* +08 : number of original data size */ -- unsigned long block_size; /* +10 : number of compressed block size */ -+ uint32_t block_size; /* +10 : number of compressed block size */ - unsigned char ver; /* +14 : version 01 */ - unsigned char align; /* +15 : align of index value */ - unsigned char rsv_06[2]; /* +16 : reserved */ diff -Nru ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.patch ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.patch --- ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.patch 1970-01-01 00:00:00.000000000 +0000 +++ ciso-1.0.0/debian/patches/01_mem_alloc_failure_amd64.patch 2022-03-02 16:27:37.000000000 +0000 @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_mem_alloc_failure_amd64.dpatch by Brian Murray +## +## Ubuntu: http://launchpad.net/bugs/163308 +## Description: Use standard integer types to avoid accidental 8 byte value +## when 4 was intended (32bit vs 64bit long) + +@DPATCH@ +diff -urNad ciso-1.0.0-20081201~/ciso.c ciso-1.0.0-20081201/ciso.c +--- ciso-1.0.0-20081201~/ciso.c 2008-12-01 16:16:21.000000000 -0800 ++++ ciso-1.0.0-20081201/ciso.c 2008-12-01 16:53:07.000000000 -0800 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include /* /usr(/local)/include/zlib.h */ + #include + +diff -urNad ciso-1.0.0-20081201~/ciso.h ciso-1.0.0-20081201/ciso.h +--- ciso-1.0.0-20081201~/ciso.h 2008-12-01 16:16:21.000000000 -0800 ++++ ciso-1.0.0-20081201/ciso.h 2008-12-01 16:52:35.000000000 -0800 +@@ -28,9 +28,9 @@ + typedef struct ciso_header + { + unsigned char magic[4]; /* +00 : 'C','I','S','O' */ +- unsigned long header_size; /* +04 : header size (==0x18) */ ++ uint32_t header_size; /* +04 : header size (==0x18) */ + unsigned long long total_bytes; /* +08 : number of original data size */ +- unsigned long block_size; /* +10 : number of compressed block size */ ++ uint32_t block_size; /* +10 : number of compressed block size */ + unsigned char ver; /* +14 : version 01 */ + unsigned char align; /* +15 : align of index value */ + unsigned char rsv_06[2]; /* +16 : reserved */ diff -Nru ciso-1.0.0/debian/patches/fix-build-system.patch ciso-1.0.0/debian/patches/fix-build-system.patch --- ciso-1.0.0/debian/patches/fix-build-system.patch 1970-01-01 00:00:00.000000000 +0000 +++ ciso-1.0.0/debian/patches/fix-build-system.patch 2022-03-02 16:29:09.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix build system to actually use flags, create install directories and cleanup built files +Author: Gianfranco Costamagna +Last-Update: 2022-03-02 + +Index: ciso-1.0.0/Makefile +=================================================================== +--- ciso-1.0.0.orig/Makefile ++++ ciso-1.0.0/Makefile +@@ -8,13 +8,14 @@ + + all : ciso + ciso : ciso.o +- gcc -o ciso ciso.o -lz ++ $(CC) -o ciso ciso.o -lz $(LDFLAGS) $(LIBS) + + ciso.o : ciso.c +- gcc -o ciso.o -c ciso.c ++ $(CC) -o ciso.o -c ciso.c $(CFLAGS) $(CPPFLAGS) + + install : ++ mkdir -p $(USRBINDIR) + $(INSTALL) -m 755 ciso $(USRBINDIR)/ciso + + clean: +- rm -rf *.o ++ rm -rf ciso *.o diff -Nru ciso-1.0.0/debian/patches/series ciso-1.0.0/debian/patches/series --- ciso-1.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ciso-1.0.0/debian/patches/series 2022-03-02 16:29:09.000000000 +0000 @@ -0,0 +1,2 @@ +01_mem_alloc_failure_amd64.patch +fix-build-system.patch diff -Nru ciso-1.0.0/debian/rules ciso-1.0.0/debian/rules --- ciso-1.0.0/debian/rules 2022-03-02 19:23:13.000000000 +0000 +++ ciso-1.0.0/debian/rules 2022-03-02 16:29:09.000000000 +0000 @@ -10,6 +10,8 @@ #export DH_VERBOSE=1 +%: + dh $@ CFLAGS = -Wall -g @@ -19,72 +21,3 @@ else CFLAGS += -O2 endif - -include /usr/share/dpatch/dpatch.make - -configure: configure-stamp -configure-stamp: patch - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/ciso.sgml > ciso.1 - - touch $@ - -clean: clean-patched unpatch - -clean-patched: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - mkdir -p $(CURDIR)/debian/ciso/usr/bin - # Add here commands to install the package into debian/ciso. - $(MAKE) install DESTDIR=$(CURDIR)/debian/ciso - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman debian/ciso.1 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean clean-patched binary-indep binary-arch binary install configure diff -Nru ciso-1.0.0/debian/source/format ciso-1.0.0/debian/source/format --- ciso-1.0.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ ciso-1.0.0/debian/source/format 2022-03-02 16:29:09.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)