diff -Nru scout-clojure-0.1.1/debian/changelog scout-clojure-0.1.1/debian/changelog --- scout-clojure-0.1.1/debian/changelog 2017-10-14 20:59:11.000000000 +0000 +++ scout-clojure-0.1.1/debian/changelog 2018-02-28 03:56:30.000000000 +0000 @@ -1,3 +1,16 @@ +scout-clojure (0.1.1-5) unstable; urgency=medium + + [ Tom Marble ] + * Change libclojure from Build-Dep to Dep + * Declare compliance with Debian Policy 4.1.3. + + [ Elana Hashman ] + * Update Vcs links to salsa. (mango) + * Remove markdown->html doc generation. + * Remove Eugenio from Uploaders. + + -- Elana Hashman Tue, 27 Feb 2018 22:56:30 -0500 + scout-clojure (0.1.1-4) unstable; urgency=medium * Update POM to reflect 0.1.1 version (instead of 0.1.0). diff -Nru scout-clojure-0.1.1/debian/control scout-clojure-0.1.1/debian/control --- scout-clojure-0.1.1/debian/control 2017-10-14 20:59:09.000000000 +0000 +++ scout-clojure-0.1.1/debian/control 2018-02-28 03:54:36.000000000 +0000 @@ -2,24 +2,20 @@ Section: java Priority: optional Maintainer: Debian Clojure Maintainers -Uploaders: - Eugenio Cano-Manuel Mendoza , - Elana Hashman +Uploaders: Elana Hashman Build-Depends: debhelper (>= 10), maven-repo-helper (>= 1.7), default-jdk, - javahelper (>= 0.43), - clojure (>= 1.8), - libtext-markdown-perl | markdown -Standards-Version: 4.1.1 -Vcs-Git: https://anonscm.debian.org/git/pkg-clojure/scout.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-clojure/scout.git + javahelper (>= 0.43) +Standards-Version: 4.1.3 +Vcs-Git: https://salsa.debian.org/clojure-team/scout.git +Vcs-Browser: https://salsa.debian.org/clojure-team/scout Homepage: https://github.com/davidsantiago/scout Package: libscout-clojure Architecture: all -Depends: ${java:Depends}, ${misc:Depends} +Depends: ${java:Depends}, ${misc:Depends}, libclojure-java | libclojure1.8-java Recommends: ${java:Recommends} Description: Clojure library to parse strings Scout is a library for Clojure that provides a Scanner object which is diff -Nru scout-clojure-0.1.1/debian/footer.html scout-clojure-0.1.1/debian/footer.html --- scout-clojure-0.1.1/debian/footer.html 2017-10-14 20:54:18.000000000 +0000 +++ scout-clojure-0.1.1/debian/footer.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ - - diff -Nru scout-clojure-0.1.1/debian/header.html scout-clojure-0.1.1/debian/header.html --- scout-clojure-0.1.1/debian/header.html 2017-10-14 20:54:18.000000000 +0000 +++ scout-clojure-0.1.1/debian/header.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - - - -@TITLE@ - - diff -Nru scout-clojure-0.1.1/debian/libscout-clojure.doc-base scout-clojure-0.1.1/debian/libscout-clojure.doc-base --- scout-clojure-0.1.1/debian/libscout-clojure.doc-base 2017-10-14 20:54:18.000000000 +0000 +++ scout-clojure-0.1.1/debian/libscout-clojure.doc-base 2018-02-28 03:53:55.000000000 +0000 @@ -4,10 +4,6 @@ Abstract: An introduction to scout Section: Programming -Format: HTML -Index: /usr/share/doc/libscout-clojure/html/README.html -Files: /usr/share/doc/libscout-clojure/html/README.html - Format: Text Index: /usr/share/doc/libscout-clojure/README.md Files: /usr/share/doc/libscout-clojure/README.md diff -Nru scout-clojure-0.1.1/debian/libscout-clojure.docs scout-clojure-0.1.1/debian/libscout-clojure.docs --- scout-clojure-0.1.1/debian/libscout-clojure.docs 2017-10-14 20:54:18.000000000 +0000 +++ scout-clojure-0.1.1/debian/libscout-clojure.docs 2018-02-28 03:53:48.000000000 +0000 @@ -1,2 +1 @@ *.md -doc/* diff -Nru scout-clojure-0.1.1/debian/rules scout-clojure-0.1.1/debian/rules --- scout-clojure-0.1.1/debian/rules 2017-10-14 20:54:18.000000000 +0000 +++ scout-clojure-0.1.1/debian/rules 2018-02-28 03:53:28.000000000 +0000 @@ -4,7 +4,6 @@ export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/clojure.jar -MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md)) PRODUCED_JAR=scout.jar NAMESPACE=scout/scout MAVEN_META=META-INF/maven/$(NAMESPACE) @@ -13,9 +12,8 @@ %: dh $@ --with javahelper,jh_maven_repo_helper -override_jh_build: $(MDWN_DOCS) +override_jh_build: jar cf $(PRODUCED_JAR) -C src . - mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html mkdir -p $(CURDIR)/meta/$(MAVEN_META) mkdir -p $(CURDIR)/meta/$(LEIN_META) cp $(CURDIR)/project.clj $(CURDIR)/meta/$(LEIN_META) @@ -25,11 +23,4 @@ override_jh_clean: jh_clean rm -f $(CURDIR)/$(PRODUCED_JAR) - rm -rf $(CURDIR)/doc rm -rf $(CURDIR)/meta - -%.html:%.md - cat debian/header.html > $@ - sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' $@ - markdown $< >> $@ - cat debian/footer.html >> $@