Change patch system from dpatch to quilt.
authorgregor herrmann <gregoa@debian.org>
Thu, 5 Jun 2008 22:56:01 +0000 (22:56 -0000)
committergregor herrmann <gregoa@debian.org>
Thu, 5 Jun 2008 22:56:01 +0000 (22:56 -0000)
debian/changelog
debian/control
debian/patches/00list [deleted file]
debian/patches/options.dpatch [deleted file]
debian/patches/options.patch [new file with mode: 0644]
debian/patches/pgsql.dpatch [deleted file]
debian/patches/pgsql.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules

index f2cf1c379fe45685bdc153015593851b1cfad03d..e57dd4985ae422bc13678492e9d6a50dd1ec92de 100644 (file)
@@ -3,6 +3,7 @@ quickappoint (0.1+svn20051119-6) UNRELEASED; urgency=low
   * Clean up debian/rules.
   * Move upstream URL from the description to the new Homepage field.
   * Change XS-Vcs-* fields to Vcs-*.
+  * Change patch system from dpatch to quilt.
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 15 Oct 2007 19:56:27 +0200
 
index 323968cce6a0f9424a3a7b3114ef5e78e4014746..4aa81e614eb704f4d4a4e029d8908387b0b1a3ea 100644 (file)
@@ -2,7 +2,7 @@ Source: quickappoint
 Section: web
 Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
 Standards-Version: 3.7.0
 Homepage: http://www.toastfreeware.priv.at/
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/quickappoint/trunk/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index dc45da5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-pgsql
-options
diff --git a/debian/patches/options.dpatch b/debian/patches/options.dpatch
deleted file mode 100755 (executable)
index c394dfc..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## options.dpatch by  <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad quickappoint-0.1+svn20051119~/etc/options.php quickappoint-0.1+svn20051119/etc/options.php
---- quickappoint-0.1+svn20051119~/etc/options.php      2005-11-20 23:25:42.000000000 +0100
-+++ quickappoint-0.1+svn20051119/etc/options.php       2005-11-20 23:27:20.000000000 +0100
-@@ -1,32 +1,30 @@
- <?php
-+/*
-+CHANGE SETTINGS HERE:
-+You may want to change at least the projecturl, the other
-+settings have reasonable defaults.
-+*/
-+
- // Server settings
- $project_options = array(
--      'projecturl' => 'http://www.toastfreeware.priv.at/quickappoint/',
-+      'projecturl' => 'http://localhost/quickappoint/',
-       'locale' => '' // use empty string for system default or something like 'de_AT@euro'
- );
- // Database settings
- $db_options = array(
--      'host' => 'colleen.colgarra.priv.at',
-+      'host' => 'localhost',
-       'db' => 'quickappoint',
-       'user' => 'quickappoint',
-       'pass' => 'quickappoint'
- );
-+/*
-+DON'T CHANGE ANYTHING HERE.
-+*/
--// -------------
--// Local options for testing and developing on local machines below:
--
--$local = !ereg('toastfreeware', $_SERVER['HTTP_HOST']);
--
--if ($local) {
--      $project_options['projecturl'] = 'http://localhost/~philipp/quickappoint/';
--}
--
--
--// -------------
- // Further options (derived)
- // Pages where the user doesn't require a login
- $unrestricted_pages = array(
-diff -urNad quickappoint-0.1+svn20051119~/lib/prepend.php quickappoint-0.1+svn20051119/lib/prepend.php
---- quickappoint-0.1+svn20051119~/lib/prepend.php      2005-11-20 23:25:42.000000000 +0100
-+++ quickappoint-0.1+svn20051119/lib/prepend.php       2005-11-20 23:25:43.000000000 +0100
-@@ -3,7 +3,7 @@
- error_reporting(E_ALL);
- session_start();
--require_once(dirname(__FILE__) . '/../etc/options.php');
-+require_once('/etc/quickappoint/options.php');
- // check server settings: magic quotes gpc
diff --git a/debian/patches/options.patch b/debian/patches/options.patch
new file mode 100644 (file)
index 0000000..927e885
--- /dev/null
@@ -0,0 +1,59 @@
+Author: <gregor+debian@comodo.priv.at>
+Description: No description.
+--- quickappoint.orig/etc/options.php
++++ quickappoint/etc/options.php
+@@ -1,32 +1,30 @@
+ <?php
++/*
++CHANGE SETTINGS HERE:
++You may want to change at least the projecturl, the other
++settings have reasonable defaults.
++*/
++
+ // Server settings
+ $project_options = array(
+-      'projecturl' => 'http://www.toastfreeware.priv.at/quickappoint/',
++      'projecturl' => 'http://localhost/quickappoint/',
+       'locale' => '' // use empty string for system default or something like 'de_AT@euro'
+ );
+ // Database settings
+ $db_options = array(
+-      'host' => 'colleen.colgarra.priv.at',
++      'host' => 'localhost',
+       'db' => 'quickappoint',
+       'user' => 'quickappoint',
+       'pass' => 'quickappoint'
+ );
++/*
++DON'T CHANGE ANYTHING HERE.
++*/
+-// -------------
+-// Local options for testing and developing on local machines below:
+-
+-$local = !ereg('toastfreeware', $_SERVER['HTTP_HOST']);
+-
+-if ($local) {
+-      $project_options['projecturl'] = 'http://localhost/~philipp/quickappoint/';
+-}
+-
+-
+-// -------------
+ // Further options (derived)
+ // Pages where the user doesn't require a login
+ $unrestricted_pages = array(
+--- quickappoint.orig/lib/prepend.php
++++ quickappoint/lib/prepend.php
+@@ -3,7 +3,7 @@
+ error_reporting(E_ALL);
+ session_start();
+-require_once(dirname(__FILE__) . '/../etc/options.php');
++require_once('/etc/quickappoint/options.php');
+ // check server settings: magic quotes gpc
diff --git a/debian/patches/pgsql.dpatch b/debian/patches/pgsql.dpatch
deleted file mode 100755 (executable)
index 2b77dbb..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pgsql.dpatch by  <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad quickappoint-0.1+svn20051119~/doc/dump.sql quickappoint-0.1+svn20051119/doc/dump.sql
---- quickappoint-0.1+svn20051119~/doc/dump.sql 2005-11-20 00:19:30.000000000 +0100
-+++ quickappoint-0.1+svn20051119/doc/dump.sql  2005-11-20 00:23:03.000000000 +0100
-@@ -8,24 +8,6 @@
- SET search_path = public, pg_catalog;
- --
---- TOC entry 20 (OID 52099)
---- Name: plpgsql_call_handler(); Type: FUNC PROCEDURAL LANGUAGE; Schema: public; Owner: philipp
----
--
--CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
--    AS '$libdir/plpgsql', 'plpgsql_call_handler'
--    LANGUAGE c;
--
--
----
---- TOC entry 18 (OID 52100)
---- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: public; Owner: 
----
--
--CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler;
--
--
----
- -- TOC entry 5 (OID 21697)
- -- Name: person; Type: TABLE; Schema: public; Owner: gregoa
- --
-@@ -262,3 +244,13 @@
- COMMENT ON COLUMN permission.manageperson IS 'if true, the person may add or remove persons for this appointment.';
-+-- additional SQL commands
-+ALTER USER quickappoint PASSWORD 'quickappoint';
-+GRANT ALL ON DATABASE quickappoint TO quickappoint;
-+GRANT USAGE ON SCHEMA public TO quickappoint;
-+GRANT ALL ON TABLE appointment TO quickappoint;
-+GRANT ALL ON TABLE person TO quickappoint;
-+GRANT ALL ON TABLE permission TO quickappoint;
-+GRANT ALL ON TABLE proposal TO quickappoint;
-+GRANT ALL ON TABLE response TO quickappoint;
-+INSERT INTO person VALUES (1, 'quick', '7d8e1de4afe448799eca785ed3c42095', 'Local Quickappoint Admin', NULL, true, true, '');
diff --git a/debian/patches/pgsql.patch b/debian/patches/pgsql.patch
new file mode 100644 (file)
index 0000000..ef7e8c6
--- /dev/null
@@ -0,0 +1,43 @@
+Author: <gregor+debian@comodo.priv.at>
+Description: No description.
+--- quickappoint.orig/doc/dump.sql
++++ quickappoint/doc/dump.sql
+@@ -8,24 +8,6 @@
+ SET search_path = public, pg_catalog;
+ --
+--- TOC entry 20 (OID 52099)
+--- Name: plpgsql_call_handler(); Type: FUNC PROCEDURAL LANGUAGE; Schema: public; Owner: philipp
+---
+-
+-CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
+-    AS '$libdir/plpgsql', 'plpgsql_call_handler'
+-    LANGUAGE c;
+-
+-
+---
+--- TOC entry 18 (OID 52100)
+--- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: public; Owner: 
+---
+-
+-CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler;
+-
+-
+---
+ -- TOC entry 5 (OID 21697)
+ -- Name: person; Type: TABLE; Schema: public; Owner: gregoa
+ --
+@@ -262,3 +244,13 @@
+ COMMENT ON COLUMN permission.manageperson IS 'if true, the person may add or remove persons for this appointment.';
++-- additional SQL commands
++ALTER USER quickappoint PASSWORD 'quickappoint';
++GRANT ALL ON DATABASE quickappoint TO quickappoint;
++GRANT USAGE ON SCHEMA public TO quickappoint;
++GRANT ALL ON TABLE appointment TO quickappoint;
++GRANT ALL ON TABLE person TO quickappoint;
++GRANT ALL ON TABLE permission TO quickappoint;
++GRANT ALL ON TABLE proposal TO quickappoint;
++GRANT ALL ON TABLE response TO quickappoint;
++INSERT INTO person VALUES (1, 'quick', '7d8e1de4afe448799eca785ed3c42095', 'Local Quickappoint Admin', NULL, true, true, '');
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..eabf684
--- /dev/null
@@ -0,0 +1,2 @@
+pgsql.patch
+options.patch
index beb1f97b4494e79b0a5411686993b6d77ed9a326..387d1a14ae1bb19d046f340e9c1bd3eb4ac32bb3 100755 (executable)
@@ -9,37 +9,24 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-configure: configure-stamp
-
-configure-stamp: patch
-       dh_testdir
-       touch configure-stamp
+include /usr/share/quilt/quilt.make
 
 build: build-stamp
-
-build-stamp: configure-stamp 
+build-stamp: $(QUILT_STAMPFN)
        dh_testdir
-       touch build-stamp
+       touch $@
 
 clean: unpatch
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
-       dh_clean 
+       rm -f build-stamp install-stamp
+       dh_clean
 
-patch: patch-stamp
-patch-stamp:
-                dpatch apply-all
-                touch patch-stamp
-
-unpatch:
-                dpatch deapply-all
-                rm -rf patch-stamp debian/patched
-
-install: build
+install: install-stamp
+install-stamp: build-stamp
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_clean -k
        dh_installdirs
 
        # Lintian overrides
@@ -49,14 +36,16 @@ install: build
        install -m 644 $(CURDIR)/doc/dump.sql \
                                        $(CURDIR)/debian/quickappoint/usr/share/dbconfig-common/data/quickappoint/install-dbadmin/pgsql
 
+       touch $@
+
 # Build architecture-independent files here.
 binary-indep: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs 
+       dh_installchangelogs
        dh_installdocs
        dh_install
-       dh_installdebconf       
+       dh_installdebconf
        dh_installman
        dh_compress
        dh_fixperms
@@ -71,4 +60,4 @@ binary-arch: build install
 # We have nothing to do by default.
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install