[Git][java-team/cdk][master] 5 commits: Simplifying debian/rules.

[Andrius Merkys]

Andrius Merkys pushed to branch master at Debian Java Maintainers / cdk


Commits:
77b44ad6 by Andrius Merkys at 2019-11-21T11:59:30Z
Simplifying debian/rules.

- - - - -
1c8f1975 by Andrius Merkys at 2019-11-21T12:09:02Z
Not running tests during build.

- - - - -
b2e6fa7c by Andrius Merkys at 2019-11-21T12:11:27Z
Adding a patch fixing build.

- - - - -
ee2af3e9 by Andrius Merkys at 2019-11-21T12:23:11Z
Ignoring problematic artifacts.

- - - - -
c434f3bc by Andrius Merkys at 2019-11-21T12:24:25Z
Putting epoch back to debian/changelog.

- - - - -


7 changed files:

- debian/changelog
- debian/libcdk-java.poms
- debian/maven.ignoreRules
- + debian/maven.properties
- + debian/patches/build.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-cdk (2.3-1) UNRELEASED; urgency=medium
+cdk (1:2.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream version (Closes: #635182)


=====================================
debian/libcdk-java.poms
=====================================
@@ -76,7 +76,7 @@ storage/pom.xml --has-package-version
 storage/ctab/pom.xml --has-package-version
 storage/io/pom.xml --has-package-version
 storage/ioformats/pom.xml --has-package-version
-storage/iordf/pom.xml --has-package-version
+storage/iordf/pom.xml --has-package-version --ignore
 storage/libiocml/pom.xml --has-package-version
 storage/libiomd/pom.xml --has-package-version
 storage/pdb/pom.xml --has-package-version
@@ -99,6 +99,6 @@ tool/smsd/pom.xml --has-package-version
 tool/structgen/pom.xml --has-package-version
 tool/tautomer/pom.xml --has-package-version
 tool/model/pom.xml --has-package-version
-legacy/pom.xml --has-package-version
+legacy/pom.xml --has-package-version --ignore
 app/pom.xml --has-package-version
-app/depict/pom.xml --has-package-version
+app/depict/pom.xml --has-package-version --ignore


=====================================
debian/maven.ignoreRules
=====================================
@@ -6,4 +6,8 @@ org.codehaus.mojo findbugs-maven-plugin * * * *
 org.codehaus.mojo javacc-maven-plugin * * * *
 org.jacoco jacoco-maven-plugin * * * *
 org.mockito mockito-all * * * *
-org.openscience.cdk cdk-build-utils * * * *
+org.openscience.cdk cdk-test* * * * *
+org.openscience.cdk * test-jar
+org.openscience.cdk cdk-iordf jar
+org.openscience.cdk cdk-legacy jar
+org.openscience.cdk cdk-depict jar


=====================================
debian/maven.properties
=====================================
@@ -0,0 +1,6 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+# project.build.sourceEncoding=UTF-8
+
+maven.test.skip=true


=====================================
debian/patches/build.patch
=====================================
@@ -0,0 +1,18 @@
+--- a/storage/ioformats/pom.xml
++++ b/storage/ioformats/pom.xml
+@@ -58,15 +58,9 @@
+             <scope>test</scope>
+         </dependency>
+         <dependency>
+-            <groupId>org.openscience.cdk</groupId>
+-            <artifactId>cdk-interfaces</artifactId>
+-            <version>${project.parent.version}</version>
+-        </dependency>
+-        <dependency>
+             <groupId>${project.groupId}</groupId>
+             <artifactId>cdk-interfaces</artifactId>
+             <version>${project.parent.version}</version>
+-            <scope>test</scope>
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+build.patch


=====================================
debian/rules
=====================================
@@ -1,38 +1,4 @@
 #!/usr/bin/make -f
 
-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
-
 %:
-	dh $@ --with javahelper
-
-override_dh_auto_build:
-	dh_auto_build -- -Dlib=/usr/share/java test # install
-
-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_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; \
-		else \
-			echo usr/share/java/cdk-$$COMPONENT.jar jama.jar jgrapht.jar log4j-1.2.jar xercesImpl.jar vecmath.jar xom.jar >> debian/classpath; \
-		fi \
-	done
+	dh $@
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/java-team/cdk/compare/87edb21c5591d715eb4529e25f8c242b3de6e5ec...c434f3bca1542f76e1ecd6ff8be945cb2fde656a

-- 
View it on GitLab: https://salsa.debian.org/java-team/cdk/compare/87edb21c5591d715eb4529e25f8c242b3de6e5ec...c434f3bca1542f76e1ecd6ff8be945cb2fde656a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20191121/e0b1e797/attachment.html>