[SCM] terminatorx/master: Convert packaging to source format 3.0 (quilt). Port patches from dpatch to quilt. Drop dpatch support.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Apr 1 11:42:52 UTC 2012 

The following commit has been merged in the master branch:
commit c833c638d0443a2e590d8f080d5650ef70c98061
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 1 13:42:04 2012 +0200

    Convert packaging to source format 3.0 (quilt). Port patches from dpatch to quilt. Drop dpatch support.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b408e6c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.pc
diff --git a/debian/control b/debian/control
index 97ccd6c..2385dad 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
 Build-Depends:
  autotools-dev,
  debhelper (>= 4.1.16),
- dpatch,
  ladspa-sdk,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libatk1.0-dev,
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a58415e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-05_endian_h
-15_icon_xpm
-16_loose_spelling_fix
-17_cleanup_desktop_file
-20_fix_ftbfs_on_kfreebsd.dpatch
-21_fix_ftbfs_binutils_gold
diff --git a/debian/patches/05_endian_h.dpatch b/debian/patches/05_endian_h.patch
similarity index 74%
rename from debian/patches/05_endian_h.dpatch
rename to debian/patches/05_endian_h.patch
index 7e7200b..9de3687 100644
--- a/debian/patches/05_endian_h.dpatch
+++ b/debian/patches/05_endian_h.patch
@@ -23,9 +23,12 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /home/furrm/debian/packages/terminatorX/new/terminatorx-3.81/src/tX_endian.h terminatorx-3.81/src/tX_endian.h
---- /home/furrm/debian/packages/terminatorX/new/terminatorx-3.81/src/tX_endian.h	2003-03-18 19:00:09.000000000 -0500
-+++ terminatorx-3.81/src/tX_endian.h	2004-08-11 10:49:04.000000000 -0400
+---
+ src/tX_endian.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- terminatorx.orig/src/tX_endian.h
++++ terminatorx/src/tX_endian.h
 @@ -44,9 +44,9 @@
  
  #	include "tX_types.h"
