Author: apo Date: 2016-12-29 13:58:14 +0000 (Thu, 29 Dec 2016) New Revision: 19190
Modified: trunk/libhamcrest-java/debian/changelog trunk/libhamcrest-java/debian/compat trunk/libhamcrest-java/debian/control trunk/libhamcrest-java/debian/copyright trunk/libhamcrest-java/debian/rules trunk/libhamcrest-java/debian/watch Log: Preliminary work on #846116 Modified: trunk/libhamcrest-java/debian/changelog =================================================================== --- trunk/libhamcrest-java/debian/changelog 2016-12-18 05:26:42 UTC (rev 19189) +++ trunk/libhamcrest-java/debian/changelog 2016-12-29 13:58:14 UTC (rev 19190) @@ -1,3 +1,16 @@ +libhamcrest-java (1.3-6) UNRELEASED; urgency=medium + + * Team upload. + * wrap-and-sort -sa. + * Switch from cdbs to dh sequencer. + * Use only Build-Depends field. + * Declare compliance with Debian Policy 3.9.8. + * Vcs-Browser: Use https. + * Switch to compat level 10. + * Fix debian/watch file and use the new github.com address from now on. + + -- Markus Koschany <[email protected]> Thu, 29 Dec 2016 00:32:40 +0100 + libhamcrest-java (1.3-5) unstable; urgency=medium * Fixed a random build failure (Closes: #738789) Modified: trunk/libhamcrest-java/debian/compat =================================================================== --- trunk/libhamcrest-java/debian/compat 2016-12-18 05:26:42 UTC (rev 19189) +++ trunk/libhamcrest-java/debian/compat 2016-12-29 13:58:14 UTC (rev 19190) @@ -1 +1 @@ -9 +10 Modified: trunk/libhamcrest-java/debian/control =================================================================== --- trunk/libhamcrest-java/debian/control 2016-12-18 05:26:42 UTC (rev 19189) +++ trunk/libhamcrest-java/debian/control 2016-12-29 13:58:14 UTC (rev 19190) @@ -2,21 +2,35 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Varun Hiremath <[email protected]>, +Uploaders: + Varun Hiremath <[email protected]>, Damien Raude-Morvan <[email protected]>, Brian Thomason <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: cdbs, debhelper (>= 9), ant, ant-optional, default-jdk, maven-repo-helper -Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java, libjarjar-java, - default-jdk-doc, junit-doc, junit4-doc, junit, junit4 -Standards-Version: 3.9.5 +Build-Depends: + ant, + ant-optional, + debhelper (>= 10), + default-jdk, + maven-repo-helper, + default-jdk-doc, + junit, + junit-doc, + junit4, + junit4-doc, + libeasymock-java, + libjarjar-java, + libjmock-java, + libqdox-java +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libhamcrest-java -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libhamcrest-java +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libhamcrest-java Homepage: http://hamcrest.org Package: libhamcrest-java Architecture: all -Depends: ${misc:Depends} +Depends: + ${misc:Depends} Description: library of matchers for building test expressions Provides a library of matcher objects (also known as constraints or predicates) allowing 'match' rules to be defined declaratively, to be @@ -26,9 +40,14 @@ Package: libhamcrest-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} -Recommends: default-jdk-doc, junit-doc, junit4-doc -Suggests: libhamcrest-java +Depends: + ${misc:Depends} +Recommends: + default-jdk-doc, + junit-doc, + junit4-doc +Suggests: + libhamcrest-java Description: library of matchers for building test expressions - documentation Provides a library of matcher objects (also known as constraints or predicates) allowing 'match' rules to be defined declaratively, to be @@ -36,4 +55,3 @@ frameworks, mocking libraries and UI validation rules. . This package contains Javadoc API documentation of Hamcrest. - Modified: trunk/libhamcrest-java/debian/copyright =================================================================== --- trunk/libhamcrest-java/debian/copyright 2016-12-18 05:26:42 UTC (rev 19189) +++ trunk/libhamcrest-java/debian/copyright 2016-12-29 13:58:14 UTC (rev 19190) @@ -1,12 +1,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: http://code.google.com/p/hamcrest/ +Source: https://github.com/hamcrest/JavaHamcrest Files: * Copyright: 2000-2006, www.hamcrest.org License: BSD Copyright (c) The Regents of the University of California. All rights reserved. - . + . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Modified: trunk/libhamcrest-java/debian/rules =================================================================== --- trunk/libhamcrest-java/debian/rules 2016-12-18 05:26:42 UTC (rev 19189) +++ trunk/libhamcrest-java/debian/rules 2016-12-29 13:58:14 UTC (rev 19190) @@ -1,18 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk +export JAVA_HOME := /usr/lib/jvm/default-java +export CLASSPATH := /usr/share/java/easymock.jar:/usr/share/java/jmock.jar:/usr/share/java/qdox.jar:/usr/share/java/ant-junit.jar:/usr/share/java/junit4.jar +DEB_UPSTREAM_VERSION := 1.3 +DEB_ANT_BUILD_TARGET := bigjar unit-test javadoc +ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION) +POMS := core generator integration library all -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := build.xml -DEB_ANT_BUILD_TARGET := bigjar unit-test javadoc -DEB_JARS := easymock jmock qdox ant-junit -ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION) -POMS := core generator integration library all +%: + dh $@ --with maven-repo-helper -DEST_DIR = $(DEB_DESTDIR)/usr/share/java +override_dh_auto_build: + ant $(ANT_OPTS) $(DEB_ANT_BUILD_TARGET) -binary-post-install/libhamcrest-java:: +override_dh_install: # Add OSGi-metadata to the manifests. # This is needed for eclipse. for manifest in debian/manifest/*.mf ; do \ @@ -32,13 +33,19 @@ mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \ -plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \ done - dh_install -plibhamcrest-java build/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install + +override_dh_link: + dh_link dh_link -plibhamcrest-java usr/share/java/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java/hamcrest-unit-test.jar -clean:: +override_dh_auto_clean: + ant clean + +override_dh_clean: rm -fr debian/.mh/ - rm -f *.jar + $(RM) *.jar mkdir -p lib/integration get-orig-source: Modified: trunk/libhamcrest-java/debian/watch =================================================================== --- trunk/libhamcrest-java/debian/watch 2016-12-18 05:26:42 UTC (rev 19189) +++ trunk/libhamcrest-java/debian/watch 2016-12-29 13:58:14 UTC (rev 19190) @@ -1,3 +1,5 @@ -version=3 -opts="downloadurlmangle=s|.*(hamcrest-.*\.tgz).*|http://hamcrest.googlecode.com/files/$1|,filenamemangle=s/.*=(.*)/$1/" \ - http://code.google.com/p/hamcrest/downloads/list .*?name=hamcrest-([\d\.]+).tgz&.* debian debian/orig-tar.sh +version=4 +opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ +https://github.com/hamcrest/JavaHamcrest/tags \ +.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)hamcrest-java-(\d\S*)\.tar\.gz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
