Package: yum-metadata-parser
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 4e70663a1aa220c0f5951ecefccf82011fc0b035 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 13:25:07 -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 ++--
...ndling.dpatch => 000-Fix_CFLAGS_handling.patch} | 8 ++------
...se_pysqlite2.dpatch => 001-Use_pysqlite2.patch} | 10 +++-------
debian/patches/00list | 2 --
debian/patches/series | 2 ++
debian/rules | 7 +++----
debian/source/format | 1 +
9 files changed, 22 insertions(+), 22 deletions(-)
rename debian/patches/{000-Fix_CFLAGS_handling.dpatch => 000-Fix_CFLAGS_handling.patch} (76%)
rename debian/patches/{001-Use_pysqlite2.dpatch => 001-Use_pysqlite2.patch} (65%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index c3f5557..6981c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+yum-metadata-parser (1.1.2-1.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.aa...@cante.net> Tue, 28 Feb 2012 13:23:05 -0500
+
yum-metadata-parser (1.1.2-1) unstable; urgency=low
* New upstream release.
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 4bc3ec2..ce0626c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: yum-metadata-parser
Section: python
Priority: extra
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), pkg-config, libglib2.0-dev, libsqlite3-dev, libxml2-dev, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.3.5-11), python-all, python-support (>= 0.5.3), pkg-config, libglib2.0-dev, libsqlite3-dev, libxml2-dev
+Standards-Version: 3.9.3
Package: python-sqlitecachec
Architecture: any
diff --git a/debian/patches/000-Fix_CFLAGS_handling.dpatch b/debian/patches/000-Fix_CFLAGS_handling.patch
similarity index 76%
rename from debian/patches/000-Fix_CFLAGS_handling.dpatch
rename to debian/patches/000-Fix_CFLAGS_handling.patch
index dddc388..2021254 100644
--- a/debian/patches/000-Fix_CFLAGS_handling.dpatch
+++ b/debian/patches/000-Fix_CFLAGS_handling.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Fix_CFLAGS_handling.dpatch
-## by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Do not add auto-defined CFLAGS.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Do not add auto-defined CFLAGS.
-@DPATCH@
diff -u yum-metadata-parser-1.1.1/setup.py yum-metadata-parser-1.1.1/setup.py.new
--- yum-metadata-parser-1.1.1/setup.py 2007-08-03 23:26:30.000000000 +0200
diff --git a/debian/patches/001-Use_pysqlite2.dpatch b/debian/patches/001-Use_pysqlite2.patch
similarity index 65%
rename from debian/patches/001-Use_pysqlite2.dpatch
rename to debian/patches/001-Use_pysqlite2.patch
index b3f5512..facd448 100644
--- a/debian/patches/001-Use_pysqlite2.dpatch
+++ b/debian/patches/001-Use_pysqlite2.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-Use_pysqlite2.dpatch
-## by Piotr Ożarowski <pi...@debian.org>
-##
-## DP: Upstream first try to import sqlite3 from python, then fallback
-## DP: to python-sqlite. Let's use pysqlite2 instead.
+From: Piotr Ożarowski <pi...@debian.org>
+Subject: Upstream first try to import sqlite3 from python, then fallback
+to python-sqlite. Let's use pysqlite2 instead.
-@DPATCH@
diff -u yum-metadata-parser-1.1.1/sqlitecachec.py yum-metadata-parser-1.1.1/sqlitecachec.py.new
--- yum-metadata-parser-1.1.1/sqlitecachec.py 2007-05-16 10:10:33.000000000 +0200
+++ yum-metadata-parser-1.1.1/sqlitecachec.py.new 2007-08-27 21:57:16.635428435 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c232d20..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-000-Fix_CFLAGS_handling.dpatch
-001-Use_pysqlite2.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7c1ccec
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+000-Fix_CFLAGS_handling.patch
+001-Use_pysqlite2.patch
diff --git a/debian/rules b/debian/rules
index f43a663..b8d0f72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Use dpatch to handle my patches
-include /usr/share/dpatch/dpatch.make
+# Use dpatch to handle myes
# Available python (using debian/pyversions) and destdir
PYVERS = $(shell pyversions -rv)
@@ -18,12 +17,12 @@ else
endif
build: $(PYVERS:%=build-stamp%)
-build-stamp%: patch-stamp
+build-stamp%:
dh_testdir
CFLAGS="$(CFLAGS)" python$* setup.py build
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf build build-stamp*
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
