Switched patch system from dpatch to quilt.

diff --git a/debian/control b/debian/control
index bd68dbd8a28bda959e9d96bc77e74935cfd7bdb3..3809beba274438dd4a441324728c6eedb675d9dd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: non-free/x11
 Priority: extra
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Standards-Version: 3.7.2.0
-Build-Depends: debhelper (>= 4.1.16), gcc (>> 3), libx11-dev, libxext-dev, libsm-dev, liblua5.1-0-dev, lua5.1, dpatch, pkg-config, groff-base, po-debconf
+Build-Depends: debhelper (>= 4.1.16), gcc (>> 3), libx11-dev, libxext-dev, libsm-dev, liblua5.1-0-dev, lua5.1, quilt, pkg-config, groff-base, po-debconf
 
 Package: ion3
 Section: non-free/x11

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index 2b86911..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-201_fix-paths.diff
-202_fix-menus.diff
-204_fix-bindings.diff
-205_ion-lock.diff
-206_use-xterm.diff
-209_use-etc-default.diff
-210_use-cfg_debian_ext.diff

diff --git a/debian/patches/201_fix-paths.diff b/debian/patches/201_fix-paths.diff
index f5abe0721d144f13c36be0c187288100c04b569a..6a3ce869a196cd11137be878e49f3dfdd2fa3695 100755 (executable)
--- a/debian/patches/201_fix-paths.diff
+++ b/debian/patches/201_fix-paths.diff
@@ -1,21 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-@DPATCH@                                                                                                                                                       
-diff -Nur ion-3ds-20060519.orig/system.mk ion-3ds-20060519/system.mk
---- ion-3ds-20060519.orig/system.mk    2006-05-18 18:06:53.000000000 -0500
-+++ ion-3ds-20060519/system.mk 2006-05-18 23:51:23.000000000 -0500
+--- ion3.orig/system.mk
++++ ion3/system.mk
 @@ -7,7 +7,7 @@
  ## Installation paths
  ##

diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff
index 9942ca9525ca5e440897f82cb98951563dbfb985..c762b1f13dbac140083ab1118a403a3b6843cfbc 100755 (executable)
--- a/debian/patches/202_fix-menus.diff
+++ b/debian/patches/202_fix-menus.diff
@@ -1,20 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)  
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac 
-exit 0
-@DPATCH@
-diff -Nur ion3-20060524.orig/etc/cfg_ioncore.lua ion3-20060524/etc/cfg_ioncore.lua
---- ion3-20060524.orig/etc/cfg_ioncore.lua     2006-05-24 18:23:26.000000000 +0200
-+++ ion3-20060524/etc/cfg_ioncore.lua  2006-07-29 11:14:57.000000000 +0200
+--- ion3.orig/etc/cfg_ioncore.lua
++++ ion3/etc/cfg_ioncore.lua
 @@ -330,11 +330,13 @@
  -- Main menu
  defmenu("mainmenu", {

diff --git a/debian/patches/204_fix-bindings.diff b/debian/patches/204_fix-bindings.diff
index 9678a35b1b7a97268430e5152df790a8c65de730..5028e058f157db60f34cfa42b9b28e6a975de8df 100755 (executable)
--- a/debian/patches/204_fix-bindings.diff
+++ b/debian/patches/204_fix-bindings.diff
@@ -1,22 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur ion3-20061223.orig/etc/cfg_ioncore.lua ion3-20061223/etc/cfg_ioncore.lua
---- ion3-20061223.orig/etc/cfg_ioncore.lua     2006-12-23 15:59:43.000000000 +0100
-+++ ion3-20061223/etc/cfg_ioncore.lua  2006-12-23 16:39:46.000000000 +0100
+--- ion3.orig/etc/cfg_ioncore.lua
++++ ion3/etc/cfg_ioncore.lua
 @@ -153,7 +153,7 @@
      kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
  

diff --git a/debian/patches/205_ion-lock.diff b/debian/patches/205_ion-lock.diff
index 630d13b13830adc6c8278731bdda644523365292..6d2dfafa265d6467530b9cd1556b414994d60821 100755 (executable)
--- a/debian/patches/205_ion-lock.diff
+++ b/debian/patches/205_ion-lock.diff
@@ -1,22 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile
---- ion3-20050322.orig/utils/Makefile  2005-03-22 14:31:06.000000000 +0000
-+++ ion3-20050322/utils/Makefile       2005-03-22 16:29:37.197355881 +0000
+--- ion3.orig/utils/Makefile
++++ ion3/utils/Makefile
 @@ -11,7 +11,7 @@
  SUBDIRS=ion-completefile
  INSTALL_SUBDIRS=$(SUBDIRS)
@@ -26,9 +9,8 @@ diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile
  
  TARGETS = ion-completeman
  
-diff -Nur ion3-20050322.orig/utils/ion-lock ion3-20050322/utils/ion-lock
---- ion3-20050322.orig/utils/ion-lock  1970-01-01 00:00:00.000000000 +0000
-+++ ion3-20050322/utils/ion-lock       2005-03-22 16:29:19.550092305 +0000
+--- ion3.orig/utils/ion-lock
++++ ion3/utils/ion-lock
 @@ -0,0 +1,6 @@
 +#!/bin/sh
 +if xscreensaver-command -version >/dev/null 2>&1; then

diff --git a/debian/patches/206_use-xterm.diff b/debian/patches/206_use-xterm.diff
index 117f005b33012c068a70aac71ef4961d35e3d747..1583fd38f399e10dbc42ebaedf58bfe2011cc79b 100755 (executable)
--- a/debian/patches/206_use-xterm.diff
+++ b/debian/patches/206_use-xterm.diff
@@ -1,22 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur ion-3ds-20041104.orig/utils/ion-runinxterm ion-3ds-20041104/utils/ion-runinxterm
---- ion-3ds-20041104.orig/utils/ion-runinxterm 2003-05-30 21:17:53.000000000 +0000
-+++ ion-3ds-20041104/utils/ion-runinxterm      2004-12-05 15:57:53.000000000 +0000
+--- ion3.orig/utils/ion-runinxterm
++++ ion3/utils/ion-runinxterm
 @@ -1,6 +1,6 @@
  #!/bin/sh
  

diff --git a/debian/patches/208_build-docs-with-hevea.diff b/debian/patches/208_build-docs-with-hevea.diff
index 8e9d0268295626f73037c084b2c58ad6920def30..cb4b6fdc53baf7b663d53dfb48c8b11208b1397f 100644 (file)
--- a/debian/patches/208_build-docs-with-hevea.diff
+++ b/debian/patches/208_build-docs-with-hevea.diff
@@ -1,27 +1,9 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur ion3-20061015.orig/doc/artikel3.hva ion3-20061015/doc/artikel3.hva
---- ion3-20061015.orig/doc/artikel3.hva        1970-01-01 01:00:00.000000000 +0100
-+++ ion3-20061015/doc/artikel3.hva     2006-10-17 18:20:49.000000000 +0200
+--- ion3.orig/doc/artikel3.hva
++++ ion3/doc/artikel3.hva
 @@ -0,0 +1 @@
 +\input{article.hva}
-diff -Nur ion3-20061015.orig/doc/gpl.tex ion3-20061015/doc/gpl.tex
---- ion3-20061015.orig/doc/gpl.tex     2006-10-15 20:00:49.000000000 +0200
-+++ ion3-20061015/doc/gpl.tex  2006-10-17 18:20:49.000000000 +0200
+--- ion3.orig/doc/gpl.tex
++++ ion3/doc/gpl.tex
 @@ -1,21 +1,29 @@
  \xchapter{The GNU General Public License}
  
@@ -52,9 +34,8 @@ diff -Nur ion3-20061015.orig/doc/gpl.tex ion3-20061015/doc/gpl.tex
  \end{center}
  
  \begin{center}
-diff -Nur ion3-20061015.orig/doc/ionconf.tex ion3-20061015/doc/ionconf.tex
---- ion3-20061015.orig/doc/ionconf.tex 2006-10-15 20:00:51.000000000 +0200
-+++ ion3-20061015/doc/ionconf.tex      2006-10-17 18:20:49.000000000 +0200
+--- ion3.orig/doc/ionconf.tex
++++ ion3/doc/ionconf.tex
 @@ -56,17 +56,21 @@
  \markboth{\MakeUppercase{List of functions}}%
           {\MakeUppercase{List of functions}}%
@@ -79,9 +60,8 @@ diff -Nur ion3-20061015.orig/doc/ionconf.tex ion3-20061015/doc/ionconf.tex
  
  \printindex
  
-diff -Nur ion3-20061015.orig/doc/macros.tex ion3-20061015/doc/macros.tex
---- ion3-20061015.orig/doc/macros.tex  2006-10-15 20:00:50.000000000 +0200
-+++ ion3-20061015/doc/macros.tex       2006-10-17 18:20:49.000000000 +0200
+--- ion3.orig/doc/macros.tex
++++ ion3/doc/macros.tex
 @@ -14,6 +14,25 @@
  \usepackage[a4paper]{geometry}
  \usepackage{calc}
@@ -214,9 +194,8 @@ diff -Nur ion3-20061015.orig/doc/macros.tex ion3-20061015/doc/macros.tex
  \makeatletter
 -%end{latexonly}
 +%END LATEX
-diff -Nur ion3-20061015.orig/doc/Makefile ion3-20061015/doc/Makefile
---- ion3-20061015.orig/doc/Makefile    2006-10-15 20:00:50.000000000 +0200
-+++ ion3-20061015/doc/Makefile 2006-10-17 18:21:16.000000000 +0200
+--- ion3.orig/doc/Makefile
++++ ion3/doc/Makefile
 @@ -1,10 +1,13 @@
  # Settings
  ######################################
@@ -254,8 +233,7 @@ diff -Nur ion3-20061015.orig/doc/Makefile ion3-20061015/doc/Makefile
          
  realclean: clean
        rm -f *.ps *.pdf *.dvi
-diff -Nur ion3-20061015.orig/doc/rapport3.hva ion3-20061015/doc/rapport3.hva
---- ion3-20061015.orig/doc/rapport3.hva        1970-01-01 01:00:00.000000000 +0100
-+++ ion3-20061015/doc/rapport3.hva     2006-10-17 18:20:49.000000000 +0200
+--- ion3.orig/doc/rapport3.hva
++++ ion3/doc/rapport3.hva
 @@ -0,0 +1 @@
 +\input{report.hva}

diff --git a/debian/patches/209_use-etc-default.diff b/debian/patches/209_use-etc-default.diff
index 09d40ab0c9f8bc7af14c6c33b12387f67c0e442e..deae7c11b3e4911d5cb6c44bcea87fcf611830e9 100755 (executable)
--- a/debian/patches/209_use-etc-default.diff
+++ b/debian/patches/209_use-etc-default.diff
@@ -1,22 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur ion3-20060317.orig/etc/cfg_ion.lua ion3-20060317/etc/cfg_ion.lua
---- ion3-20060317.orig/etc/cfg_ion.lua 2006-03-17 20:43:04.000000000 +0100
-+++ ion3-20060317/etc/cfg_ion.lua      2006-03-17 22:16:02.000000000 +0100
+--- ion3.orig/etc/cfg_ion.lua
++++ ion3/etc/cfg_ion.lua
 @@ -15,6 +15,9 @@
  -- Terminal emulator
  --XTERM="xterm"

diff --git a/debian/patches/210_use-cfg_debian_ext.diff b/debian/patches/210_use-cfg_debian_ext.diff
index 693586d0a8bfbdfd70a2ebc19f1e38b62421ec71..da0ce151ad22a8875dae3515a29a86ec82717d7d 100644 (file)
--- a/debian/patches/210_use-cfg_debian_ext.diff
+++ b/debian/patches/210_use-cfg_debian_ext.diff
@@ -1,21 +1,5 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- ion3-20070708.orig/etc/cfg_defaults.lua
-+++ ion3-20070708/etc/cfg_defaults.lua
+--- ion3.orig/etc/cfg_defaults.lua
++++ ion3/etc/cfg_defaults.lua
 @@ -15,3 +15,6 @@
  
  -- Deprecated.

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..2b86911
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+201_fix-paths.diff
+202_fix-menus.diff
+204_fix-bindings.diff
+205_ion-lock.diff
+206_use-xterm.diff
+209_use-etc-default.diff
+210_use-cfg_debian_ext.diff

diff --git a/debian/rules b/debian/rules
index 99c822ce18909bf84a7d59443cfb8add5d872366..ade1b180bc6add4d0c553f57e6eba77e76717446 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 export SHELL=/bin/bash
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 PACKAGE := ion3
 PACKAGE_DEV := $(PACKAGE)-dev