diff -Nru doxia-sitetools-1.1.4/debian/changelog doxia-sitetools-1.1.4/debian/changelog --- doxia-sitetools-1.1.4/debian/changelog 2011-11-24 16:16:46.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/changelog 2016-06-22 08:34:27.000000000 +0000 @@ -1,14 +1,14 @@ -doxia-sitetools (1.1.4-1ubuntu1) precise; urgency=low +doxia-sitetools (1.1.4-1.1) unstable; urgency=medium - * debian/control: - - re-add fop to Build-Depends. - - add libjaxen-java to Build-Depends. - - add libmaven-install-plugin-java to Build-Depends. - * debian/maven.properties: ensure maven runs offline. - * debian/rules: install just-built jar files back into the local maven repo - for the build (they are required for building the docs). + * Non-maintainer upload. + * Build with the DH sequencer instead of CDBS + * Removed the build dependency on libclirr-maven-plugin-java + * Moved the package to Git + * Removed Michael Koch from the uploaders (Closes: #654014) + * Standards-Version updated to 3.9.8 + * Switch to debhelper level 9 - -- Mathieu Trudel-Lapierre Thu, 24 Nov 2011 10:52:45 -0500 + -- Emmanuel Bourg Wed, 22 Jun 2016 10:34:25 +0200 doxia-sitetools (1.1.4-1) unstable; urgency=low diff -Nru doxia-sitetools-1.1.4/debian/compat doxia-sitetools-1.1.4/debian/compat --- doxia-sitetools-1.1.4/debian/compat 2011-11-23 21:37:27.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/compat 2016-06-22 08:00:30.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru doxia-sitetools-1.1.4/debian/control doxia-sitetools-1.1.4/debian/control --- doxia-sitetools-1.1.4/debian/control 2011-11-24 16:14:43.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/control 2016-06-22 08:34:13.000000000 +0000 @@ -1,25 +1,37 @@ Source: doxia-sitetools Section: java Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Java Maintainers +Maintainer: Debian Java Maintainers Uploaders: Torsten Werner , - Ludovic Claude , Michael Koch -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libclirr-maven-plugin-java, libmodello-maven-plugin-java, libplexus-maven-plugin-java, - libcommons-collections3-java, libdoxia-java, libitext1-java, libjaxp1.3-java, - libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java, libxalan2-java, - junit (>= 3.8.2), libdoxia-java, default-jdk-doc, libdoxia-java-doc, libplexus-containers-java-doc, - libplexus-utils-java-doc, libxalan2-java-doc, libmaven-javadoc-plugin-java, - fop, libjaxen-java, libmaven-install-plugin-java -Standards-Version: 3.9.2 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-sitetools/ + Ludovic Claude +Build-Depends: debhelper (>= 9), + default-jdk, + maven-debian-helper (>= 1.4) +Build-Depends-Indep: default-jdk-doc, + junit (>= 3.8.2), + libcommons-collections3-java, + libdoxia-java, + libdoxia-java-doc, + libitext1-java, + libjaxp1.3-java, + libmaven-javadoc-plugin-java, + libmodello-maven-plugin-java, + libplexus-containers-java, + libplexus-containers-java-doc, + libplexus-i18n-java, + libplexus-maven-plugin-java, + libplexus-utils-java, + libplexus-utils-java-doc, + libxalan2-java, + libxalan2-java-doc +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/doxia-sitetools.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/doxia-sitetools.git Homepage: http://maven.apache.org/doxia/doxia-sitetools/ Package: libdoxia-sitetools-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} +Depends: ${maven:Depends}, ${misc:Depends} Recommends: ${maven:OptionalDepends} Suggests: libdoxia-sitetools-java-doc Conflicts: libdoxia-java (<= 1.0-alpha-7-1) @@ -29,18 +41,18 @@ provide its users with powerful techniques for generating static and dynamic content. . - Doxia can be used to generate static sites in addition to being - incorporated into dynamic content generation systems like blogs, wikis - and content management systems. + Doxia can be used to generate static sites in addition to being + incorporated into dynamic content generation systems like blogs, wikis + and content management systems. . - Doxia is used exensively by Maven and it powers the entire - documentation system of Maven. It gives Maven the ability to take any + Doxia is used exensively by Maven and it powers the entire + documentation system of Maven. It gives Maven the ability to take any document that Doxia supports and output it any format. Package: libdoxia-sitetools-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${maven:DocDepends} +Depends: ${maven:DocDepends}, ${misc:Depends} Recommends: ${maven:DocOptionalDepends} Suggests: libdoxia-sitetools-java Description: Documentation for Doxia Sitetools @@ -49,12 +61,12 @@ provide its users with powerful techniques for generating static and dynamic content. . - Doxia can be used to generate static sites in addition to being - incorporated into dynamic content generation systems like blogs, wikis - and content management systems. + Doxia can be used to generate static sites in addition to being + incorporated into dynamic content generation systems like blogs, wikis + and content management systems. . - Doxia is used exensively by Maven and it powers the entire - documentation system of Maven. It gives Maven the ability to take any + Doxia is used exensively by Maven and it powers the entire + documentation system of Maven. It gives Maven the ability to take any document that Doxia supports and output it any format. . This package contains the API documentation of libdoxia-sitetools-java. diff -Nru doxia-sitetools-1.1.4/debian/libdoxia-sitetools-java-doc.install doxia-sitetools-1.1.4/debian/libdoxia-sitetools-java-doc.install --- doxia-sitetools-1.1.4/debian/libdoxia-sitetools-java-doc.install 2011-11-23 21:37:27.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/libdoxia-sitetools-java-doc.install 2016-06-22 07:58:40.000000000 +0000 @@ -1,2 +1 @@ target/site/apidocs/* usr/share/doc/libdoxia-sitetools-java/api - diff -Nru doxia-sitetools-1.1.4/debian/maven.ignoreRules doxia-sitetools-1.1.4/debian/maven.ignoreRules --- doxia-sitetools-1.1.4/debian/maven.ignoreRules 2011-11-23 21:37:27.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/maven.ignoreRules 2016-06-22 08:08:54.000000000 +0000 @@ -17,3 +17,4 @@ htmlunit htmlunit * * * * org.apache.maven.doxia doxia-core * * * * org.apache.maven.plugins maven-project-info-reports-plugin * * * * +org.codehaus.mojo clirr-maven-plugin * * * * diff -Nru doxia-sitetools-1.1.4/debian/maven.properties doxia-sitetools-1.1.4/debian/maven.properties --- doxia-sitetools-1.1.4/debian/maven.properties 2011-11-24 15:52:39.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/maven.properties 2016-06-22 07:49:59.000000000 +0000 @@ -2,4 +2,3 @@ # For example: maven.test.skip=true -maven.settings.offline=true diff -Nru doxia-sitetools-1.1.4/debian/rules doxia-sitetools-1.1.4/debian/rules --- doxia-sitetools-1.1.4/debian/rules 2011-11-24 16:10:14.000000000 +0000 +++ doxia-sitetools-1.1.4/debian/rules 2016-06-22 08:02:20.000000000 +0000 @@ -1,34 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate +%: + dh $@ --buildsystem=maven get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -IMPORT_BINARY_JARS = \ - for jar in `find $(CURDIR)/doxia-* -name "*.jar" -print`; \ - do \ - artifact=$$(basename $$(dirname $$(echo $$jar | sed "s/\/target//"))); \ - if ! test -d $(CURDIR)/debian/maven-repo/org/apache/maven/doxia/$$artifact/$(DEB_UPSTREAM_VERSION); \ - then \ - echo "Copying just-built binary jar for $$artifact into local maven repository."; \ - mvn install:install-file \ - -DgroupId=org.apache.maven.doxia \ - -DartifactId=$$artifact \ - -Dversion=$(DEB_UPSTREAM_VERSION) \ - -Dmaven.repo.local=$(CURDIR)/debian/maven-repo \ - -Dpackaging=jar -Dfile=$$jar; \ - else \ - echo "We already have the latest version JAR file for $$artifact in the local maven repo."; \ - fi; \ - done - -binary-jars: - $(call IMPORT_BINARY_JARS) - touch $@ - -after-mvn-build:: binary-jars + uscan --download-current-version --force-download --rename