[jabref] 243/459: add back quilt stuff after the move back to source format v1

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit d8e1ad5b832f08057fb786e3edda791ff0d13ce6
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jan 17 14:03:06 2010 +0000

    add back quilt stuff after the move back to source format v1
---
 debian/README.source | 6 ++++++
 debian/changelog     | 3 ++-
 debian/control       | 4 ++--
 debian/rules         | 5 +----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..7df3fd2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,6 @@
+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 4fcd9ca..dda2c0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,8 @@ jabref (2.6~beta2+dfsg-1) UNRELEASED; urgency=low
     main now (closes: #548180).
   * Repack upstream tarball to remove the sourceless pre-compiled libraries.
   * debian/rules: override dh_auto_clean, `ant clean' fails with an unpatched
-    build.xml after removing lib/.
+    build.xml after removing lib/. Move ant from B-D to B-D-I since it's not
+    used in the clean target anymore.
   * debian/clean: remove build.number and src/resource/build.properties, they
     get re-generated on each build.
   * Install reportbug presubj file via dh_bugfiles.
diff --git a/debian/control b/debian/control
index 9b1f0f3..15e79c6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: tex
 Priority: optional
 Maintainer: gregor herrmann <gregoa at debian.org>
 Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 7.3.7), ant
-Build-Depends-Indep: default-jdk-builddep, imagemagick, liblog4j1.2-java,
+Build-Depends: debhelper (>= 7.3.7), quilt (>= 0.46-7)
+Build-Depends-Indep: default-jdk-builddep, ant, imagemagick, liblog4j1.2-java,
  antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0),
  libmysql-java, libcommons-logging-java, libjpf-java, libjpfcodegen-java,
diff --git a/debian/rules b/debian/rules
index e231e25..b02cc18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_clean:
 	# ant clean fails if build.xml is not patched
 	$(RM) -r $(CURDIR)/build
 
-override_dh_clean:
-	dh_clean --verbose
-
 override_dh_auto_build:
 	JAVA_HOME=/usr/lib/jvm/default-java ANT_OPTS=-D"file.encoding=UTF-8" \
 		dh_auto_build

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