Author: marcusb-guest Date: 2008-09-29 09:35:19 +0000 (Mon, 29 Sep 2008) New Revision: 7064
Modified: trunk/libjdom1-java/debian/control trunk/libjdom1-java/debian/rules Log: Use dephelper 7 features, drop cdbs. Modified: trunk/libjdom1-java/debian/control =================================================================== --- trunk/libjdom1-java/debian/control 2008-09-28 18:15:53 UTC (rev 7063) +++ trunk/libjdom1-java/debian/control 2008-09-29 09:35:19 UTC (rev 7064) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Marcus Better <[EMAIL PROTECTED]> -Build-Depends-Indep: debhelper(>= 7), cdbs, java-gcj-compat-dev, ant, libjaxen-java +Build-Depends-Indep: debhelper(>= 7, java-gcj-compat-dev, ant, libjaxen-java Standards-Version: 3.8.0.1 Homepage: http://jdom.org Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjdom1-java Modified: trunk/libjdom1-java/debian/rules =================================================================== --- trunk/libjdom1-java/debian/rules 2008-09-28 18:15:53 UTC (rev 7063) +++ trunk/libjdom1-java/debian/rules 2008-09-29 09:35:19 UTC (rev 7064) @@ -1,21 +1,45 @@ #!/usr/bin/make -f -# debian/rules for jdom1 (cdbs) -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +JAVA_HOME := /usr/lib/jvm/java-gcj +DEB_JARS := ant ant-launcher jaxen -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_CLASSPATH = $(shell for jar in $(DEB_JARS:%=/usr/share/java/%.jar); do \ + echo -n $${jar}:; done; \ + echo -n $(JAVA_HOME)/lib/tools.jar) -JAVA_HOME := /usr/lib/jvm/java-gcj -ANT_HOME := /usr/share/ant -DEB_JARS := jaxen -DEB_ANT_BUILD_TARGET := package javadoc +ANT_ARGS := -propertyfile debian/ant.properties +ANT := $(JAVA_HOME)/bin/java -classpath $(DEB_CLASSPATH) \ + org.apache.tools.ant.Main $(ANT_ARGS) -LIBRARY = jdom1 -VERSION = $(dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1) +PKG := jdom1 +VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1) -install/lib${LIBRARY}-java:: - install -m 644 build/jdom.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar - ln -s ${LIBRARY}-${VERSION}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}.jar +INSTALLDIR := debian/lib$(PKG)-java + +build: build-stamp +build-stamp: + dh build + $(ANT) package javadoc + touch build-stamp + +clean: + dh clean + $(ANT) clean + + +install: build install-stamp +install-stamp: + dh install + install -m 644 build/jdom.jar $(INSTALLDIR)/usr/share/java/$(PKG)-$(VERSION).jar + ln -s $(PKG)-$(VERSION).jar $(INSTALLDIR)/usr/share/java/$(PKG).jar + touch install-stamp + +binary-arch: install + dh binary-arch + +binary-indep: install + dh binary-indep + +binary: binary-arch binary-indep + +.PHONY: build clean install binary-indep binary-arch binary _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
