Package: fileschanged Followup-For: Bug #661049 See attached patch to migrate to new package format. Note that all files in debian/patches/* are canocalized to *.patch.
Thanks, Jari
>From 386b60b49900e77270a086471a054690e17b15ea Mon Sep 17 00:00:00 2001 From: Jari Aalto <jari.aa...@cante.net> Date: Sat, 25 Feb 2012 06:13:19 -0500 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <jari.aa...@cante.net> --- debian/changelog | 8 ++++++ debian/compat | 2 +- debian/control | 4 +- debian/patches/01_Makefile.am.patch | 7 +---- debian/patches/02_Makefile.in.patch | 7 +---- debian/patches/04_configure.patch | 7 +---- debian/patches/05_info_Makefile.in.patch | 7 +---- debian/patches/06_info_fileschanged.texinfo.patch | 7 +---- debian/patches/07_unused_variables.patch | 10 ++------ debian/patches/series | 12 +++++----- debian/rules | 25 +++++++++++++++++--- 11 files changed, 51 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7cd9a0..628f3bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fileschanged (0.6.5-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Remove dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 04:26:09 -0500 + fileschanged (0.6.5-1.2) unstable; urgency=low * Non-maintainer upload. 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 6b81b7a..1d058a4 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: fileschanged Section: utils Priority: optional Maintainer: Juan A. Diaz <j...@linux.org.ar> -Build-Depends: debhelper (>= 5.0.0), dpatch, help2man, texinfo, libfam-dev (>= 2.7.0-10) | libgamin-dev (>= 0.1.7-4) -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 9), help2man, texinfo, libfam-dev (>= 2.7.0-10) | libgamin-dev (>= 0.1.7-4) +Standards-Version: 3.9.3 Homepage: http://fileschanged.sourceforge.net/ Package: fileschanged diff --git a/debian/patches/01_Makefile.am.patch b/debian/patches/01_Makefile.am.patch index 688128c..f348d48 100644 --- a/debian/patches/01_Makefile.am.patch +++ b/debian/patches/01_Makefile.am.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_Makefile.am.dpatch.dpatch by Juan A. Diaz <j...@linux.org.ar> -## -## DP: Deleted the reference to debian directory on the original tarball +From: Juan A. Diaz <j...@linux.org.ar> +Subject: Deleted the reference to debian directory on the original tarball -@DPATCH@ --- fileschanged-0.6.5.orig/Makefile.am 2006-09-04 00:51:25.000000000 -0300 +++ fileschanged-0.6.5/Makefile.am 2006-09-26 23:13:02.000000000 -0300 diff --git a/debian/patches/02_Makefile.in.patch b/debian/patches/02_Makefile.in.patch index dd9d543..b95d26b 100644 --- a/debian/patches/02_Makefile.in.patch +++ b/debian/patches/02_Makefile.in.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_Makefile.in.dpatch.dpatch by Juan A. Diaz <j...@linux.org.ar> -## -## DP: Regenerated with automake-1.9 (1.9.6) +From: Juan A. Diaz <j...@linux.org.ar> +Subject: Regenerated with automake-1.9 (1.9.6) -@DPATCH@ --- fileschanged-0.6.5.orig/Makefile.in 2006-09-04 00:51:25.000000000 -0300 +++ fileschanged-0.6.5/Makefile.in 2006-09-26 23:13:02.000000000 -0300 diff --git a/debian/patches/04_configure.patch b/debian/patches/04_configure.patch index 36f6b36..f704737 100644 --- a/debian/patches/04_configure.patch +++ b/debian/patches/04_configure.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_configure.dpatch.dpatch by Juan A. Diaz <j...@linux.org.ar> -## -## DP: Regenerated with autoconf (2.59) & automake-1.9 (1.9.6) +From: Juan A. Diaz <j...@linux.org.ar> +Subject: Regenerated with autoconf (2.59) & automake-1.9 (1.9.6) -@DPATCH@ --- fileschanged-0.6.5.orig/configure 2006-09-04 00:51:25.000000000 -0300 +++ fileschanged-0.6.5/configure 2006-09-26 23:13:02.000000000 -0300 diff --git a/debian/patches/05_info_Makefile.in.patch b/debian/patches/05_info_Makefile.in.patch index 3a90bf6..7aa75b3 100644 --- a/debian/patches/05_info_Makefile.in.patch +++ b/debian/patches/05_info_Makefile.in.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_info_Makefile.in.dpatch.dpatch by Juan A. Diaz <j...@linux.org.ar> -## -## DP: Regenerated with automake-1.9 (1.9.6) +From: Juan A. Diaz <j...@linux.org.ar> +Subject: Regenerated with automake-1.9 (1.9.6) -@DPATCH@ --- fileschanged-0.6.5.orig/info/Makefile.in 2006-09-04 00:51:25.000000000 -0300 +++ fileschanged-0.6.5/info/Makefile.in 2006-09-26 23:13:02.000000000 -0300 diff --git a/debian/patches/06_info_fileschanged.texinfo.patch b/debian/patches/06_info_fileschanged.texinfo.patch index 4aad576..9496e59 100644 --- a/debian/patches/06_info_fileschanged.texinfo.patch +++ b/debian/patches/06_info_fileschanged.texinfo.patch @@ -1,9 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_info_fileschanged.texinfo.dpatch.dpatch by Juan A. Diaz <j...@linux.org.ar> -## -## DP: Add dircategory +From: Juan A. Diaz <j...@linux.org.ar> +Subject: Add dircategory -@DPATCH@ --- fileschanged-0.6.5.orig/info/fileschanged.texinfo 2006-09-04 00:51:25.000000000 -0300 +++ fileschanged-0.6.5/info/fileschanged.texinfo 2006-09-26 23:16:39.000000000 -0300 diff --git a/debian/patches/07_unused_variables.patch b/debian/patches/07_unused_variables.patch index 4fe7ce1..4927104 100644 --- a/debian/patches/07_unused_variables.patch +++ b/debian/patches/07_unused_variables.patch @@ -1,11 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 07_unused_variables.dpatch by Colin Watson <cjwat...@ubuntu.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: GCC 4.6 warns about unused variables, and fileschanged builds with -## DP: -Werror, so deal with unused variable warnings. +From: Colin Watson <cjwat...@ubuntu.com> +Subject: GCC 4.6 warns about unused variables. + Program now builds with -Werror, so deal with unused variable warnings. -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/filelist.c fileschanged-0.6.5/src/filelist.c --- fileschanged-0.6.5~/src/filelist.c 2006-04-19 20:42:28.000000000 +0100 +++ fileschanged-0.6.5/src/filelist.c 2011-09-14 01:17:40.000000000 +0100 diff --git a/debian/patches/series b/debian/patches/series index b03aaca..e04c95c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ -01_Makefile.am.dpatch -02_Makefile.in.dpatch -04_configure.dpatch -05_info_Makefile.in.dpatch -06_info_fileschanged.texinfo.dpatch -07_unused_variables.dpatch +01_Makefile.am.patch +02_Makefile.in.patch +04_configure.patch +05_info_Makefile.in.patch +06_info_fileschanged.texinfo.patch +07_unused_variables.patch diff --git a/debian/rules b/debian/rules index 2332d50..44b6c2c 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,6 @@ #export DH_VERBOSE=1 # This package uses dpatch -include /usr/share/dpatch/dpatch.make # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -13,6 +12,23 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# Generated files +RM_LIST = \ + Makefile \ + config.h \ + config.log \ + config.status \ + configure.lineno \ + info/Makefile \ + m4/Makefile \ + man/Makefile \ + po/Makefile \ + po/Makefile.in \ + po/POTFILES \ + redhat/fileschanged.spec \ + src/Makefile \ + stamp-h1 + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS = -O0 -Wall -g else @@ -20,7 +36,7 @@ else endif configure: configure-stamp -configure-stamp: patch +configure-stamp: dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -48,9 +64,10 @@ up_clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp + rm -f $(RM_LIST) [ ! -f Makefile ] || $(MAKE) clean -clean: up_clean unpatch +clean: up_clean dh_clean install: build @@ -85,4 +102,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean up_clean binary-indep binary-arch binary install patch unpatch +.PHONY: build clean up_clean binary-indep binary-arch binary install -- 1.7.9
