diff -Nru fast-zip-visit-clojure-1.0.2/debian/changelog fast-zip-visit-clojure-1.0.2/debian/changelog --- fast-zip-visit-clojure-1.0.2/debian/changelog 2018-04-18 21:37:39.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/changelog 2022-07-10 14:53:59.000000000 +0000 @@ -1,3 +1,25 @@ +fast-zip-visit-clojure (1.0.2-3) unstable; urgency=medium + + * Team upload. + + [ Louis-Philippe Véronneau ] + * d/control: New email for the Clojure Team. + + [ Jérôme Charaoui ] + * d/control: update Vcs-* URLs + * Add d/gbp.conf with clojure-team defaults + * d/control: bump compat level to 13 + * Bump Standards-Version to 4.6.1, no changes needed + * Switch buildsystem to leiningen + * d/control: add missing test deps + * Remove unneeded markdown dep and docs config + * d/control: add dep on fast-zip <= 0.5.0 + * d/copyright: add myself to debian/* copyright + * Cleanup unneeded html files in debian/ + * Remove unneeded d/.gitignore + + -- Jérôme Charaoui Sun, 10 Jul 2022 10:53:59 -0400 + fast-zip-visit-clojure (1.0.2-2) unstable; urgency=medium * Team upload. diff -Nru fast-zip-visit-clojure-1.0.2/debian/compat fast-zip-visit-clojure-1.0.2/debian/compat --- fast-zip-visit-clojure-1.0.2/debian/compat 2018-04-18 21:34:36.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru fast-zip-visit-clojure-1.0.2/debian/control fast-zip-visit-clojure-1.0.2/debian/control --- fast-zip-visit-clojure-1.0.2/debian/control 2018-04-18 21:35:43.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/control 2022-07-10 14:53:59.000000000 +0000 @@ -1,19 +1,22 @@ Source: fast-zip-visit-clojure Section: java Priority: optional -Maintainer: Debian Clojure Maintainers +Maintainer: Debian Clojure Maintainers Uploaders: Apollon Oikonomopoulos Build-Depends: - debhelper (>= 11), + debhelper-compat (= 13), javahelper (>= 0.32), maven-repo-helper (>= 1.7), - clojure (>= 1.8), - libtext-markdown-perl | markdown, + libclojure-java (>= 1.8), libfast-zip-clojure (>= 0.4.0), - default-jdk -Standards-Version: 4.1.4 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/fast-zip-visit-clojure.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/fast-zip-visit-clojure.git + libfast-zip-clojure (<= 0.5.0) | libfast-zip-clojure (>= 0.7.0+really0.5.0~), + default-jdk, + leiningen, + libcomplete-clojure , + libnrepl-clojure , +Standards-Version: 4.6.1 +Vcs-Git: https://salsa.debian.org/clojure-team/fast-zip-visit-clojure.git +Vcs-Browser: https://salsa.debian.org/clojure-team/fast-zip-visit-clojure Homepage: https://github.com/akhudek/zip-visit Package: libfast-zip-visit-clojure diff -Nru fast-zip-visit-clojure-1.0.2/debian/copyright fast-zip-visit-clojure-1.0.2/debian/copyright --- fast-zip-visit-clojure-1.0.2/debian/copyright 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/copyright 2022-07-10 14:53:59.000000000 +0000 @@ -7,7 +7,8 @@ License: MIT/X11 Files: debian/* -Copyright: 2017 Apollon Oikonomopoulos +Copyright: 2022 Jérôme Charaoui + 2017 Apollon Oikonomopoulos License: MIT/X11 License: MIT/X11 diff -Nru fast-zip-visit-clojure-1.0.2/debian/footer.html fast-zip-visit-clojure-1.0.2/debian/footer.html --- fast-zip-visit-clojure-1.0.2/debian/footer.html 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/footer.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ - - diff -Nru fast-zip-visit-clojure-1.0.2/debian/gbp.conf fast-zip-visit-clojure-1.0.2/debian/gbp.conf --- fast-zip-visit-clojure-1.0.2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/gbp.conf 2022-07-10 14:53:59.000000000 +0000 @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch = debian/main +pristine-tar = true diff -Nru fast-zip-visit-clojure-1.0.2/debian/header.html fast-zip-visit-clojure-1.0.2/debian/header.html --- fast-zip-visit-clojure-1.0.2/debian/header.html 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/header.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - - - -@TITLE@ - - diff -Nru fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.classpath fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.classpath --- fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.classpath 1970-01-01 00:00:00.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.classpath 2022-07-10 14:53:59.000000000 +0000 @@ -0,0 +1 @@ +usr/share/java/fast-zip-visit.jar /usr/share/java/clojure.jar /usr/share/java/fast-zip.jar diff -Nru fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.docs fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.docs --- fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.docs 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -*.md diff -Nru fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.jlibs fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.jlibs --- fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.jlibs 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.jlibs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fast-zip-visit.jar diff -Nru fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.poms fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.poms --- fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.poms 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/libfast-zip-visit-clojure.poms 2022-07-10 14:53:59.000000000 +0000 @@ -1 +1 @@ -debian/pom.xml --usj-name=fast-zip-visit +debian/pom.xml --artifact=target/fast-zip-visit.jar --usj-name=fast-zip-visit --java-lib diff -Nru fast-zip-visit-clojure-1.0.2/debian/patches/0001_Lein_Local.patch fast-zip-visit-clojure-1.0.2/debian/patches/0001_Lein_Local.patch --- fast-zip-visit-clojure-1.0.2/debian/patches/0001_Lein_Local.patch 1970-01-01 00:00:00.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/patches/0001_Lein_Local.patch 2022-07-10 14:53:59.000000000 +0000 @@ -0,0 +1,27 @@ +From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= +Date: Sun, 10 Jul 2022 10:29:10 -0400 +Subject: Patch project.clj so we can build using lein locally + +Forwarded: not-needed +--- + project.clj | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/project.clj b/project.clj +index 3124e52..82e48b3 100644 +--- a/project.clj ++++ b/project.clj +@@ -3,9 +3,10 @@ + :url "https://github.com/akhudek/zip-visit" + :license {:name "MIT" + :url "http://opensource.org/licenses/MIT"} +- :dependencies [[fast-zip "0.4.0"]] +- :profiles {:dev {:dependencies [[org.clojure/clojure "1.6.0"]]}} ++ :dependencies [[fast-zip "debian"]] ++ :profiles {:dev {:dependencies [[org.clojure/clojure "1.10.x"]]}} + :scm {:name "git" + :url "https://github.com/akhudek/zip-visit"} + :deploy-repositories +- [["clojars" {:signing {:gpg-key "D8B883CA"}}]]) ++ [["clojars" {:signing {:gpg-key "D8B883CA"}}]] ++ :local-repo "debian/maven-repo") diff -Nru fast-zip-visit-clojure-1.0.2/debian/patches/series fast-zip-visit-clojure-1.0.2/debian/patches/series --- fast-zip-visit-clojure-1.0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/patches/series 2022-07-10 14:53:59.000000000 +0000 @@ -0,0 +1 @@ +0001_Lein_Local.patch diff -Nru fast-zip-visit-clojure-1.0.2/debian/pom.xml fast-zip-visit-clojure-1.0.2/debian/pom.xml --- fast-zip-visit-clojure-1.0.2/debian/pom.xml 2018-04-18 21:32:23.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/pom.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ - - 4.0.0 - fast-zip-visit - fast-zip-visit - jar - 1.0.2 - fast-zip-visit - Clojure zipper-based visitor library (fast-zip version). - https://github.com/akhudek/zip-visit - - - MIT - http://opensource.org/licenses/MIT - - - - https://github.com/akhudek/zip-visit - - - src - test - - - resources - - - - - resources - - - target - target/classes - - - - - central - https://repo1.maven.org/maven2/ - - false - - - true - - - - clojars - https://clojars.org/repo/ - - true - - - true - - - - - - - - - fast-zip - fast-zip - 0.4.0 - - - org.clojure - clojure - 1.6.0 - test - - - - - diff -Nru fast-zip-visit-clojure-1.0.2/debian/rules fast-zip-visit-clojure-1.0.2/debian/rules --- fast-zip-visit-clojure-1.0.2/debian/rules 2018-04-18 21:34:36.000000000 +0000 +++ fast-zip-visit-clojure-1.0.2/debian/rules 2022-07-10 14:53:59.000000000 +0000 @@ -1,34 +1,30 @@ #!/usr/bin/make -f include /usr/share/javahelper/java-vars.mk +include /usr/share/dpkg/pkg-info.mk -MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md)) - -PRODUCED_JAR=fast-zip-visit.jar -export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/fast-zip.jar +export LEIN_HOME=$(CURDIR)/.lein +export LEIN_OFFLINE=true +NAME=fast-zip-visit %: - dh $@ --with javahelper --with jh_maven_repo_helper + dh $@ --with javahelper --with maven_repo_helper + +override_dh_auto_configure: + cd debian && ln -sf /usr/share/maven-repo . -override_jh_build: $(MDWN_DOCS) - jar cf $(PRODUCED_JAR) -C src . - mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html - -override_jh_classpath: - jh_classpath $(PRODUCED_JAR) - -override_jh_clean: - jh_clean - rm -f $(CURDIR)/$(PRODUCED_JAR) - rm -rf $(CURDIR)/doc/html - -%.html:%.md - cat debian/header.html > $@ - sed -i'' -e 's#@TITLE@#$(shell head -n 1 $< | sed 's/^#*\s*//')#g' $@ - markdown $< >> $@ - cat debian/footer.html >> $@ +override_dh_auto_build: + lein pom debian/pom.xml + lein jar + cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar override_dh_auto_test: - dh_auto_test - (cd test && find . -name "*.clj" | \ - xargs clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH)) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + lein test +endif + +override_dh_clean: + rm -f debian/maven-repo + rm -Rf target + rm -f debian/pom.xml + dh_clean