[SCM] Java plugin-based editor for programmers branch, master, updated. upstream/4.3.1+dfsg-2-ga4b7d0d

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Java plugin-based editor for programmers".

The branch, master has been updated
       via  a4b7d0d625b7f2d3ad4e7eb7762edaede38cce5b (commit)
      from  2cb4903cc3a9ff354d1cf15409dd332aad1aa69e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a4b7d0d625b7f2d3ad4e7eb7762edaede38cce5b
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Apr 21 22:19:58 2010 +0200

    QUILT_PATCHES fix

-----------------------------------------------------------------------

Summary of changes:
 debian/control |    2 +-
 debian/rules   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9409f68..ba27c8d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.24), ant, ant-optional,
- docbook-xsl, xsltproc, imagemagick, quilt, bsh-src (= 2.0b4-11)
+ docbook-xsl, xsltproc, imagemagick, quilt (>= 0.46-7~), bsh-src (= 2.0b4-11)
 Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/pkg-java/jedit.git
diff --git a/debian/rules b/debian/rules
index 6a92224..874fc20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_auto_configure:
 	# bsh: extract and copy to jEdit original locations
 	mkdir bsh && cd bsh && tar zxf /usr/src/bsh-src/bsh.tar.gz
 	-mv debian/patches/series.noauto debian/patches/series
-	quilt push -a
+	dh_quilt_patch
 	cp -a bsh/src/bsh jEdit/org/gjt/sp/jedit
 	cp -a bsh/asm/src/bsh/org jEdit/org/gjt/sp/jedit/bsh
 
@@ -41,7 +41,7 @@ override_dh_auto_install:
 		$(DESTDIR)/usr/share/applications
 
 override_dh_auto_clean:
-	-quilt pop -a
+	-dh_quilt_unpatch
 	-mv debian/patches/series debian/patches/series.noauto
 	cd jEdit && ant clean-all
 	rm -f jEdit/toc.xml


hooks/post-receive
-- 
Java plugin-based editor for programmers