diff --git a/debian/changelog b/debian/changelog index 62b07aa..c887471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ * Team upload. * New upstream release. * d/rules: don't build the doc, as there's none to build. + * d/rules: clean and run upstream testsuite. (Closes: #976753) -- Louis-Philippe VĂ©ronneau Mon, 14 Dec 2020 11:13:44 -0500 diff --git a/debian/control b/debian/control index ebe763b..f512705 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Apollon Oikonomopoulos -Build-Depends: clojure (>= 1.8), - debhelper (>= 10), +Build-Depends: debhelper (>= 10), default-jdk, - javahelper (>= 0.32), - maven-repo-helper (>= 1.5~) + javahelper, + maven-repo-helper, + clojure, Standards-Version: 4.0.0 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java-classpath-clojure.git Vcs-Git: https://anonscm.debian.org/cgit/pkg-java/java-classpath-clojure.git @@ -15,7 +15,9 @@ Package: libjava-classpath-clojure Architecture: all -Depends: ${java:Depends}, ${misc:Depends} +Depends: ${java:Depends}, + ${misc:Depends}, + libclojure-java, Recommends: ${java:Recommends} Description: examine the Java classpath from Clojure programs java.classpath is a Clojure library that provides access to the Java diff --git a/debian/libjava-classpath-clojure.jlibs b/debian/libjava-classpath-clojure.jlibs deleted file mode 100644 index 744e68b..0000000 --- a/debian/libjava-classpath-clojure.jlibs +++ /dev/null @@ -1 +0,0 @@ -java.classpath.jar diff --git a/debian/libjava-classpath-clojure.poms b/debian/libjava-classpath-clojure.poms index 5ad70f2..cd557a3 100644 --- a/debian/libjava-classpath-clojure.poms +++ b/debian/libjava-classpath-clojure.poms @@ -1,28 +1 @@ -# List of POM files for the package -# Format of this file is: -# [option]* -# where option can be: -# --ignore: ignore this POM and its artifact if any -# --ignore-pom: don't install the POM. To use on POM files that are created -# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] -# --no-parent: remove the tag from the POM -# --package=: an alternative package to use when installing this POM -# and its artifact -# --has-package-version: to indicate that the original version of the POM is the same as the upstream part -# of the version for the package. -# --keep-elements=: a list of XML elements to keep in the POM -# during a clean operation with mh_cleanpom or mh_installpom -# --artifact=: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install. [mh_install] -# --java-lib: install the jar into /usr/share/java to comply with Debian -# packaging guidelines -# --usj-name=: name to use when installing the library in /usr/share/java -# --usj-version=: version to use when installing the library in /usr/share/java -# --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=: the destination for the real jar. -# It will be installed with mh_install. [mh_install] -# --classifier=: Optional, the classifier for the jar. Empty by default. -# --site-xml=: Optional, the location for site.xml if it needs to be installed. -# Empty by default. [mh_install] -# -pom.xml --no-parent --has-package-version +pom.xml --no-parent --artifact=java.classpath.jar --usj-name=java.classpath diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules deleted file mode 100644 index 8b13789..0000000 --- a/debian/maven.cleanIgnoreRules +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules deleted file mode 100644 index 8b13789..0000000 --- a/debian/maven.ignoreRules +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules deleted file mode 100644 index 8b13789..0000000 --- a/debian/maven.publishedRules +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/maven.rules b/debian/maven.rules deleted file mode 100644 index 2eaba8c..0000000 --- a/debian/maven.rules +++ /dev/null @@ -1,2 +0,0 @@ - -* clojure * s/([0-9]+)\.([0-9]+).*/$1.$2.x/ * * diff --git a/debian/rules b/debian/rules index cc65798..c408c6d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/javahelper/java-vars.mk -include /usr/share/dpkg/pkg-info.mk export CLASSPATH=/usr/share/java/clojure.jar @@ -13,6 +12,14 @@ override_jh_build: jar cf $(PRODUCED_JAR) -C src/main/clojure . +override_jh_installlibs: + jh_installlibs $(PRODUCED_JAR) + override_jh_clean: jh_clean rm -f $(CURDIR)/$(PRODUCED_JAR) + +override_dh_auto_test: + dh_auto_test + (cd src/test && find . -name "*.clj" | \ + xargs clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH))