Author: ebourg-guest Date: 2013-05-29 20:50:09 +0000 (Wed, 29 May 2013) New Revision: 16780
Added: trunk/tagsoup/debian/patches/0000-fix-tagsoup-version.patch Removed: trunk/tagsoup/debian/patches/001_fix-version.patch Modified: trunk/tagsoup/debian/changelog trunk/tagsoup/debian/compat trunk/tagsoup/debian/control trunk/tagsoup/debian/patches/series trunk/tagsoup/debian/rules Log: Merged with the changes made by Leo Iannacone <[email protected]> Modified: trunk/tagsoup/debian/changelog =================================================================== --- trunk/tagsoup/debian/changelog 2013-05-29 15:54:46 UTC (rev 16779) +++ trunk/tagsoup/debian/changelog 2013-05-29 20:50:09 UTC (rev 16780) @@ -1,22 +1,34 @@ -tagsoup (1.2.1-1) unstable; urgency=low +tagsoup (1.2.1-2) unstable; urgency=low * Adopting package - * New upstream release - - Added a patch to fix the version number * The Maven artifacts are now deployed to /usr/share/maven-repo * debian/control: - Updated Standards-Version to 3.9.4 - - libtagsoup-java-doc now depends on default-jdk-doc - instead of classpath-doc + - Updated the Vcs-* fields (tagsoup is back to trunk/) * debian/rules: - - Removed usage of simple-patchsys.mk - Added a clean target - Added a get-orig-pom target to fetch the pom from the central Maven repository - * Switched to source format 3.0 (quilt) -- Emmanuel Bourg <[email protected]> Wed, 29 May 2013 17:49:37 +0200 +tagsoup (1.2.1-1) unstable; urgency=low + + * QA upload + * New upstream release + * Switched to source format 3.0 (quilt) + * Bump Standards-Version to 3.9.2 + * debian/control: + - Build-depend removed cdbs + - Build-depend add javahelper + - Build-depend debhelper set version at >= 8~ + - libtagsoup-java-doc depens on default-jdk-doc instead of classpath-doc + - Updated Vcs-* since tagsoup is now orphaned and has moved to old/ + * debian/rules refreshed, now uses javahelper + * debian patch 0000-fix-tagsoup-version.patch to avoid FTBFS + + -- Leo Iannacone <[email protected]> Thu, 15 Dec 2011 16:04:39 +0100 + tagsoup (1.2-3) unstable; urgency=low * QA upload. Modified: trunk/tagsoup/debian/compat =================================================================== --- trunk/tagsoup/debian/compat 2013-05-29 15:54:46 UTC (rev 16779) +++ trunk/tagsoup/debian/compat 2013-05-29 20:50:09 UTC (rev 16780) @@ -1 +1 @@ -7 +8 Modified: trunk/tagsoup/debian/control =================================================================== --- trunk/tagsoup/debian/control 2013-05-29 15:54:46 UTC (rev 16779) +++ trunk/tagsoup/debian/control 2013-05-29 20:50:09 UTC (rev 16780) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> -Build-Depends: ant, debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, maven-repo-helper +Build-Depends: ant, debhelper (>= 8~), javahelper, default-jdk, maven-repo-helper Build-Depends-Indep: ant-optional, libxalan2-java Standards-Version: 3.9.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tagsoup Added: trunk/tagsoup/debian/patches/0000-fix-tagsoup-version.patch =================================================================== --- trunk/tagsoup/debian/patches/0000-fix-tagsoup-version.patch (rev 0) +++ trunk/tagsoup/debian/patches/0000-fix-tagsoup-version.patch 2013-05-29 20:50:09 UTC (rev 16780) @@ -0,0 +1,13 @@ +Description: Fix corret version of tagsoup to avoid FTBFS + Upstream seems had forgotten to update version releasing 1.2.1 +Forwarded: not-needed +Author: Leo Iannacone <[email protected]> +--- + etc/build/build.properties | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- tagsoup-1.2.1.orig/etc/build/build.properties ++++ tagsoup-1.2.1/etc/build/build.properties +@@ -1 +1 @@ +-tagsoup.version = 1.2 ++tagsoup.version = 1.2.1 Deleted: trunk/tagsoup/debian/patches/001_fix-version.patch =================================================================== --- trunk/tagsoup/debian/patches/001_fix-version.patch 2013-05-29 15:54:46 UTC (rev 16779) +++ trunk/tagsoup/debian/patches/001_fix-version.patch 2013-05-29 20:50:09 UTC (rev 16780) @@ -1,6 +0,0 @@ -Description: Fix the version number ---- a/etc/build/build.properties -+++ b/etc/build/build.properties -@@ -1 +1 @@ --tagsoup.version = 1.2 -+tagsoup.version = 1.2.1 Modified: trunk/tagsoup/debian/patches/series =================================================================== --- trunk/tagsoup/debian/patches/series 2013-05-29 15:54:46 UTC (rev 16779) +++ trunk/tagsoup/debian/patches/series 2013-05-29 20:50:09 UTC (rev 16780) @@ -1 +1 @@ -001_fix-version.patch +0000-fix-tagsoup-version.patch Modified: trunk/tagsoup/debian/rules =================================================================== --- trunk/tagsoup/debian/rules 2013-05-29 15:54:46 UTC (rev 16779) +++ trunk/tagsoup/debian/rules 2013-05-29 20:50:09 UTC (rev 16780) @@ -1,19 +1,29 @@ #!/usr/bin/make -f # debian/rules for tagsoup -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') +VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-) -PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-) +export JAVA_HOME=/usr/lib/jvm/default-java +export CLASSPATH=/usr/share/java/xalan2.jar -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ --with javahelper -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 -DEB_ANT_BUILD_TARGET := dist docs-api -API_DOCS := tagsoup-$(VERSION)/doc/api +override_dh_auto_build: + dh_auto_build -- dist docs-api +override_dh_link: + dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar +override_dh_install: + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml dist/lib/$(PACKAGE)-$(VERSION).jar + dh_install -plib$(PACKAGE)-java-doc docs/api usr/share/doc/lib$(PACKAGE)-java + +override_dh_installchangelogs: + dh_installchangelogs CHANGES + get-orig-source: mkdir orig_tmp cd orig_tmp && \ @@ -26,15 +36,5 @@ get-orig-pom: wget -O debian/pom.xml http://repo1.maven.org/maven2/org/ccil/cowan/tagsoup/tagsoup/$(VERSION)/tagsoup-$(VERSION).pom - -binary-post-install/lib$(PACKAGE)-java:: - dh_installchangelogs CHANGES - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml dist/lib/$(PACKAGE)-$(VERSION).jar - - -binary-post-install/lib$(PACKAGE)-java-doc:: - dh_install -plib$(PACKAGE)-java-doc docs/api usr/share/doc/lib$(PACKAGE)-java - clean:: mh_clean _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
