[jabref] 233/459: * debian/rules: override dh_auto_clean, `ant clean' fails with an unpatched build.xml after removing lib/. * debian/clean: remove build.number and src/resource/build.properties, they get re-generated on each build.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:40:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository jabref.
commit b67ceb41d420abc9a0e1c83b534705449f8f6aea
Author: gregor herrmann <gregoa at debian.org>
Date: Wed Dec 30 23:29:07 2009 +0000
* debian/rules: override dh_auto_clean, `ant clean' fails with an unpatched
build.xml after removing lib/.
* debian/clean: remove build.number and src/resource/build.properties, they
get re-generated on each build.
---
build.number | 3 ---
debian/changelog | 12 ++++++------
debian/clean | 2 ++
debian/rules | 7 +++++++
src/resource/build.properties | 3 ---
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/build.number b/build.number
deleted file mode 100644
index 9f34c41..0000000
--- a/build.number
+++ /dev/null
@@ -1,3 +0,0 @@
-#Build Number for ANT. Do not edit!
-#Sun Nov 01 16:45:05 CET 2009
-build.number=40
diff --git a/debian/changelog b/debian/changelog
index d412a46..6f613a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
jabref (2.6~beta2+ds-1) UNRELEASED; urgency=low
TODO:
- - clean fails after the removal of lib/ when no patches are applied;
- if we check in trunk with applied patches the next svn-upgrade probably
- breaks; or we come up with a hack to apply this change; or we revert to
- source v1 and play with target deps/overrides
- debian/copyright: the new format would be nice, and a grep over the source
shows some copyright holders ... needs to be checked
@@ -13,8 +9,12 @@ jabref (2.6~beta2+ds-1) UNRELEASED; urgency=low
[ gregor herrmann ]
* Move from contrib to main since all build and runtime dependencies are in
- main now (closes: #548180). Repack upstream tarball to remove the
- sourceless pre-compiled libraries.
+ 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/.
+ * debian/clean: remove build.number and src/resource/build.properties, they
+ get re-generated on each build.
-- gregor herrmann <gregoa at debian.org> Wed, 30 Dec 2009 20:56:57 +0100
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..14290d5
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+build.number
+src/resource/build.properties
diff --git a/debian/rules b/debian/rules
index 1cad809..e231e25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,13 @@
%:
dh $@
+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
diff --git a/src/resource/build.properties b/src/resource/build.properties
deleted file mode 100644
index c6a6462..0000000
--- a/src/resource/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-builddate=November 1 2009
-build=39
-version=2.6b2
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list