[pkg-java] r16741 - in trunk/hsqldb/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-27 09:52:33 +0000 (Mon, 27 May 2013)
New Revision: 16741

Added:
   trunk/hsqldb/debian/patches/series
Modified:
   trunk/hsqldb/debian/patches/hsqldb-init-provides.diff
   trunk/hsqldb/debian/patches/hsqldb-init-tempfile.diff
   trunk/hsqldb/debian/patches/hsqldb-prefs-file.patch
   trunk/hsqldb/debian/patches/insserv-defaults.diff
   trunk/hsqldb/debian/rules
Log:
Switched to quilt to manage the patches



Modified: trunk/hsqldb/debian/patches/hsqldb-init-provides.diff
===================================================================
--- trunk/hsqldb/debian/patches/hsqldb-init-provides.diff	2013-05-27 09:33:32 UTC (rev 16740)
+++ trunk/hsqldb/debian/patches/hsqldb-init-provides.diff	2013-05-27 09:52:33 UTC (rev 16741)
@@ -1,5 +1,5 @@
---- bin/hsqldb-old	2009-09-19 00:53:21.000000000 +0200
-+++ bin/hsqldb	2009-09-19 00:53:40.000000000 +0200
+--- a/bin/hsqldb
++++ b/bin/hsqldb
 @@ -47,7 +47,7 @@
  # config: /etc/sysconfig/hsqldb
  
@@ -7,5 +7,5 @@
 -# Provides:          HSQLDB-Server
 +# Provides:          hsqldb-server
  # Required-Start:    $syslog $remote_fs $network $named
- # Required-Stop:
- # Default-Start:     3 5
+ # Required-Stop:     $remote_fs
+ # Default-Start:     2 3 4 5

Modified: trunk/hsqldb/debian/patches/hsqldb-init-tempfile.diff
===================================================================
--- trunk/hsqldb/debian/patches/hsqldb-init-tempfile.diff	2013-05-27 09:33:32 UTC (rev 16740)
+++ trunk/hsqldb/debian/patches/hsqldb-init-tempfile.diff	2013-05-27 09:52:33 UTC (rev 16741)
@@ -1,6 +1,6 @@
---- hsqldb-1.8.0.10.orig/bin/hsqldb
-+++ hsqldb-1.8.0.10/bin/hsqldb
-@@ -110,7 +110,7 @@
+--- a/bin/hsqldb
++++ b/bin/hsqldb
+@@ -109,7 +109,7 @@
  SU_ECHO_SECS=1
  # File used as semaphore.  If file is removed, a running pid checker
  # process will exit.

Modified: trunk/hsqldb/debian/patches/hsqldb-prefs-file.patch
===================================================================
--- trunk/hsqldb/debian/patches/hsqldb-prefs-file.patch	2013-05-27 09:33:32 UTC (rev 16740)
+++ trunk/hsqldb/debian/patches/hsqldb-prefs-file.patch	2013-05-27 09:52:33 UTC (rev 16741)
@@ -1,7 +1,6 @@
-diff -Nur hsqldb-1.8.0.2/src/org/hsqldb/util/ConnectionDialogCommon.java hsqldb-1.8.0.2.new/src/org/hsqldb/util/ConnectionDialogCommon.java
---- hsqldb-1.8.0.2/src/org/hsqldb/util/ConnectionDialogCommon.java	2005-12-11 14:47:11.000000000 +0100
-+++ hsqldb-1.8.0.2.new/src/org/hsqldb/util/ConnectionDialogCommon.java	2005-12-11 14:47:25.000000000 +0100
-@@ -178,7 +178,7 @@
+--- a/src/org/hsqldb/util/ConnectionDialogCommon.java
++++ b/src/org/hsqldb/util/ConnectionDialogCommon.java
+@@ -177,7 +177,7 @@
                  recentSettings = new File(homedir, fileName);
  
                  if (!recentSettings.exists()) {

Modified: trunk/hsqldb/debian/patches/insserv-defaults.diff
===================================================================
--- trunk/hsqldb/debian/patches/insserv-defaults.diff	2013-05-27 09:33:32 UTC (rev 16740)
+++ trunk/hsqldb/debian/patches/insserv-defaults.diff	2013-05-27 09:52:33 UTC (rev 16741)
@@ -1,17 +1,17 @@
---- hsqldb-1.8.0.10.orig/bin/hsqldb
-+++ hsqldb-1.8.0.10/bin/hsqldb
+--- a/bin/hsqldb
++++ b/bin/hsqldb
 @@ -46,13 +46,12 @@
  # pidfile: /var/run/hsqldb.pid
  # config: /etc/sysconfig/hsqldb
  
 -# This stuff for SuSE Linux.  Contributed by M. Bisping.
  ### BEGIN INIT INFO
- # Provides:          hsqldb-server
+ # Provides:          HSQLDB-Server
  # Required-Start:    $syslog $remote_fs $network $named
 -# Required-Stop:
-+# Required-Stop:     $remote_fs
 -# Default-Start:     3 5
 -# Default-Stop:      0 1 2 6
++# Required-Stop:     $remote_fs
 +# Default-Start:     2 3 4 5
 +# Default-Stop:      0 1 6
  # Short-Description: HSQLDB-Server

Added: trunk/hsqldb/debian/patches/series
===================================================================
--- trunk/hsqldb/debian/patches/series	                        (rev 0)
+++ trunk/hsqldb/debian/patches/series	2013-05-27 09:52:33 UTC (rev 16741)
@@ -0,0 +1,9 @@
+bitxor2.diff
+hsqldb-demos.patch
+hsqldb-init-restart.diff
+hsqldb-prefs-file.patch
+insserv-defaults.diff
+fix-lock.patch
+hsqldb-init-provides.diff
+hsqldb-init-tempfile.diff
+i104901.patch

Modified: trunk/hsqldb/debian/rules
===================================================================
--- trunk/hsqldb/debian/rules	2013-05-27 09:33:32 UTC (rev 16740)
+++ trunk/hsqldb/debian/rules	2013-05-27 09:52:33 UTC (rev 16741)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME = /usr/lib/jvm/default-java
 DEB_JARS = servlet-api