Package: epylog
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 dd68793450d4782ff777a2f20e5226672d769db7 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 10:53:14 +0300
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 | 10 ++++++++++
debian/compat | 2 +-
debian/control | 7 ++++---
debian/patches/00list | 4 ----
...iles.dpatch => 01_fix_paths_in_cfg_files.patch} | 8 ++------
...ion.dpatch => 02_fix_perl_man_generation.patch} | 8 ++------
...tab.dpatch => 03_check_binary_in_crontab.patch} | 8 ++------
...s.dpatch => 04_fix_minor_manpages_issues.patch} | 6 ++----
debian/patches/series | 4 ++++
debian/rules | 11 ++++++-----
debian/source/format | 1 +
11 files changed, 34 insertions(+), 35 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_paths_in_cfg_files.dpatch => 01_fix_paths_in_cfg_files.patch} (91%)
rename debian/patches/{02_fix_perl_man_generation.dpatch => 02_fix_perl_man_generation.patch} (73%)
rename debian/patches/{03_check_binary_in_crontab.dpatch => 03_check_binary_in_crontab.patch} (58%)
rename debian/patches/{04_fix_minor_manpages_issues.dpatch => 04_fix_minor_manpages_issues.patch} (90%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 58d9114..610fc0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+epylog (1.0.3-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 10:50:24 +0300
+
epylog (1.0.3-7) unstable; urgency=low
* moving from svn to git in collab-main
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 4c2f6cc..5ae891c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,15 @@ Priority: extra
Maintainer: Tiago Bortoletto Vaz <ti...@debian-ba.org>
Uploaders: Otavio Salvador <ota...@debian.org>
Build-Depends-Indep: python-dev, python-libxml2, lynx, autotools-dev, python-support (>= 0.4)
-Build-Depends: debhelper (>= 5.0.37.2), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/git/collab-maint/epylog.git
Vcs-Git: git://git.debian.org/git/collab-maint/epylog.git
+Homepage: http://freecode.com/projects/epylog
Package: epylog
Architecture: all
-Depends: ${python:Depends}, python-libxml2
+Depends: ${misc:Depends}, ${python:Depends}, python-libxml2
Description: New logs analyzer and parser
This is a syslog parser which runs periodically, looks at your logs,
processes some of the entries in order to present them in a more
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ff1fa1b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_fix_paths_in_cfg_files
-02_fix_perl_man_generation
-03_check_binary_in_crontab
-04_fix_minor_manpages_issues
diff --git a/debian/patches/01_fix_paths_in_cfg_files.dpatch b/debian/patches/01_fix_paths_in_cfg_files.patch
similarity index 91%
rename from debian/patches/01_fix_paths_in_cfg_files.dpatch
rename to debian/patches/01_fix_paths_in_cfg_files.patch
index 82abb60..694ec8a 100644
--- a/debian/patches/01_fix_paths_in_cfg_files.dpatch
+++ b/debian/patches/01_fix_paths_in_cfg_files.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_paths_in_cfg_files.dpatch by Tiago Bortoletto Vaz <ti...@debian-ba.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix paths for logfiles in modules.d/*
+From: Tiago Bortoletto Vaz <ti...@debian-ba.org>
+Subject: Fix paths for logfiles in modules.d/*
-@DPATCH@
diff -urNad trunk~/etc/modules.d/logins.conf.in trunk/etc/modules.d/logins.conf.in
--- trunk~/etc/modules.d/logins.conf.in 2006-06-16 07:42:51.000000000 -0400
+++ trunk/etc/modules.d/logins.conf.in 2006-07-23 16:11:26.000000000 -0400
diff --git a/debian/patches/02_fix_perl_man_generation.dpatch b/debian/patches/02_fix_perl_man_generation.patch
similarity index 73%
rename from debian/patches/02_fix_perl_man_generation.dpatch
rename to debian/patches/02_fix_perl_man_generation.patch
index 3c129d3..3b50677 100644
--- a/debian/patches/02_fix_perl_man_generation.dpatch
+++ b/debian/patches/02_fix_perl_man_generation.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_perl_man_generation.dpatch by Julien Louis <ptitlo...@sysif.net>
-## and Tiago Bortoletto Vaz <ti...@debian-ba.org>
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix perl man generation
+From: Julien Louis <ptitlo...@sysif.net>
+Subject: fix perl man generation
-@DPATCH@
diff -urNad epylog~/perl/Makefile.in epylog/perl/Makefile.in
--- epylog~/perl/Makefile.in 2009-03-09 13:26:42.000000000 -0400
+++ epylog/perl/Makefile.in 2009-03-09 13:27:53.956647338 -0400
diff --git a/debian/patches/03_check_binary_in_crontab.dpatch b/debian/patches/03_check_binary_in_crontab.patch
similarity index 58%
rename from debian/patches/03_check_binary_in_crontab.dpatch
rename to debian/patches/03_check_binary_in_crontab.patch
index e79ad9a..2e80f9a 100644
--- a/debian/patches/03_check_binary_in_crontab.dpatch
+++ b/debian/patches/03_check_binary_in_crontab.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_check_binary_in_crontab.dpatch by <ptitlo...@sysif.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: test if the binary is there before calling it in crontab
+From: <ptitlo...@sysif.net>
+Subject: test if the binary is there before calling it in crontab
-@DPATCH@
diff -urNad trunk~/cron/epylog.cron.in trunk/cron/epylog.cron.in
--- trunk~/cron/epylog.cron.in 2007-08-05 10:14:03.000000000 +0200
+++ trunk/cron/epylog.cron.in 2007-08-05 10:15:54.000000000 +0200
diff --git a/debian/patches/04_fix_minor_manpages_issues.dpatch b/debian/patches/04_fix_minor_manpages_issues.patch
similarity index 90%
rename from debian/patches/04_fix_minor_manpages_issues.dpatch
rename to debian/patches/04_fix_minor_manpages_issues.patch
index 6243c1c..42e5849 100644
--- a/debian/patches/04_fix_minor_manpages_issues.dpatch
+++ b/debian/patches/04_fix_minor_manpages_issues.patch
@@ -1,8 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## patch by Tiago Bortoletto Vaz <ti...@debian-ba.org>
-## DP: Fix minor issue to avoid warnings from man
+From: Tiago Bortoletto Vaz <ti...@debian-ba.org>
+Subject: Fix minor issue to avoid warnings from man
-@DPATCH@
diff -urNad epylog~/man/epylog-modules.5 epylog/man/epylog-modules.5
--- epylog~/man/epylog-modules.5 2008-08-31 08:37:45.000000000 -0400
+++ epylog/man/epylog-modules.5 2009-03-09 14:29:18.031880105 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ad65da8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_fix_paths_in_cfg_files.patch
+02_fix_perl_man_generation.patch
+03_check_binary_in_crontab.patch
+04_fix_minor_manpages_issues.patch
diff --git a/debian/rules b/debian/rules
index 3c07902..2a0b1c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,25 +2,26 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-include /usr/share/dpatch/dpatch.make
configure:
dh_testdir
cp /usr/share/misc/config.{guess,sub} .
-config.status: patch configure
+config.status: configure
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man \
--localstatedir=/var --with-site-perl=/usr/share/perl5
+
+build-arch: build
+build-indep: build
+
build: config.status
dh_testdir
$(MAKE)
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
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.5
