Author: moeller Date: 2010-02-01 16:38:20 +0000 (Mon, 01 Feb 2010) New Revision: 11482
Added: trunk/libjibx-java/branch-1.1/ trunk/libjibx-java/branch-1.1/debian/README.Debian trunk/libjibx-java/branch-1.1/debian/README.source trunk/libjibx-java/branch-1.1/debian/changelog trunk/libjibx-java/branch-1.1/debian/control trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links trunk/libjibx-java/branch-1.1/debian/orig-tar.sh trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch trunk/libjibx-java/branch-1.1/debian/patches/series trunk/libjibx-java/branch-1.1/debian/rules Removed: trunk/libjibx-java/branch-1.1/debian/changelog trunk/libjibx-java/branch-1.1/debian/control trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.doc-base trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.docs trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.install trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.links trunk/libjibx-java/branch-1.1/debian/orig-tar.sh trunk/libjibx-java/branch-1.1/debian/rules Modified: trunk/libjibx-java/branch-1.0/debian/control trunk/libjibx-java/branch-1.1/debian/watch trunk/libjibx-java/branch-1.2/debian/rules Log: Seed for branch-1.1 Modified: trunk/libjibx-java/branch-1.0/debian/control =================================================================== --- trunk/libjibx-java/branch-1.0/debian/control 2010-02-01 02:36:11 UTC (rev 11481) +++ trunk/libjibx-java/branch-1.0/debian/control 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,4 +1,4 @@ -Source: libjibx-java +Source: libjibx1.0-java Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> @@ -6,11 +6,13 @@ Build-Depends-Indep: gjdoc, openjdk-6-jdk, ant, antlr, libbcel-java, libxpp3-java Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8) Homepage: http://jibx.sf.net/ -Standards-Version: 3.8.0.0 +Vcs-svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjibx-java/branch-1.0 +Vcs-browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjibx-java/branch-1.0 +Standards-Version: 3.8.4 -Package: libjibx-java +Package: libjibx1.0-java Architecture: all -Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre | java2-runtime, libbcel-java, libxpp3-java, ${misc:Depends} +Depends: openjdk-6-jre | java2-runtime, libbcel-java, libxpp3-java, ${misc:Depends} Suggests: java-virtual-machine, libjibx-java-doc Description: Framework for binding XML data to Java objects JiBX lets you work with data from XML documents using your own class @@ -20,7 +22,19 @@ with very high efficiency, but still allows you a high degree of control over the translation process. -Package: libjibx-java-doc +Package: libjibx-java +Architecture: all +Depends: libjibx1.0-java +Description: Framework for binding XML data to Java objects + JiBX lets you work with data from XML documents using your own class + structures. The JiBX framework handles all the details of converting + your data to and from XML based on your instructions. JiBX is designed + to perform the translation between internal data structures and XML + with very high efficiency, but still allows you a high degree of + control over the translation process. + + +Package: libjibx1.0-java-doc Section: doc Architecture: all Depends: ${misc:Depends} Copied: trunk/libjibx-java/branch-1.1/debian/README.Debian (from rev 11481, trunk/libjibx-java/branch-1.2/debian/README.Debian) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/README.Debian (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/README.Debian 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,7 @@ +The package provides "versioned" packages with the real .jar files +and an unversioned package that supplies merely a symbolic link to +the .jar. This way, later versions will replace earlier packages and +allow reverse-dependent projects to remain their functionality. + +Versions 1.0.2, 1.1.6 and 1.2.1 of jibx are sadly not upwards +compatible. Copied: trunk/libjibx-java/branch-1.1/debian/README.source (from rev 11481, trunk/libjibx-java/branch-1.2/debian/README.source) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/README.source (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/README.source 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,3 @@ +Two patches, both to build/build.xml + * instruct the inclusion of bcel to the classpath + * add a "clean" target to build/build.xml (not ultimately required) Deleted: trunk/libjibx-java/branch-1.1/debian/changelog =================================================================== --- trunk/libjibx-java/branch-1.2/debian/changelog 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/changelog 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,62 +0,0 @@ -libjibx-java (1.2.1-1) UNRELEASED; urgency=low - - [ Eric Lavarde ] - * Remove dependency on gjdoc. - * Enhance clean target to really cleanup back to original. - * Move to debhelper compat 7. - * Add copyright clarifications based on feedback from ftpmaster. - - [ Michael Koch ] - * New upstream release (Closes: #526611). - * Reworked debian/rules and removed debian/install and - debian/links. - * Build-Depends on liblog4j1.2-java. - * Moved package to section 'java'. - * Moved ant and openjdk-6-jdk to Build-Depends. - * Make package Depends on default-jre-headless | java2-runtime-headless. - * Updated Standards-Version to 3.8.3. - - -- Michael Koch <[email protected]> Sun, 27 Sep 2009 12:32:59 +0200 - -libjibx-java (1.0.2-1) unstable; urgency=low - - * New upstream version. - * debian/control: - + Build-Depend on openjdk-6-jdk instead of sun-java6-jdk. - + Depend on openjdk-6-jre instead of sun-java6-jre. - + Thanks to the above, move to main! - + Add Homepage field. - + Add firefox as alternative to iceweasel (for potential Ubuntu - integration). - + Updated Standards-Version to 3.8.0 - * debian/rules: - + Set JAVA_HOME_DIRS to the correct value for openjdk-6-jdk. - * debian/copyright: - + slighthly modify to make lintian happy. - - -- Eric Lavarde <[email protected]> Sat, 21 Feb 2009 09:13:28 +0100 - -libjibx-java (1.0.1-2) unstable; urgency=low - - [ Michael Bienia ] - * debian/control: - + Build-Depend on sun-java6-jdk instead of ibm-j2sdk1.6 | sun-j2sdk1.4. - + Depend on sun-java6-jre instead of sun-j2re1.4. - + Recommend iceweasel instead of mozilla. - * debian/rules: - + Set JAVA_HOME_DIRS to the correct value for sun-java6-jdk. - - [ Michael Koch ] - * Fixed clean target to make it possible to build the package two times in a - row. - * Moved debhelper and cdbs to Build-Depends. - * Updated Standards-Version to 3.7.3. - * Added myself to Uploaders. - - -- Michael Koch <[email protected]> Fri, 25 Jan 2008 23:30:33 +0100 - -libjibx-java (1.0.1-1) unstable; urgency=low - - * Initial Release (closes: Bug#354374). - - -- Eric Lavarde <[email protected]> Sat, 4 Mar 2006 15:20:17 +0200 Copied: trunk/libjibx-java/branch-1.1/debian/changelog (from rev 11481, trunk/libjibx-java/branch-1.2/debian/changelog) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/changelog (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/changelog 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,73 @@ +libjibx1.1-java (1.1.6a-1) unstable; urgency=low + + * Adapting concept for versioned binaries for version 1.1.6a. + + -- Steffen Moeller <[email protected]> Mon, 01 Feb 2010 03:54:46 +0100 + +libjibx1.1-java (1.2.1-1) unstable; urgency=low + + [ Eric Lavarde ] + * Remove dependency on gjdoc. + * Enhance clean target to really cleanup back to original. + * Move to debhelper compat 7. + * Add copyright clarifications based on feedback from ftpmaster. + + [ Michael Koch ] + * New upstream release (Closes: #526611). + * Reworked debian/rules and removed debian/install and + debian/links. + * Build-Depends on liblog4j1.2-java. + * Moved package to section 'java'. + * Moved ant and openjdk-6-jdk to Build-Depends. + * Make package Depends on default-jre-headless | java2-runtime-headless. + * Updated Standards-Version to 3.8.3. + + [ Steffen Moeller ] + * Introduced version-specific packages + * Updated Standards-Version to 3.8.4. + * added "clean" target to build.xml + + -- Michael Koch <[email protected]> Sun, 27 Sep 2009 12:32:59 +0200 + +libjibx-java (1.0.2-1) unstable; urgency=low + + * New upstream version. + * debian/control: + + Build-Depend on openjdk-6-jdk instead of sun-java6-jdk. + + Depend on openjdk-6-jre instead of sun-java6-jre. + + Thanks to the above, move to main! + + Add Homepage field. + + Add firefox as alternative to iceweasel (for potential Ubuntu + integration). + + Updated Standards-Version to 3.8.0 + * debian/rules: + + Set JAVA_HOME_DIRS to the correct value for openjdk-6-jdk. + * debian/copyright: + + slighthly modify to make lintian happy. + + -- Eric Lavarde <[email protected]> Sat, 21 Feb 2009 09:13:28 +0100 + +libjibx-java (1.0.1-2) unstable; urgency=low + + [ Michael Bienia ] + * debian/control: + + Build-Depend on sun-java6-jdk instead of ibm-j2sdk1.6 | sun-j2sdk1.4. + + Depend on sun-java6-jre instead of sun-j2re1.4. + + Recommend iceweasel instead of mozilla. + * debian/rules: + + Set JAVA_HOME_DIRS to the correct value for sun-java6-jdk. + + [ Michael Koch ] + * Fixed clean target to make it possible to build the package two times in a + row. + * Moved debhelper and cdbs to Build-Depends. + * Updated Standards-Version to 3.7.3. + * Added myself to Uploaders. + + -- Michael Koch <[email protected]> Fri, 25 Jan 2008 23:30:33 +0100 + +libjibx-java (1.0.1-1) unstable; urgency=low + + * Initial Release (closes: Bug#354374). + + -- Eric Lavarde <[email protected]> Sat, 4 Mar 2006 15:20:17 +0200 Deleted: trunk/libjibx-java/branch-1.1/debian/control =================================================================== --- trunk/libjibx-java/branch-1.2/debian/control 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/control 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,30 +0,0 @@ -Source: libjibx-java -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Eric Lavarde <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant -Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java -Standards-Version: 3.8.3 -Homepage: http://jibx.sf.net/ - -Package: libjibx-java -Architecture: all -Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends} -Suggests: java-virtual-machine, libjibx-java-doc -Description: Framework for binding XML data to Java objects - JiBX lets you work with data from XML documents using your own class - structures. The JiBX framework handles all the details of converting - your data to and from XML based on your instructions. JiBX is designed - to perform the translation between internal data structures and XML - with very high efficiency, but still allows you a high degree of - control over the translation process. - -Package: libjibx-java-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Recommends: iceweasel | firefox | www-browser -Suggests: libjibx-java -Description: Documentation for libjibx-java - This package contains documentation, javadocs and tutorial code for JiBX. Copied: trunk/libjibx-java/branch-1.1/debian/control (from rev 11481, trunk/libjibx-java/branch-1.2/debian/control) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/control (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/control 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,47 @@ +Source: libjibx1.1-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Eric Lavarde <[email protected]>, Michael Koch <[email protected]> +Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt +Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java +Standards-Version: 3.8.4 +Homepage: http://jibx.sf.net/ +Vcs-svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjibx-java/branch-1.1/ +Vcs-browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjibx-java/branch-1.1/ + +Package: libjibx1.1-java +Architecture: all +Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends} +Suggests: java-virtual-machine, libjibx-java-doc +Conflicts: libjibx-java (<= 1.0.2-1) +Description: Framework for binding XML data to Java objects + JiBX lets you work with data from XML documents using your own class + structures. The JiBX framework handles all the details of converting + your data to and from XML based on your instructions. JiBX is designed + to perform the translation between internal data structures and XML + with very high efficiency, but still allows you a high degree of + control over the translation process. + +Package: libjibx-java +Architecture: all +Depends: libjibx1.1-java +Description: Framework for binding XML data to Java objects + JiBX lets you work with data from XML documents using your own class + structures. The JiBX framework handles all the details of converting + your data to and from XML based on your instructions. JiBX is designed + to perform the translation between internal data structures and XML + with very high efficiency, but still allows you a high degree of + control over the translation process. + . + This package provides the jibx.jar file as a symbolic link to the + versioned jar. + +Package: libjibx1.1-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Recommends: iceweasel | firefox | www-browser +Suggests: libjibx-java +Description: Documentation for libjibx-java + This package contains documentation, javadocs and tutorial code for JiBX. Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.doc-base =================================================================== --- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.doc-base 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.doc-base 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,10 +0,0 @@ -Document: libjibx-java-doc -Title: Programmer API for libjibx-java -Author: Dennis Sosnoski <dsosnoski at users.sourceforge.net> -Abstract: The programmer API of JiBX, a framework for - binding XML data to Java objects. -Section: Programming/Java - -Format: HTML -Index: /usr/share/doc/libjibx-java-doc/api/index.html -Files: /usr/share/doc/libjibx-java-doc/api/* Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.docs =================================================================== --- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.docs 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.docs 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,2 +0,0 @@ -readme.html -tutorial/ Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.install =================================================================== --- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.install 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.install 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,2 +0,0 @@ -docs/* usr/share/doc/libjibx-java-doc -build/api usr/share/doc/libjibx-java-doc Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.links =================================================================== --- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.links 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/libjibx-java-doc.links 2010-02-01 16:38:20 UTC (rev 11482) @@ -1 +0,0 @@ -usr/share/doc/libjibx-java-doc/api usr/share/doc/libjibx-java/api Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base (from rev 11481, trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.doc-base) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,10 @@ +Document: libjibx1.2-java-doc +Title: Programmer API for libjibx-java version 1.2.x +Author: Dennis Sosnoski <dsosnoski at users.sourceforge.net> +Abstract: The programmer API of JiBX, a framework for + binding XML data to Java objects. +Section: Programming/Java + +Format: HTML +Index: /usr/share/doc/libjibx1.2-java-doc/api/index.html +Files: /usr/share/doc/libjibx1.2-java-doc/api/* Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs (from rev 11481, trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.docs) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,2 @@ +readme.html +tutorial/ Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install (from rev 11481, trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.install) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,2 @@ +docs/* usr/share/doc/libjibx1.2-java-doc +build/api usr/share/doc/libjibx1.2-java-doc Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links (from rev 11481, trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.links) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1 @@ +usr/share/doc/libjibx1.2-java-doc/api usr/share/doc/libjibx1.2-java/api Deleted: trunk/libjibx-java/branch-1.1/debian/orig-tar.sh =================================================================== --- trunk/libjibx-java/branch-1.2/debian/orig-tar.sh 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/orig-tar.sh 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,20 +0,0 @@ -#!/bin/sh -e - -# called by uscan with '--upstream-version' <version> <file> -DIR=libjibx-java_$2.orig -TAR=../libjibx-java_$2.orig.tar.gz - -# clean up the upstream tarball -unzip $3 -mv jibx $DIR -GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR -rm -rf $DIR - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $3 $origDir - echo "moved $3 to $origDir" -fi - -exit 0 Copied: trunk/libjibx-java/branch-1.1/debian/orig-tar.sh (from rev 11481, trunk/libjibx-java/branch-1.2/debian/orig-tar.sh) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/orig-tar.sh (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/orig-tar.sh 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,23 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +echo $* +DIR=libjibx-java-$2 +TAR=../libjibx-java_$2.orig.tar.gz + +# clean up the upstream tarball +unzip $3 +mv jibx $DIR +GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + if [ ".." != "$origDir" ]; then + mv $3 $origDir + echo "moved $3 to $origDir" + fi +fi + +exit 0 Copied: trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch (from rev 11481, trunk/libjibx-java/branch-1.2/debian/patches/build_xml_clean_target.patch) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,14 @@ +--- build/build.xml.orig 2010-02-01 02:19:07.000000000 +0100 ++++ build/build.xml 2010-02-01 02:22:51.000000000 +0100 +@@ -66,6 +66,11 @@ + <available property="dom4j" file="${lib}/dom4j.jar"/> + <available property="jdom" file="${lib}/jdom.jar"/> + ++ <!-- Clean Added to help debian/rules --> ++ <target name="clean"> ++ <delete quiet="true" dir="classes"/> ++ </target> ++ + <!-- Set options for release build --> + <target name="setrelease"> + <property name="optimize" value="on"/> Copied: trunk/libjibx-java/branch-1.1/debian/patches/series (from rev 11481, trunk/libjibx-java/branch-1.2/debian/patches/series) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/patches/series (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/patches/series 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,2 @@ +build_xml_clean_target.patch -p0 +01_build_xml.patch -p0 Deleted: trunk/libjibx-java/branch-1.1/debian/rules =================================================================== --- trunk/libjibx-java/branch-1.2/debian/rules 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/rules 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,26 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk - -DEB_COMPRESS_EXCLUDE := .class -JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3 -DEB_ANT_BUILD_TARGET := setrelease current devdoc -DEB_ANT_ARGS := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION) -DEB_BUILDDIR := build -DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt - -clean:: - -rm -fr build/api build/classes lib/* - -install/libjibx-java:: - dh_install -plibjibx-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_install -plibjibx-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_install -plibjibx-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_install -plibjibx-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar - dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar - dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar - dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema.jar Copied: trunk/libjibx-java/branch-1.1/debian/rules (from rev 11481, trunk/libjibx-java/branch-1.2/debian/rules) =================================================================== --- trunk/libjibx-java/branch-1.1/debian/rules (rev 0) +++ trunk/libjibx-java/branch-1.1/debian/rules 2010-02-01 16:38:20 UTC (rev 11482) @@ -0,0 +1,41 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk +#include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_COMPRESS_EXCLUDE := .class +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3 +DEB_ANT_BUILD_TARGET := setrelease current devdoc +DEB_ANT_ARGS := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION) +DEB_BUILDDIR := build +DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt + +DEB_UPSTREAM_VERSION_2 := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. ) + +clean:: + -rm -fr build/api build/classes lib/* + +install/libjibx1.1-java:: + dh_install -plibjibx1.1-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx1.1-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx1.1-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx1.1-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java + if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION_2).jar ; \ + fi + +install/libjibx-java:: + dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar + dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar + dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar + dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema.jar Modified: trunk/libjibx-java/branch-1.1/debian/watch =================================================================== --- trunk/libjibx-java/branch-1.2/debian/watch 2010-01-30 00:34:14 UTC (rev 11446) +++ trunk/libjibx-java/branch-1.1/debian/watch 2010-02-01 16:38:20 UTC (rev 11482) @@ -1,3 +1,3 @@ version=3 opts=uversionmangle=s/_/./g \ - http://sf.net/jibx/jibx_([[:digit:]_]+).zip debian debian/orig-tar.sh + http://sf.net/jibx/jibx_(1_1_[a-z0-9_]+)\.zip debian debian/orig-tar.sh Modified: trunk/libjibx-java/branch-1.2/debian/rules =================================================================== --- trunk/libjibx-java/branch-1.2/debian/rules 2010-02-01 02:36:11 UTC (rev 11481) +++ trunk/libjibx-java/branch-1.2/debian/rules 2010-02-01 16:38:20 UTC (rev 11482) @@ -24,10 +24,14 @@ dh_install -plibjibx1.2-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java dh_install -plibjibx1.2-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \ - dh_link -plibjibx1.2-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \ - dh_link -plibjibx1.2-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \ - dh_link -plibjibx1.2-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \ - dh_link -plibjibx1.2-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION_2).jar ; \ fi install/libjibx-java:: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