diff --git a/debian/patches/15_icon_xpm.dpatch b/debian/patches/15_icon_xpm.patch
similarity index 93%
rename from debian/patches/15_icon_xpm.dpatch
rename to debian/patches/15_icon_xpm.patch
index d50b20d..986ab4e 100644
--- a/debian/patches/15_icon_xpm.dpatch
+++ b/debian/patches/15_icon_xpm.patch
@@ -23,9 +23,12 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /home/furrm/debian/packages/terminatorX/terminatorx-3.81/gnome-support/terminatorX-app.xpm terminatorx-3.81/gnome-support/terminatorX-app.xpm
---- /home/furrm/debian/packages/terminatorX/terminatorx-3.81/gnome-support/terminatorX-app.xpm	1969-12-31 19:00:00.000000000 -0500
-+++ terminatorx-3.81/gnome-support/terminatorX-app.xpm	2004-08-11 12:14:39.000000000 -0400
+---
+ gnome-support/terminatorX-app.xpm |  165 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 165 insertions(+)
+
+--- /dev/null
++++ terminatorx/gnome-support/terminatorX-app.xpm
 @@ -0,0 +1,165 @@
 +/* XPM */
 +static char *terminatorX-app[] = {
diff --git a/debian/patches/16_loose_spelling_fix.dpatch b/debian/patches/16_loose_spelling_fix.patch
similarity index 78%
rename from debian/patches/16_loose_spelling_fix.dpatch
rename to debian/patches/16_loose_spelling_fix.patch
index 0c15628..2f08366 100644
--- a/debian/patches/16_loose_spelling_fix.dpatch
+++ b/debian/patches/16_loose_spelling_fix.patch
@@ -5,10 +5,13 @@
 ## DP: Fix two instances of 'loose' to 'lose'. (LP: #61952)
 
 @DPATCH@
-diff -urNad terminatorx-3.82~/src/tX_mastergui.cc terminatorx-3.82/src/tX_mastergui.cc
---- terminatorx-3.82~/src/tX_mastergui.cc	2004-11-04 00:25:50.000000000 +1100
-+++ terminatorx-3.82/src/tX_mastergui.cc	2007-04-01 19:13:55.000000000 +1000
-@@ -265,7 +265,7 @@
+---
+ src/tX_mastergui.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- terminatorx.orig/src/tX_mastergui.cc
++++ terminatorx/src/tX_mastergui.cc
+@@ -265,7 +265,7 @@ char tx_mg_current_setname[PATH_MAX]="";
  GtkSignalFunc new_tables() {
  	GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
  		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
@@ -17,7 +20,7 @@ diff -urNad terminatorx-3.82~/src/tX_mastergui.cc terminatorx-3.82/src/tX_master
  	
  	int res=gtk_dialog_run(GTK_DIALOG(dialog));
  	gtk_widget_destroy(dialog);
-@@ -883,7 +883,7 @@
+@@ -883,7 +883,7 @@ gboolean quit()
  	if (globals.quit_confirm) {
  		GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
  		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
diff --git a/debian/patches/17_cleanup_desktop_file.dpatch b/debian/patches/17_cleanup_desktop_file.patch
similarity index 70%
rename from debian/patches/17_cleanup_desktop_file.dpatch
rename to debian/patches/17_cleanup_desktop_file.patch
index 714689a..25ef7ca 100644
--- a/debian/patches/17_cleanup_desktop_file.dpatch
+++ b/debian/patches/17_cleanup_desktop_file.patch
@@ -6,9 +6,12 @@
 ## DP: Clean up .desktop file.
 
 @DPATCH@
-diff -urNad terminatorx-3.82~/gnome-support/terminatorX.desktop terminatorx-3.82/gnome-support/terminatorX.desktop
---- terminatorx-3.82~/gnome-support/terminatorX.desktop	2004-03-26 20:13:24.000000000 +0100
-+++ terminatorx-3.82/gnome-support/terminatorX.desktop	2009-02-17 20:56:47.000000000 +0100
+---
+ gnome-support/terminatorX.desktop |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- terminatorx.orig/gnome-support/terminatorX.desktop
++++ terminatorx/gnome-support/terminatorX.desktop
 @@ -1,10 +1,10 @@
  [Desktop Entry]
  Exec=terminatorX
diff --git a/debian/patches/20_fix_ftbfs_on_kfreebsd.dpatch b/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
similarity index 64%
rename from debian/patches/20_fix_ftbfs_on_kfreebsd.dpatch
rename to debian/patches/20_fix_ftbfs_on_kfreebsd.patch
index 6027ed4..a97ae60 100644
--- a/debian/patches/20_fix_ftbfs_on_kfreebsd.dpatch
+++ b/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
@@ -5,8 +5,17 @@
 ## DP: Fix FTBFS on GNU/kFreeBSD (Closes: #542531).
 
 @DPATCH@
---- a/src/tX_mouse.cc
-+++ b/src/tX_mouse.cc
+---
+ src/tX_mouse.cc     |    1 +
+ src/tX_seqpar.cc    |    1 +
+ src/tX_sequencer.cc |    1 +
+ src/tX_vtt.cc       |    2 ++
+ src/tX_vttfx.cc     |    1 +
+ src/tX_vttgui.cc    |    1 +
+ 6 files changed, 7 insertions(+)
+
+--- terminatorx.orig/src/tX_mouse.cc
++++ terminatorx/src/tX_mouse.cc
 @@ -32,6 +32,7 @@
  #include "tX_engine.h"
  #include "tX_vtt.h"
@@ -15,8 +24,8 @@
  
  #define TX_MOUSE_SPEED_NORMAL 0.05
  #define TX_MOUSE_SPEED_WARP 250000
---- a/src/tX_seqpar.cc
-+++ b/src/tX_seqpar.cc
+--- terminatorx.orig/src/tX_seqpar.cc
++++ terminatorx/src/tX_seqpar.cc
 @@ -30,6 +30,7 @@
  #include "tX_extdial.h"
  #include "tX_engine.h"
@@ -25,8 +34,8 @@
  
  #define TX_SEQPAR_DEFAULT_SCALE 0.05
  
---- a/src/tX_sequencer.cc
-+++ b/src/tX_sequencer.cc
+--- terminatorx.orig/src/tX_sequencer.cc
++++ terminatorx/src/tX_sequencer.cc
 @@ -25,6 +25,7 @@
  #include "tX_sequencer.h"
  #include "tX_mastergui.h"
@@ -35,8 +44,8 @@
  
  tX_sequencer sequencer;
  
---- a/src/tX_vtt.cc
-+++ b/src/tX_vtt.cc
+--- terminatorx.orig/src/tX_vtt.cc
++++ terminatorx/src/tX_vtt.cc
 @@ -41,6 +41,8 @@
  
  #include "tX_loaddlg.h"
@@ -46,8 +55,8 @@
  #define USE_PREFETCH 1
  
  #ifdef USE_PREFETCH
---- a/src/tX_vttfx.cc
-+++ b/src/tX_vttfx.cc
+--- terminatorx.orig/src/tX_vttfx.cc
++++ terminatorx/src/tX_vttfx.cc
 @@ -28,6 +28,7 @@
  #include "tX_vtt.h"
  #define myvtt ((vtt_class *) vtt)
@@ -56,8 +65,8 @@
  
  float ladspa_dummy_output_port;
  
---- a/src/tX_vttgui.cc
-+++ b/src/tX_vttgui.cc
+--- terminatorx.orig/src/tX_vttgui.cc
++++ terminatorx/src/tX_vttgui.cc
 @@ -60,6 +60,7 @@
  #include "tX_flash.h"
  #include <stdio.h>
diff --git a/debian/patches/21_fix_ftbfs_binutils_gold.dpatch b/debian/patches/21_fix_ftbfs_binutils_gold.patch
similarity index 68%
rename from debian/patches/21_fix_ftbfs_binutils_gold.dpatch
rename to debian/patches/21_fix_ftbfs_binutils_gold.patch
index ecb16f6..18073ea 100644
--- a/debian/patches/21_fix_ftbfs_binutils_gold.dpatch
+++ b/debian/patches/21_fix_ftbfs_binutils_gold.patch
@@ -5,9 +5,13 @@
 ## DP: Fix FTBFS binutils-gold with ld --no-add-needed by addding dl library
 
 @DPATCH@
-diff -Nurp terminatorx-3.82/src/Makefile.am terminatorx-3.82.ubuntu/src/Makefile.am
---- terminatorx-3.82/src/Makefile.am	2004-10-30 03:37:11.000000000 +0700
-+++ terminatorx-3.82.ubuntu/src/Makefile.am	2011-01-11 19:49:34.329187002 +0700
+---
+ src/Makefile.am |    1 +
+ src/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- terminatorx.orig/src/Makefile.am
++++ terminatorx/src/Makefile.am
 @@ -5,6 +5,7 @@ SUBDIRS = icons
  EXTRA_CFLAGS=-D_REENTRANT @DEPRECATED_FLAGS@
  AM_CFLAGS=@CFLAGS@ @GTK_CFLAGS@ $(EXTRA_CFLAGS)
@@ -16,9 +20,8 @@ diff -Nurp terminatorx-3.82/src/Makefile.am terminatorx-3.82.ubuntu/src/Makefile
  
  license.c: $(top_srcdir)/COPYING
  	@AWK@ -f $(srcdir)/licmak.awk < $(top_srcdir)/COPYING > $(srcdir)/license.c
-diff -Nurp terminatorx-3.82/src/Makefile.in terminatorx-3.82.ubuntu/src/Makefile.in
---- terminatorx-3.82/src/Makefile.in	2004-11-03 21:41:09.000000000 +0700
-+++ terminatorx-3.82.ubuntu/src/Makefile.in	2011-01-11 19:49:39.033187001 +0700
+--- terminatorx.orig/src/Makefile.in
++++ terminatorx/src/Makefile.in
 @@ -65,7 +65,7 @@ am_terminatorX_OBJECTS = tX_endian.$(OBJ
  	tX_glade_callbacks.$(OBJEXT) tX_glade_support.$(OBJEXT) \
  	tX_ladspa_class.$(OBJEXT) tX_capabilities.$(OBJEXT)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3322003
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+05_endian_h.patch
+15_icon_xpm.patch
+16_loose_spelling_fix.patch
+17_cleanup_desktop_file.patch
+20_fix_ftbfs_on_kfreebsd.patch
+21_fix_ftbfs_binutils_gold.patch
diff --git a/debian/rules b/debian/rules
index 53153ba..ab7f660 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@
 #export DH_VERBOSE=1
 
 PACKAGE=terminatorx
-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)
@@ -25,7 +24,7 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)))
 	EXTRA_CONFIGURE := --enable-capabilities
 endif
 
-config.status: patch-stamp configure
+config.status: configure
 	dh_testdir
 
 	cp /usr/share/misc/config.guess .
@@ -52,12 +51,12 @@ build-stamp:  config.status
 
 	touch build-stamp
 
-clean: patch clean1 unpatch
+clean: clean1
 
 clean1:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp patch-stamp
+	rm -f build-stamp
 
 	[ ! -f Makefile ] || -$(MAKE) distclean
 	rm -f src/license.c
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)

-- 
terminatorx packaging

More information about the pkg-multimedia-commits mailing list