Author: nthykier-guest Date: 2010-06-27 15:29:15 +0000 (Sun, 27 Jun 2010) New Revision: 12666
Modified: trunk/libhamcrest-java/debian/changelog trunk/libhamcrest-java/debian/control trunk/libhamcrest-java/debian/patches/001-build.patch trunk/libhamcrest-java/debian/rules Log: libhamcrest-java (1.1-8) UNRELEASED; urgency=low * Team upload. * Re-added OSGi-metadata to the jar files. * Removed depends on JRE; which is no longer needed per the Java Policy. * Removed some B-D-I that appeared twice. * Added missing description to a patch. * Fixed clean target - it forgot to remvoe some maven-helper files. -- Niels Thykier <[email protected]> Sun, 27 Jun 2010 17:21:27 +0200 Modified: trunk/libhamcrest-java/debian/changelog =================================================================== --- trunk/libhamcrest-java/debian/changelog 2010-06-26 22:35:12 UTC (rev 12665) +++ trunk/libhamcrest-java/debian/changelog 2010-06-27 15:29:15 UTC (rev 12666) @@ -1,3 +1,14 @@ +libhamcrest-java (1.1-8) UNRELEASED; urgency=low + + * Team upload. + * Re-added OSGi-metadata to the jar files. + * Removed depends on JRE; which is no longer needed per the Java Policy. + * Removed some B-D-I that appeared twice. + * Added missing description to a patch. + * Fixed clean target - it forgot to remvoe some maven-helper files. + + -- Niels Thykier <[email protected]> Sun, 27 Jun 2010 17:21:27 +0200 + libhamcrest-java (1.1-7) unstable; urgency=low * Update watch file Modified: trunk/libhamcrest-java/debian/control =================================================================== --- trunk/libhamcrest-java/debian/control 2010-06-26 22:35:12 UTC (rev 12665) +++ trunk/libhamcrest-java/debian/control 2010-06-27 15:29:15 UTC (rev 12666) @@ -6,8 +6,7 @@ Damien Raude-Morvan <[email protected]> Build-Depends: cdbs, debhelper (>= 7), ant, 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, libeasymock-java, - libjmock-java, testng + default-jdk-doc, junit-doc, junit4-doc, junit, junit4, testng Standards-Version: 3.8.4 Homepage: http://code.google.com/p/hamcrest/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhamcrest-java @@ -15,7 +14,7 @@ Package: libhamcrest-java Architecture: all -Depends: default-jre-headless | java5-runtime-headless, ${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 Modified: trunk/libhamcrest-java/debian/patches/001-build.patch =================================================================== --- trunk/libhamcrest-java/debian/patches/001-build.patch 2010-06-26 22:35:12 UTC (rev 12665) +++ trunk/libhamcrest-java/debian/patches/001-build.patch 2010-06-27 15:29:15 UTC (rev 12666) @@ -1,3 +1,7 @@ +Description: Fixes some classpaths and makes the javadoc link against system + installed javadocs. +Author: Ludovic Claude <[email protected]> + --- a/build.xml +++ b/build.xml @@ -26,17 +26,17 @@ Modified: trunk/libhamcrest-java/debian/rules =================================================================== --- trunk/libhamcrest-java/debian/rules 2010-06-26 22:35:12 UTC (rev 12665) +++ trunk/libhamcrest-java/debian/rules 2010-06-27 15:29:15 UTC (rev 12666) @@ -13,6 +13,12 @@ DEST_DIR = $(DEB_DESTDIR)/usr/share/java binary-post-install/libhamcrest-java:: + # Add OSGi-metadata to the manifests. + # This is needed for eclipse. + for manifest in debian/manifest/*.mf ; do \ + base=`basename $$manifest .mf` ; \ + jar umf $$manifest build/hamcrest-$$base-*.jar ; \ + done for pom in $(POMS); do \ pomfile=debian/poms/$$pom.xml; \ mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \ @@ -25,7 +31,7 @@ ln -s hamcrest-text-$(DEB_UPSTREAM_VERSION).jar $(DEST_DIR)/hamcrest-text.jar clean:: - -rm -rf debian/tmp + rm -fr debian/.mh/ get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --debug --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

