Package: tiemu
Tags: patch
Followup-For: Bug #661033
See attached patch to migrate to new package format. Note that all
files in debian/patches/* are canocalized to *.patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-1-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 244d08f105f6a73de804a536b0ca56717104ac92 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 24 Feb 2012 16:35:58 -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 | 6 ------
...ated.dpatch => 01_gtk_disable_deprecated.patch} | 14 ++++----------
...ock_fixes.dpatch => 02_tiemu3_dock_fixes.patch} | 11 ++++-------
...ring.dpatch => 03_memset_include_cstring.patch} | 8 ++------
...dpatch => 04_remove_deprecated_gtk_calls.patch} | 8 ++------
..._vlc_cable.dpatch => 05_remove_vlc_cable.patch} | 11 ++++-------
...okPage.dpatch => 06_drop_GtkNotebookPage.patch} | 8 ++------
debian/patches/series | 6 ++++++
debian/rules | 7 +++----
debian/source/format | 1 +
13 files changed, 39 insertions(+), 55 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_gtk_disable_deprecated.dpatch => 01_gtk_disable_deprecated.patch} (86%)
rename debian/patches/{02_tiemu3_dock_fixes.dpatch => 02_tiemu3_dock_fixes.patch} (88%)
rename debian/patches/{03_memset_include_cstring.dpatch => 03_memset_include_cstring.patch} (57%)
rename debian/patches/{04_remove_deprecated_gtk_calls.dpatch => 04_remove_deprecated_gtk_calls.patch} (97%)
rename debian/patches/{05_remove_vlc_cable.dpatch => 05_remove_vlc_cable.patch} (68%)
rename debian/patches/{06_drop_GtkNotebookPage.dpatch => 06_drop_GtkNotebookPage.patch} (75%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index cdd3830..4458465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tiemu (3.02-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> Fri, 24 Feb 2012 16:10:27 -0500
+
tiemu (3.02-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 78629d3..d27ca4e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: tiemu
Section: math
Priority: optional
Maintainer: Krzysztof Burghardt <krzysz...@burghardt.pl>
-Build-Depends: debhelper (>= 5), libticables-dev (>= 1.2.0), libticalcs-dev (>= 1.1.0), libtifiles-dev (>= 1.1.0), libticonv-dev (>= 1.1.0), libgtk2.0-dev, libglade2-dev, zlib1g-dev, gettext, groff-base, libdbus-glib-1-dev, libsdl1.2-dev (>= 1.2.0), libncurses5-dev, bison, texinfo, flex, autotools-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libticables-dev (>= 1.2.0), libticalcs-dev (>= 1.1.0), libtifiles-dev (>= 1.1.0), libticonv-dev (>= 1.1.0), libgtk2.0-dev, libglade2-dev, zlib1g-dev, gettext, groff-base, libdbus-glib-1-dev, libsdl1.2-dev (>= 1.2.0), libncurses5-dev, bison, texinfo, flex, autotools-dev
+Standards-Version: 3.9.3
Homepage: http://lpg.ticalc.org/prj_tiemu/
Package: tiemu
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e07829f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-01_gtk_disable_deprecated
-02_tiemu3_dock_fixes
-03_memset_include_cstring
-04_remove_deprecated_gtk_calls
-05_remove_vlc_cable
-06_drop_GtkNotebookPage
diff --git a/debian/patches/01_gtk_disable_deprecated.dpatch b/debian/patches/01_gtk_disable_deprecated.patch
similarity index 86%
rename from debian/patches/01_gtk_disable_deprecated.dpatch
rename to debian/patches/01_gtk_disable_deprecated.patch
index 9b0ac40..ff7d552 100644
--- a/debian/patches/01_gtk_disable_deprecated.dpatch
+++ b/debian/patches/01_gtk_disable_deprecated.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-## 01_gtk_disable_deprecated.dpatch by Ralf Treinen <trei...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: undefine GTK_DISABLE_DEPRECATED before including gtk/gtk.h.
-## DP: patch taken from Ubuntu.
+From: Ralf Treinen <trei...@debian.org>
+Subject: undefine GTK_DISABLE_DEPRECATED before including gtk/gtk.h.
+
+patch taken from Ubuntu.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu~/src/gui/calc/calc.c tiemu/src/gui/calc/calc.c
--- tiemu~/src/gui/calc/calc.c 2011-04-21 19:30:02.000000000 +0200
+++ tiemu/src/gui/calc/calc.c 2011-04-21 19:47:19.998760979 +0200
diff --git a/debian/patches/02_tiemu3_dock_fixes.dpatch b/debian/patches/02_tiemu3_dock_fixes.patch
similarity index 88%
rename from debian/patches/02_tiemu3_dock_fixes.dpatch
rename to debian/patches/02_tiemu3_dock_fixes.patch
index ae32251..5605452 100644
--- a/debian/patches/02_tiemu3_dock_fixes.dpatch
+++ b/debian/patches/02_tiemu3_dock_fixes.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_tiemu3_dock_fixes.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fixes problems with debugging in dock mode and dock window
-## DP: enabling/disabling; patch taken from upstream.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: fixes problems with debugging in dock mode and dock window enabling/disabling
+
+patch taken from upstream.
-@DPATCH@
diff -urNad tiemu-3.02~/ChangeLog tiemu-3.02/ChangeLog
--- tiemu-3.02~/ChangeLog 2007-12-31 00:15:51.000000000 +0100
+++ tiemu-3.02/ChangeLog 2009-08-09 23:19:36.104542592 +0200
diff --git a/debian/patches/03_memset_include_cstring.dpatch b/debian/patches/03_memset_include_cstring.patch
similarity index 57%
rename from debian/patches/03_memset_include_cstring.dpatch
rename to debian/patches/03_memset_include_cstring.patch
index d8f1547..1371e7e 100644
--- a/debian/patches/03_memset_include_cstring.dpatch
+++ b/debian/patches/03_memset_include_cstring.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_memset_include_cstring.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes error: ‘memset’ is not a member of ‘std’.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: Fixes error: ‘memset’ is not a member of ‘std’.
-@DPATCH@
diff -urNad tiemu-3.02~/src/ipc/dcop/dcop.cpp tiemu-3.02/src/ipc/dcop/dcop.cpp
--- tiemu-3.02~/src/ipc/dcop/dcop.cpp 2007-12-14 22:28:08.000000000 +0100
+++ tiemu-3.02/src/ipc/dcop/dcop.cpp 2009-08-09 23:36:14.000528344 +0200
diff --git a/debian/patches/04_remove_deprecated_gtk_calls.dpatch b/debian/patches/04_remove_deprecated_gtk_calls.patch
similarity index 97%
rename from debian/patches/04_remove_deprecated_gtk_calls.dpatch
rename to debian/patches/04_remove_deprecated_gtk_calls.patch
index 863d26b..057f3df 100644
--- a/debian/patches/04_remove_deprecated_gtk_calls.dpatch
+++ b/debian/patches/04_remove_deprecated_gtk_calls.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_remove_depricated_gtk_calls.dpatch by <dktrkr...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <dktrkr...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu-3.02~/src/gui/calc/calc.c tiemu-3.02/src/gui/calc/calc.c
--- tiemu-3.02~/src/gui/calc/calc.c 2007-12-16 16:29:16.000000000 +0100
+++ tiemu-3.02/src/gui/calc/calc.c 2010-05-08 13:42:37.071928317 +0200
diff --git a/debian/patches/05_remove_vlc_cable.dpatch b/debian/patches/05_remove_vlc_cable.patch
similarity index 68%
rename from debian/patches/05_remove_vlc_cable.dpatch
rename to debian/patches/05_remove_vlc_cable.patch
index 0d5ca19..a959fc1 100644
--- a/debian/patches/05_remove_vlc_cable.dpatch
+++ b/debian/patches/05_remove_vlc_cable.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_remove_vlc_cable.dpatch by <sc...@kitterman.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS with newer libs - Cherry pick from upstream svn
-## DP: http://svn.tilp.info/cgi-bin/viewvc.cgi/tiemu/trunk/src/gui/device.c?root=tiemu&view=log#rev2820
+From: <sc...@kitterman.com>
+Subject: Fix FTBFS with newer libs - Cherry pick from upstream svn
+
+http://svn.tilp.info/cgi-bin/viewvc.cgi/tiemu/trunk/src/gui/device.c?root=tiemu&view=log#rev2820
-@DPATCH@
diff -urNad tiemu-3.02~/src/gui/device.c tiemu-3.02/src/gui/device.c
--- tiemu-3.02~/src/gui/device.c 2007-12-30 18:14:15.000000000 -0500
+++ tiemu-3.02/src/gui/device.c 2010-04-26 01:34:36.657234841 -0400
diff --git a/debian/patches/06_drop_GtkNotebookPage.dpatch b/debian/patches/06_drop_GtkNotebookPage.patch
similarity index 75%
rename from debian/patches/06_drop_GtkNotebookPage.dpatch
rename to debian/patches/06_drop_GtkNotebookPage.patch
index 5da1c79..09dac03 100644
--- a/debian/patches/06_drop_GtkNotebookPage.dpatch
+++ b/debian/patches/06_drop_GtkNotebookPage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_drop_GtkNotebookPage.dpatch by <sc...@kitterman.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replace deprecated function with gpointer to fix FTBFS.
+From: <sc...@kitterman.com>
+Subject: Replace deprecated function with gpointer to fix FTBFS.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu-3.02~/src/gui/debugger/dbg_mem.c tiemu-3.02/src/gui/debugger/dbg_mem.c
--- tiemu-3.02~/src/gui/debugger/dbg_mem.c 2010-10-17 14:32:16.000000000 -0400
+++ tiemu-3.02/src/gui/debugger/dbg_mem.c 2010-10-17 14:33:27.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f3dec97
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01_gtk_disable_deprecated.patch
+02_tiemu3_dock_fixes.patch
+03_memset_include_cstring.patch
+04_remove_deprecated_gtk_calls.patch
+05_remove_vlc_cable.patch
+06_drop_GtkNotebookPage.patch
diff --git a/debian/rules b/debian/rules
index da0b038..fe798d3 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
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -39,12 +38,12 @@ configure-stamp: autotools
touch configure-stamp
build: configure-stamp build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
@@ -86,4 +85,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpach
+.PHONY: build clean binary-indep binary-arch binary install configure unpach
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
