This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository cdk.
commit 9bdc6b9ac26156e1d393183186f7ae19765adb1c
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 30 22:14:26 2018 +0200
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/clean | 3 +++
debian/control | 2 +-
debian/rules | 80 ++++++++++++++++----------------------------------------
4 files changed, 28 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7eaad96..1b5f691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cdk (1:1.2.10-7) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Ant 1.10 (Closes: #894467)
+ * Build with the DH sequencer instead of CDBS
* Moved the package to Git
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..2e7cd99
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+src/org/openscience/cdk/smiles/smarts/parser/SMARTSParserTokenManager.java
+build/
+debian/classpath
diff --git a/debian/control b/debian/control
index 7212eee..f9522bc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Onkar Shinde <onkarshi...@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 11), javahelper, default-jdk, ant-optional
+Build-Depends: debhelper (>= 11), javahelper, default-jdk, ant-optional
Build-Depends-Indep: ant-contrib,
antlr,
docbook-xsl (>= 1.66.1),
diff --git a/debian/rules b/debian/rules
index 0771a4f..bb63a88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,34 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := \
- ant-contrib \
- javacc
-
-ANT_ARGS := -Dlib=/usr/share/java
-
-DEB_ANT_BUILD_TARGET := info dist-all
+include /usr/share/dpkg/pkg-info.mk
COMPONENTS := \
- annotation \
- atomtype \
- builder3d \
- builder3dtools \
- charges \
- control \
- core \
- data \
- dict \
- diff \
- extra \
- fingerprint \
- forcefield \
- formula \
- interfaces \
- ioformats \
- io \
- ionpot \
- isomorphism \
- libiocml \
- libiomd \
- nonotify \
- pcore \
- pdb \
- qm \
- qsar \
- qsaratomic \
- qsarbond \
- qsarionpot \
- qsarmolecular \
- qsarprotein \
- reaction \
- render \
- sdg \
- smarts \
- smiles \
- standard \
- structgen \
- valencycheck
+ annotation atomtype builder3d \
+ builder3dtools charges control \
+ core data dict \
+ diff extra fingerprint \
+ forcefield formula interfaces \
+ ioformats io ionpot \
+ isomorphism libiocml libiomd \
+ nonotify pcore pdb \
+ qm qsar qsaratomic \
+ qsarbond qsarionpot qsarmolecular \
+ qsarprotein reaction render \
+ sdg smarts smiles \
+ standard structgen valencycheck
+
+%:
+ dh $@ --with javahelper
-clean::
- rm -f
src/org/openscience/cdk/smiles/smarts/parser/SMARTSParserTokenManager.java
- rm -rf build
+override_dh_auto_build:
+ dh_auto_build -- -Dlib=/usr/share/java info dist-all
-install/libcdk-java::
+override_dh_install:
+ dh_install
for COMPONENT in $(COMPONENTS); do \
install -m 644 dist/jar/cdk-$$COMPONENT.jar \
-
debian/libcdk-java/usr/share/java/cdk-$$COMPONENT-$(DEB_UPSTREAM_VERSION).jar; \
- ln -s cdk-$$COMPONENT-$(DEB_UPSTREAM_VERSION).jar \
+
debian/libcdk-java/usr/share/java/cdk-$$COMPONENT-$(DEB_VERSION_UPSTREAM).jar; \
+ ln -s cdk-$$COMPONENT-$(DEB_VERSION_UPSTREAM).jar \
debian/libcdk-java/usr/share/java/cdk-$$COMPONENT.jar; \
if [ $$COMPONENT != "core" ]; then \
echo usr/share/java/cdk-$$COMPONENT.jar cdk-core.jar >>
debian/classpath; \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/cdk.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
