Author: twerner Date: 2011-08-17 16:49:09 +0000 (Wed, 17 Aug 2011) New Revision: 14270
Modified: trunk/dom4j/debian/changelog trunk/dom4j/debian/control trunk/dom4j/debian/rules Log: Switch to cdbs. Modified: trunk/dom4j/debian/changelog =================================================================== --- trunk/dom4j/debian/changelog 2011-08-17 16:36:56 UTC (rev 14269) +++ trunk/dom4j/debian/changelog 2011-08-17 16:49:09 UTC (rev 14270) @@ -3,8 +3,9 @@ UNRELEASED * Team upload. * Remove Java runtime from Depends. + * Switch to cdbs. - -- Torsten Werner <[email protected]> Wed, 17 Aug 2011 18:34:19 +0200 + -- Torsten Werner <[email protected]> Wed, 17 Aug 2011 18:43:40 +0200 dom4j (1.6.1+dfsg.2-4) unstable; urgency=low Modified: trunk/dom4j/debian/control =================================================================== --- trunk/dom4j/debian/control 2011-08-17 16:36:56 UTC (rev 14269) +++ trunk/dom4j/debian/control 2011-08-17 16:49:09 UTC (rev 14270) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marcus Better <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper +Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper, cdbs Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j Modified: trunk/dom4j/debian/rules =================================================================== --- trunk/dom4j/debian/rules 2011-08-17 16:36:56 UTC (rev 14269) +++ trunk/dom4j/debian/rules 2011-08-17 16:49:09 UTC (rev 14270) @@ -1,68 +1,17 @@ #!/usr/bin/make -f -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS_BASE := /usr/share/java -JAVACMD := $(JAVA_HOME)/bin/java +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk -DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \ - xalan2 xercesImpl ant-junit junit junitperf +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \ + xalan2 xercesImpl ant-junit junit junitperf -DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \ - if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \ - if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \ - if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \ - if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \ - done; \ - if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi) +DEB_ANT_BUILD_TARGET := package release-javadoc +DEB_ANT_CHECK_TARGET := test +DEB_DH_INSTALLCHANGELOGS_ARGS := -k +DEB_INSTALL_CHANGELOGS_ALL := docs/changes-report.html -ANT_ARGS := -propertyfile debian/ant.properties -ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \ - org.apache.tools.ant.Main $(ANT_ARGS) - -PKGNAME := libdom4j-java -INSTALLDIR := $(CURDIR)/debian/$(PKGNAME) -JAVALIBDIR := $(INSTALLDIR)/usr/share/java - -VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\+) - -build: build-stamp -build-stamp: - dh_testdir - $(ANT_INVOKE) package release-javadoc - -$(ANT_INVOKE) test - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(ANT_INVOKE) clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs -k docs/changes-report.html - dh_installdocs - dh_installexamples +install/libdom4j-java:: mh_installpom -plibdom4j-java debian/pom.xml mh_installjar -plibdom4j-java debian/pom.xml -l build/dom4j.jar - install -m 644 debian/$(PKGNAME)-doc.lintian-overrides $(INSTALLDIR)-doc/usr/share/lintian/overrides/$(PKGNAME)-doc - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
