This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository stylebook.
commit 83f95604de2ec4c7e920f41fed1acbf5adf1bcf3
Author: Niels Thykier <nthyk...@debian.org>
Date: Sun Oct 30 09:34:54 2011 +0000
Bump dh + S-V, use dh7 style, set classpath in installed jar
---
debian/changelog | 15 +++++++++++++++
debian/compat | 2 +-
debian/control | 8 ++++----
debian/rules | 45 ++++++++++-----------------------------------
4 files changed, 30 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 256de51..44dbf6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+stylebook (1.0~b3~svn20061109-4) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Removed Marcus Better from uploaders - Thanks for your
+ work on this package.
+ * Added build-arch and build-indep targets.
+ * Bumped Standards-Versions to 3.9.2 - no changes required.
+ * Bumped debhelper compat to 8.
+ - replaced dh_clean -k with dh_prep.
+ - migrated to dh7 style rules
+ * Use javahelper to install the jar file.
+ * Set classpath in the xalan jar file.
+
+ -- Niels Thykier <ni...@thykier.net> Sun, 30 Oct 2011 10:13:18 +0100
+
stylebook (1.0~b3~svn20061109-3) unstable; urgency=low
* Team upload
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index 026f04f..fa5bd14 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: stylebook
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Marcus Better <mar...@better.se>, Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: default-jdk, ant, libxerces2-java
-Standards-Version: 3.8.4
+Uploaders: Michael Koch <konque...@gmx.de>
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: default-jdk, ant, javahelper (>= 0.33~), libxerces2-java
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/stylebook
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/stylebook/
diff --git a/debian/rules b/debian/rules
index 6c1deb6..62cbe50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,45 +22,20 @@ PKGNAME := stylebook
INSTALLDIR := $(CURDIR)/debian/lib$(PKGNAME)-java
JAVALIBDIR := $(INSTALLDIR)/usr/share/java
-VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( |
cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\+ | cut -f1-2 -d\~ | tr \~ \-)
+TARGETS := build build-arch build-indep clean binary-indep binary-arch
binary install
-build: build-stamp
-build-stamp:
- dh_testdir
+$(TARGETS):
+ dh $@
+
+override_dh_auto_build:
$(ANT_INVOKE)
- touch build-stamp
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -rf build
+override_dh_auto_clean:
$(ANT_INVOKE) clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_install
- install -m 644 build/$(PKGNAME)-$(VERSION)_xalan-2.jar
$(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar
- ln -s $(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)/$(PKGNAME).jar
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+override_dh_auto_install:
+ jh_classpath --classpath="/usr/share/java/xercesImpl.jar"
build/$(PKGNAME)-*_xalan-2.jar
+ jh_installlibs build/$(PKGNAME)-*_xalan-2.jar
-binary-arch: build install
+.PHONY: $(TARGETS)
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/stylebook.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
