Package: tclodbc
Followup-For: Bug #661042
See attached patch to migrate to new package format. Note that all
files in debian/patches/* are canocalized to *.patch.
>From fe201dfb9f7d2c32e7a18c8b6483e4eb9093534c Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 05:41:06 -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/00list | 10 ----------
...{01-Makefile.in.dpatch => 01-Makefile.in.patch} | 11 ++++-------
.../{02-ODBC.m4.dpatch => 02-ODBC.m4.patch} | 7 ++-----
...fig_tcl.m4.dpatch => 03-tclconfig_tcl.m4.patch} | 9 +++------
...{04-tclodbc.hxx.dpatch => 04-tclodbc.hxx.patch} | 7 ++-----
...5-statemnt.cxx.dpatch => 05-statemnt.cxx.patch} | 7 ++-----
...6-database.cxx.dpatch => 06-database.cxx.patch} | 7 ++-----
...7-encoding.cxx.dpatch => 07-encoding.cxx.patch} | 7 ++-----
...{08-strings.cxx.dpatch => 08-strings.cxx.patch} | 7 ++-----
.../{09-tclobj.cxx.dpatch => 09-tclobj.cxx.patch} | 7 ++-----
...{10-tclodbc.cxx.dpatch => 10-tclodbc.cxx.patch} | 7 ++-----
debian/patches/series | 10 ++++++++++
debian/rules | 5 ++---
debian/source/format | 1 +
17 files changed, 47 insertions(+), 69 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-Makefile.in.dpatch => 01-Makefile.in.patch} (82%)
rename debian/patches/{02-ODBC.m4.dpatch => 02-ODBC.m4.patch} (90%)
rename debian/patches/{03-tclconfig_tcl.m4.dpatch => 03-tclconfig_tcl.m4.patch} (98%)
rename debian/patches/{04-tclodbc.hxx.dpatch => 04-tclodbc.hxx.patch} (93%)
rename debian/patches/{05-statemnt.cxx.dpatch => 05-statemnt.cxx.patch} (94%)
rename debian/patches/{06-database.cxx.dpatch => 06-database.cxx.patch} (94%)
rename debian/patches/{07-encoding.cxx.dpatch => 07-encoding.cxx.patch} (77%)
rename debian/patches/{08-strings.cxx.dpatch => 08-strings.cxx.patch} (98%)
rename debian/patches/{09-tclobj.cxx.dpatch => 09-tclobj.cxx.patch} (75%)
rename debian/patches/{10-tclodbc.cxx.dpatch => 10-tclodbc.cxx.patch} (84%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index d906f61..aadbe50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tclodbc (2.5.1-1.2) 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> Fri, 24 Feb 2012 17:17:23 -0500
+
tclodbc (2.5.1-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 869f39c..feb4ee2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
Priority: optional
Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-de...@lists.alioth.debian.org>
Uploaders: Daniel Rus Morales <dani...@tol-project.org>, Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 7), dpatch, automake, autoconf, autotools-dev, tcl-dev (>= 8.0), unixodbc-dev, dpkg-dev (>= 1.16.0)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), automake, autoconf, autotools-dev, tcl-dev (>= 8.0), unixodbc-dev, dpkg-dev (>= 1.16.0)
+Standards-Version: 3.9.3
Homepage: https://sourceforge.net/projects/tclodbc/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-tcltk/tclodbc/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-tcltk/tclodbc/trunk
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ac8cc29..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-01-Makefile.in
-02-ODBC.m4
-03-tclconfig_tcl.m4
-04-tclodbc.hxx
-05-statemnt.cxx
-06-database.cxx
-07-encoding.cxx
-08-strings.cxx
-09-tclobj.cxx
-10-tclodbc.cxx
diff --git a/debian/patches/01-Makefile.in.dpatch b/debian/patches/01-Makefile.in.patch
similarity index 82%
rename from debian/patches/01-Makefile.in.dpatch
rename to debian/patches/01-Makefile.in.patch
index 14759f8..68a01ad 100644
--- a/debian/patches/01-Makefile.in.dpatch
+++ b/debian/patches/01-Makefile.in.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-Makefile.in.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Use the pkgindex.tcl-hand rule to build the pkgIndex.tcl file. Use
-## DP: INSTALL_DATA instead of INSTALL_SCRIPT to install doc, samples and
-## DP: miscelaneous files. Do not install clear.bat file.
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Use the pkgindex.tcl-hand rule to build the pkgIndex.tcl file.
+ Use INSTALL_DATA instead of INSTALL_SCRIPT to install doc, samples
+ and miscelaneous files. Do not install clear.bat file.
-@DPATCH@
diff -u upstrm/Makefile.in debsrc/Makefile.in
--- upstrm/Makefile.in 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/Makefile.in 2007-08-07 15:21:43.000000000 +0200
diff --git a/debian/patches/02-ODBC.m4.dpatch b/debian/patches/02-ODBC.m4.patch
similarity index 90%
rename from debian/patches/02-ODBC.m4.dpatch
rename to debian/patches/02-ODBC.m4.patch
index aeb4f2d..fffa387 100644
--- a/debian/patches/02-ODBC.m4.dpatch
+++ b/debian/patches/02-ODBC.m4.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-ODBC.m4.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Linking with libodbcinst.so to resolv some symbols.
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Linking with libodbcinst.so to resolv some symbols.
-@DPATCH@
diff -u upstrm/ODBC.m4 debsrc/ODBC.m4
--- upstrm/ODBC.m4 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/ODBC.m4 2007-08-07 15:42:11.000000000 +0200
diff --git a/debian/patches/03-tclconfig_tcl.m4.dpatch b/debian/patches/03-tclconfig_tcl.m4.patch
similarity index 98%
rename from debian/patches/03-tclconfig_tcl.m4.dpatch
rename to debian/patches/03-tclconfig_tcl.m4.patch
index c615283..afc3b9f 100644
--- a/debian/patches/03-tclconfig_tcl.m4.dpatch
+++ b/debian/patches/03-tclconfig_tcl.m4.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-ODBC.m4.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Removes command line option -Wno-implicit-int which is invalid for C++.
-## DP: Quoting macro names properly.
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Removes command line option -Wno-implicit-int which is invalid for C++.
+ Quoting macro names properly.
-@DPATCH@
diff -u upstrm/tclconfig/tcl.m4 debsrc/tclconfig/tcl.m4
--- upstrm/tclconfig/tcl.m4 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/tclconfig/tcl.m4 2007-08-07 16:23:31.000000000 +0200
diff --git a/debian/patches/04-tclodbc.hxx.dpatch b/debian/patches/04-tclodbc.hxx.patch
similarity index 93%
rename from debian/patches/04-tclodbc.hxx.dpatch
rename to debian/patches/04-tclodbc.hxx.patch
index 7a963d1..8df0b7f 100644
--- a/debian/patches/04-tclodbc.hxx.dpatch
+++ b/debian/patches/04-tclodbc.hxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-tclodbc.hxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix bug #435291 and warning messages due to deprecated char conversions
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix bug #435291 and warning messages due to deprecated char conversions
-@DPATCH@
diff -u upstrm/tclodbc.hxx debsrc/tclodbc.hxx
--- upstrm/tclodbc.hxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/tclodbc.hxx 2008-02-02 12:58:14.000000000 +0100
diff --git a/debian/patches/05-statemnt.cxx.dpatch b/debian/patches/05-statemnt.cxx.patch
similarity index 94%
rename from debian/patches/05-statemnt.cxx.dpatch
rename to debian/patches/05-statemnt.cxx.patch
index 7bcee20..ef235c0 100644
--- a/debian/patches/05-statemnt.cxx.dpatch
+++ b/debian/patches/05-statemnt.cxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-statemnt.cxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix bug #435291 and warning messages due to deprecated char conversions
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix bug #435291 and warning messages due to deprecated char conversions
-@DPATCH@
diff -u upstrm/statemnt.cxx debsrc/statemnt.cxx
--- upstrm/statemnt.cxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/statemnt.cxx 2008-02-02 12:59:59.000000000 +0100
diff --git a/debian/patches/06-database.cxx.dpatch b/debian/patches/06-database.cxx.patch
similarity index 94%
rename from debian/patches/06-database.cxx.dpatch
rename to debian/patches/06-database.cxx.patch
index 1d294c7..7b6408d 100644
--- a/debian/patches/06-database.cxx.dpatch
+++ b/debian/patches/06-database.cxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06-database.cxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix several warning messages
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix several warning messages
-@DPATCH@
diff -u upstrm/database.cxx debsrc/database.cxx
--- upstrm/database.cxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/database.cxx 2008-02-02 12:59:24.000000000 +0100
diff --git a/debian/patches/07-encoding.cxx.dpatch b/debian/patches/07-encoding.cxx.patch
similarity index 77%
rename from debian/patches/07-encoding.cxx.dpatch
rename to debian/patches/07-encoding.cxx.patch
index 8fb5a3e..823d8c9 100644
--- a/debian/patches/07-encoding.cxx.dpatch
+++ b/debian/patches/07-encoding.cxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07-encoding.cxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix warning messages due to deprecated char conversions
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix warning messages due to deprecated char conversions
-@DPATCH@
diff -u upstrm/encoding.cxx debsrc/encoding.cxx
--- upstrm/encoding.cxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/encoding.cxx 2008-02-02 13:00:35.000000000 +0100
diff --git a/debian/patches/08-strings.cxx.dpatch b/debian/patches/08-strings.cxx.patch
similarity index 98%
rename from debian/patches/08-strings.cxx.dpatch
rename to debian/patches/08-strings.cxx.patch
index 150d795..004b83e 100644
--- a/debian/patches/08-strings.cxx.dpatch
+++ b/debian/patches/08-strings.cxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08-strings.cxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix warning messages due to deprecated char conversions
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix warning messages due to deprecated char conversions
-@DPATCH@
diff -u upstrm/strings.cxx debsrc/strings.cxx
--- upstrm/strings.cxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/strings.cxx 2008-02-02 12:51:39.000000000 +0100
diff --git a/debian/patches/09-tclobj.cxx.dpatch b/debian/patches/09-tclobj.cxx.patch
similarity index 75%
rename from debian/patches/09-tclobj.cxx.dpatch
rename to debian/patches/09-tclobj.cxx.patch
index c78161d..7ea2012 100644
--- a/debian/patches/09-tclobj.cxx.dpatch
+++ b/debian/patches/09-tclobj.cxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09-tclobj.cxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix warning messages due to deprecated char conversions
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix warning messages due to deprecated char conversions
-@DPATCH@
diff -u upstrm/tclobj.cxx debsrc/tclobj.cxx
--- upstrm/tclobj.cxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/tclobj.cxx 2008-02-02 12:39:39.000000000 +0100
diff --git a/debian/patches/10-tclodbc.cxx.dpatch b/debian/patches/10-tclodbc.cxx.patch
similarity index 84%
rename from debian/patches/10-tclodbc.cxx.dpatch
rename to debian/patches/10-tclodbc.cxx.patch
index 184762c..cd9756a 100644
--- a/debian/patches/10-tclodbc.cxx.dpatch
+++ b/debian/patches/10-tclodbc.cxx.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-tclodbc.cxx.dpatch by Daniel Rus Morales <dani...@tol-project.org>
-##
-## DP: Fix warning messages due to deprecated char conversions
+From: Daniel Rus Morales <dani...@tol-project.org>
+Subject: Fix warning messages due to deprecated char conversions
-@DPATCH@
diff -u upstrm/tclodbc.cxx debsrc/tclodbc.cxx
--- upstrm/tclodbc.cxx 2007-04-12 12:11:03.000000000 +0200
+++ debsrc/tclodbc.cxx 2008-02-02 12:58:04.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..af77808
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+01-Makefile.in.patch
+02-ODBC.m4.patch
+03-tclconfig_tcl.m4.patch
+04-tclodbc.hxx.patch
+05-statemnt.cxx.patch
+06-database.cxx.patch
+07-encoding.cxx.patch
+08-strings.cxx.patch
+09-tclobj.cxx.patch
+10-tclodbc.cxx.patch
diff --git a/debian/rules b/debian/rules
index aa5b1d6..2fdd81c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -15,7 +14,7 @@ else
CFLAGS += -O2
endif
-config.status: configure.in patch-stamp
+config.status: configure.in
dh_testdir
mv -f configure configure.orig
mv -f aclocal.m4 aclocal.m4.orig
@@ -29,7 +28,7 @@ build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
-clean: unpatch
+clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
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
