[sqlline] 04/22: [sqlline]

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sqlline.

commit 1b2947e6c46e9b8f7a71f42d86dd5f1de24ba0f6
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri Jul 17 13:32:57 2009 +0000

    [sqlline]
    
      * Switch to Quilt patch system:
        - Refresh all patches
        - Add B-D on quilt
        - Include patchsys-quilt.mk in debian/rules
---
 debian/README.source                      | 9 +++++++++
 debian/changelog                          | 6 +++++-
 debian/control                            | 2 +-
 debian/patches/01_build_lib_release.patch | 9 +++++++--
 debian/patches/series                     | 1 +
 debian/rules                              | 5 +----
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..f846ea2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
diff --git a/debian/changelog b/debian/changelog
index a1ea95c..d6c2034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,12 @@ sqlline (1.0.2-3) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.2:
     - Add ${misc:Depends} in Depends field for debhelper
     - Move to "java" section of archive 
+  * Switch to Quilt patch system:
+    - Refresh all patches
+    - Add B-D on quilt
+    - Include patchsys-quilt.mk in debian/rules
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 13 Jul 2009 21:13:55 +0200
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Fri, 17 Jul 2009 15:31:59 +0200
 
 sqlline (1.0.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 655b3f1..5369e50 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
 Build-Depends-Indep: libjline-java
-Build-Depends: ant, default-jdk, debhelper (>= 5), cdbs
+Build-Depends: ant, default-jdk, debhelper (>= 5), cdbs, quilt
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/sqlline/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/sqlline/
 Standards-Version: 3.8.2
diff --git a/debian/patches/01_build_lib_release.patch b/debian/patches/01_build_lib_release.patch
index 9d80861..522dbe0 100644
--- a/debian/patches/01_build_lib_release.patch
+++ b/debian/patches/01_build_lib_release.patch
@@ -1,5 +1,10 @@
---- build.xml.orig	2008-08-24 22:25:18.000000000 +0200
-+++ build.xml	2008-08-24 22:24:51.000000000 +0200
+Description: Create/remove lib-release directory
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-17
+--- a/build.xml
++++ b/build.xml
 @@ -259,6 +259,7 @@
  	<target name="jars.init" depends="init">
  		<tstamp/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c8f27ed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_build_lib_release.patch 
diff --git a/debian/rules b/debian/rules
index b4751a4..1aaadcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sqlline.git