diff -Nru commons-beanutils-1.8.3/debian/ant.properties commons-beanutils-1.8.3/debian/ant.properties --- commons-beanutils-1.8.3/debian/ant.properties 2008-01-06 21:05:24.000000000 +0000 +++ commons-beanutils-1.8.3/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -maven.compile.source=1.3 -maven.compile.target=1.3 - -junit.jar=/usr/share/java/junit.jar -commons-logging.jar=/usr/share/java/commons-logging.jar -test.failonerror=false diff -Nru commons-beanutils-1.8.3/debian/changelog commons-beanutils-1.8.3/debian/changelog --- commons-beanutils-1.8.3/debian/changelog 2010-04-05 21:59:15.000000000 +0000 +++ commons-beanutils-1.8.3/debian/changelog 2011-09-22 21:36:32.000000000 +0000 @@ -1,3 +1,18 @@ +commons-beanutils (1.8.3-2) unstable; urgency=low + + * Team upload. + + [ Damien Raude-Morvan ] + * d/control: Drop Depends on any JRE as a Java library don't need to + depends on a runtime (Java Policy) + + [ Torsten Werner ] + * Update Standards-Version: 3.9.2. + * Use Maven to build a package. + * Change debian/watch to point to upstream's svn repo. + + -- Torsten Werner Thu, 22 Sep 2011 23:24:31 +0200 + commons-beanutils (1.8.3-1) unstable; urgency=low * New upstream release. diff -Nru commons-beanutils-1.8.3/debian/control commons-beanutils-1.8.3/debian/control --- commons-beanutils-1.8.3/debian/control 2010-04-05 21:59:15.000000000 +0000 +++ commons-beanutils-1.8.3/debian/control 2011-09-22 21:34:25.000000000 +0000 @@ -4,16 +4,18 @@ Maintainer: Debian Java Maintainers Uploaders: Michael Koch , Ludovic Claude , Damien Raude-Morvan -Build-Depends: debhelper (>= 7), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, ant, ant-optional, libcommons-collections3-java, libcommons-logging-java, junit -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java, + libcommons-logging-java, default-jdk-doc, libcommons-logging-java-doc +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-beanutils/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-beanutils/ Homepage: http://commons.apache.org/beanutils/ Package: libcommons-beanutils-java Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-collections3-java, libcommons-logging-java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} Suggests: libcommons-beanutils-java-doc Description: utility for manipulating JavaBeans The BeanUtils Component contains a set of Java classes that provide @@ -22,9 +24,10 @@ dynamic fashion. Package: libcommons-beanutils-java-doc -Section: doc Architecture: all -Depends: ${misc:Depends} +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} Suggests: libcommons-beanutils-java Description: Javadoc API for libcommons-beanutils-java The javadocs API for libcommons-beanutils-java which is utility for diff -Nru commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base --- commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base 2010-04-05 21:59:15.000000000 +0000 +++ commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Document: libcommons-beanutils-java-doc -Title: Programmer API for Beanutils -Author: Apache Beanutils developers -Abstract: Programmer API of the Beanutils library, a library providing - static utility methods useful in manipulating Java classes that conform - to the JavaBeans Specification naming patterns for bean properties in a - dynamic fashion. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcommons-beanutils-java/api/index.html -Files: /usr/share/doc/libcommons-beanutils-java/api/* diff -Nru commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base.api commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base.api --- commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base.api 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.doc-base.api 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,12 @@ +Document: libcommons-beanutils-java +Title: API Javadoc for Commons BeanUtils +Author: Commons BeanUtils developers +Abstract: Programmer API of the Beanutils library, a library providing + static utility methods useful in manipulating Java classes that conform + to the JavaBeans Specification naming patterns for bean properties in a + dynamic fashion. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-beanutils-java/api/index.html +Files: /usr/share/doc/libcommons-beanutils-java/api/* diff -Nru commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.install commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.install --- commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.install 2010-04-05 21:59:15.000000000 +0000 +++ commons-beanutils-1.8.3/debian/libcommons-beanutils-java-doc.install 2011-09-22 21:34:25.000000000 +0000 @@ -1 +1 @@ -dist/docs/api /usr/share/doc/libcommons-beanutils-java/ +target/apidocs/* usr/share/doc/libcommons-beanutils-java/api diff -Nru commons-beanutils-1.8.3/debian/libcommons-beanutils-java.poms commons-beanutils-1.8.3/debian/libcommons-beanutils-java.poms --- commons-beanutils-1.8.3/debian/libcommons-beanutils-java.poms 2009-07-02 09:28:50.000000000 +0000 +++ commons-beanutils-1.8.3/debian/libcommons-beanutils-java.poms 2011-09-22 21:34:25.000000000 +0000 @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the tag from the POM +# --package=: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=: name to use when installing the library in /usr/share/java +# --usj-version=: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=: the destination for the real jar +# it will be installed with mh_install. +# --classifier=: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --no-parent --has-package-version diff -Nru commons-beanutils-1.8.3/debian/maven.cleanIgnoreRules commons-beanutils-1.8.3/debian/maven.cleanIgnoreRules --- commons-beanutils-1.8.3/debian/maven.cleanIgnoreRules 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/maven.cleanIgnoreRules 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff -Nru commons-beanutils-1.8.3/debian/maven.ignoreRules commons-beanutils-1.8.3/debian/maven.ignoreRules --- commons-beanutils-1.8.3/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/maven.ignoreRules 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,22 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +commons-collections commons-collections-testframework * * * * +junit junit * * * * +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * diff -Nru commons-beanutils-1.8.3/debian/maven.properties commons-beanutils-1.8.3/debian/maven.properties --- commons-beanutils-1.8.3/debian/maven.properties 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/maven.properties 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff -Nru commons-beanutils-1.8.3/debian/maven.publishedRules commons-beanutils-1.8.3/debian/maven.publishedRules --- commons-beanutils-1.8.3/debian/maven.publishedRules 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/maven.publishedRules 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + diff -Nru commons-beanutils-1.8.3/debian/maven.rules commons-beanutils-1.8.3/debian/maven.rules --- commons-beanutils-1.8.3/debian/maven.rules 2009-07-02 09:28:50.000000000 +0000 +++ commons-beanutils-1.8.3/debian/maven.rules 2011-09-22 21:34:25.000000000 +0000 @@ -1,3 +1,21 @@ -commons-collections commons-collections jar s/3\..*/3.x/ -junit junit jar s/3\..*/3.x/ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ +commons-beanutils commons-beanutils jar s/.*/debian/ * * +commons-collections commons-collections jar s/3\..*/3.x/ * * +commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * diff -Nru commons-beanutils-1.8.3/debian/orig-tar.sh commons-beanutils-1.8.3/debian/orig-tar.sh --- commons-beanutils-1.8.3/debian/orig-tar.sh 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/orig-tar.sh 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/sh -e + +VERSION=$2 +TAR=../commons-beanutils_$VERSION.orig.tar.gz +DIR=commons-beanutils-$VERSION +TAG=$(echo "commons-beanutils-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') + +svn export http://svn.apache.org/repos/asf/commons/proper/beanutils/tags/${TAG} $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR +rm -rf $DIR ../$TAG + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir && echo "moved $TAR to $origDir" +fi diff -Nru commons-beanutils-1.8.3/debian/README.source commons-beanutils-1.8.3/debian/README.source --- commons-beanutils-1.8.3/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ commons-beanutils-1.8.3/debian/README.source 2011-09-22 21:34:25.000000000 +0000 @@ -0,0 +1,9 @@ +Information about commons-beanutils +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff -Nru commons-beanutils-1.8.3/debian/rules commons-beanutils-1.8.3/debian/rules --- commons-beanutils-1.8.3/debian/rules 2010-04-05 21:59:15.000000000 +0000 +++ commons-beanutils-1.8.3/debian/rules 2011-09-22 21:34:25.000000000 +0000 @@ -1,23 +1,10 @@ #!/usr/bin/make -f -# debian/rules file for libcommons-beanutils-java (uses cdbs) include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := commons-logging commons-collections3 junit -DEB_ANT_BUILD_TARGET := dist +JAVA_HOME := /usr/lib/jvm/default-java DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff -Nru commons-beanutils-1.8.3/debian/watch commons-beanutils-1.8.3/debian/watch --- commons-beanutils-1.8.3/debian/watch 2008-01-06 21:05:24.000000000 +0000 +++ commons-beanutils-1.8.3/debian/watch 2011-09-22 21:34:25.000000000 +0000 @@ -1,3 +1,4 @@ version=3 -opts=uversionmangle=s/-BETA/~beta/ \ - http://www.reverse.net/pub/apache/commons/beanutils/source/commons-beanutils-(.*)-src\.tar\.gz debian uupdate +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ + http://svn.apache.org/repos/asf/commons/proper/beanutils/tags/ \ + commons-beanutils-(\d.*)/ debian debian/orig-tar.sh