This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository rhino.
commit ab998b415bf99d46efd048c34aae71aa03eb36ec Author: Emmanuel Bourg <[email protected]> Date: Thu Jan 19 16:47:22 2017 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/clean | 2 ++ debian/control | 1 - debian/rules | 54 ++++++++++++++++++++++++------------------------------ 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index b54f6b4..ef68801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ rhino (1.7.7-1) UNRELEASED; urgency=medium - Use the pom from the upstream sources to install the Maven artifacts, and relocate the old coordinates rhino:js to org.mozilla:rhino * Removed the transitional package rhino-doc + * Build with the DH sequencer instead of CDBS * Standards-Version updated to 3.9.8 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..c570052 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +toolsrc/org/mozilla/javascript/tools/debugger/downloaded/* +build/ diff --git a/debian/control b/debian/control index 1f27384..54ef02c 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Marcus Better <[email protected]>, Damien Raude-Morvan <[email protected]>, Jakub Adam <[email protected]> Build-Depends: ant, - cdbs, debhelper (>= 10), default-jdk, javahelper, diff --git a/debian/rules b/debian/rules index 381d4cb..fb00be3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,39 +1,33 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar javadoc - -UVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//" | sed "s/~pre/pre/") - -BUILDDIR=build/rhino$(UVERSION) - -clean:: - rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/* - rm -rf build - mh_clean - -# The upstream build file (toolsrc/org/mozilla/javascript/tools/debugger/build.xml) downloads -# a ZIP file containing some sample swing code, which is then modified and used as part of the -# debugger. This is obviously not permitted during a Debian build. -# Fortunately the sample code is DFSG-free, so it has been included in the debian directory (in -# its modified format). Copying it to the "downloaded" directory prevents the upstream -# build.xml from attempting to download it. -configure/rhino:: +VERSION = $(shell dpkg-parsechangelog --show-field Version | sed -rne 's/([^-]+).*/\1/p') +BUILDDIR = build/rhino$(VERSION) + +%: + dh $@ --with javahelper --with maven-repo-helper + +override_dh_auto_build: + # The upstream build file (toolsrc/org/mozilla/javascript/tools/debugger/build.xml) + # downloads a ZIP file containing some sample swing code, which is then modified + # and used as part of the debugger. This is obviously not permitted during a Debian build. + # Fortunately the sample code is DFSG-free, so it has been included in the debian + # directory (in its modified format). Copying it to the "downloaded" directory + # prevents the upstream build.xml from attempting to download it. mkdir -p toolsrc/org/mozilla/javascript/tools/debugger/downloaded - cp debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ - cp debian/src_from_treetable_article_see_bug409629/JTreeTable.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ - cp debian/src_from_treetable_article_see_bug409629/TreeTableModel.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + cp debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + cp debian/src_from_treetable_article_see_bug409629/JTreeTable.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + cp debian/src_from_treetable_article_see_bug409629/TreeTableModel.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ cp debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ -install/librhino-java:: - mh_installpom -plibrhino-java -e$(UVERSION) maven/maven-pom.xml --no-parent --relocate=rhino:js - mh_installjar -plibrhino-java -e$(UVERSION) -l maven/maven-pom.xml --usj-name=js $(BUILDDIR)/js.jar + dh_auto_build -- jar javadoc + +override_mh_install: + mh_installpom -plibrhino-java maven/maven-pom.xml --no-parent --relocate=rhino:js + mh_installjar -plibrhino-java -l maven/maven-pom.xml --usj-name=js $(BUILDDIR)/js.jar + +override_dh_install: + dh_install -install/librhino-java-doc:: mv $(BUILDDIR)/javadoc $(BUILDDIR)/api dh_install -plibrhino-java-doc $(BUILDDIR)/api /usr/share/doc/rhino/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rhino.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
