This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit 0ddf88550ee858f1820d41253c33f84fbbead5f2 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 11:44:32 2015 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 1 - debian/docs | 1 + debian/rules | 51 ++++++++++++++++++--------------------------------- 4 files changed, 20 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47b0bde..1f07a60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ bnd (2.2.0-1) UNRELEASED; urgency=medium - Updated the linked jars in debian/rules * Restored the Java 8 compatibility patch * Use XZ compression for the upstream tarball + * Build with the DH sequencer instead of CDBS -- Emmanuel Bourg <[email protected]> Tue, 15 Dec 2015 22:34:41 +0100 diff --git a/debian/control b/debian/control index 2114020..e63aa73 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: ant, ant-contrib, ant-optional, - cdbs, debhelper (>= 9), default-jdk, eclipse-jdt, diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/rules b/debian/rules index 461af10..36a4a54 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,18 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - MAVEN_REPO := http://repo1.maven.org/maven2/biz/aQute/ MAVEN_VERSION := 2.2.0 -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps ant junit -DEB_ANT_BUILD_TARGET := build +PACKAGE := bnd +VERSION := $(MAVEN_VERSION) + +export JAVA_HOME = /usr/lib/jvm/default-java + +%: + dh $@ --buildsystem=ant -### Bootstrap build -pre-build:: debian/stamp-bootstrap -bootstrap: debian/stamp-bootstrap -debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR) -debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml -debian/stamp-bootstrap: - $(DEB_ANT_INVOKE) +override_dh_auto_build: + ant -f debian/bootstrap.xml mkdir -p cnf/repo/biz.aQute.bnd/ \ cnf/repo/com.springsource.junit/ \ cnf/repo/com.springsource.org.junit \ @@ -84,36 +78,29 @@ debian/stamp-bootstrap: ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar - touch $@ -clean-bootstrap: DEB_BUILDDIR=$(CURDIR) -clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml -clean-bootstrap: - $(DEB_ANT_INVOKE) clean - rm -rf cnf/repo/biz.aQute.bnd/ - rm -rf biz.aQute.repository - rm -rf biz.aQute.resolve - rm -f debian/stamp-bootstrap -### Standard build -install/$(PACKAGE):: + dh_auto_build -- build + pod2man -c 'BND for Debian GNU/Linux' \ -r $(PACKAGE)-$(VERSION) \ debian/bnd.pod > debian/bnd.1 -binary-post-install/$(PACKAGE):: +override_dh_auto_install: + dh_auto_install + mkdir install/ cp biz.aQute.launcher/generated/biz.aQute.launcher.jar install/bnd.launcher.jar cp biz.aQute.junit/generated/biz.aQute.junit.jar install/bnd.junit.jar mh_installpoms -p$(PACKAGE) -e$(VERSION) - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml --usj-name=bndlib biz.aQute.bndlib/generated/biz.aQute.bndlib.jar - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml --usj-name=bnd biz.aQute.bnd/generated/biz.aQute.bnd.jar + mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml --usj-name=bndlib biz.aQute.bndlib/generated/biz.aQute.bndlib.jar + mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml --usj-name=bnd biz.aQute.bnd/generated/biz.aQute.bnd.jar mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd/generated/biz.aQute.bnd.annotation.jar jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar jh_installlibs -p$(PACKAGE) install/bnd.junit.jar dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/ - mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd + mv debian/$(PACKAGE)/usr/bin/bnd.sh debian/$(PACKAGE)/usr/bin/bnd -clean:: +override_dh_auto_clean: -rm -f debian/stamp-bootstrap -rm -rf aQute.libg/bin/ -rm -rf aQute.libg/generated/ @@ -139,5 +126,3 @@ get-orig-pom: wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bnd/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/bnd/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom - -.PHONY: bootstrap clean-bootstrap -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
