This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-beanutils.
commit 050611e9b59c717f94f4d18dc07df3698e5d3ba9 Author: Torsten Werner <[email protected]> Date: Thu Sep 22 21:34:25 2011 +0000 * Update Standards-Version: 3.9.2. * Use Maven to build a package. * Change debian/watch to point to upstream's svn repo. --- debian/README.source | 9 ++++++++ debian/ant.properties | 6 ----- debian/changelog | 15 ++++++------ debian/control | 13 +++++++---- ... => libcommons-beanutils-java-doc.doc-base.api} | 6 ++--- debian/libcommons-beanutils-java-doc.install | 2 +- debian/libcommons-beanutils-java.poms | 27 +++++++++++++++++++++- debian/maven.cleanIgnoreRules | 17 ++++++++++++++ debian/maven.ignoreRules | 22 ++++++++++++++++++ debian/maven.properties | 5 ++++ debian/maven.publishedRules | 19 +++++++++++++++ debian/maven.rules | 22 ++++++++++++++++-- debian/orig-tar.sh | 16 +++++++++++++ debian/rules | 19 +++------------ debian/watch | 5 ++-- 15 files changed, 160 insertions(+), 43 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..6aba5e8 --- /dev/null +++ b/debian/README.source @@ -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 --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 8588fc9..0000000 --- a/debian/ant.properties +++ /dev/null @@ -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 --git a/debian/changelog b/debian/changelog index 2e589a4..1786608 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,17 @@ -commons-beanutils (1.8.3-3) UNRELEASED; urgency=low +commons-beanutils (1.8.3-2) UNRELEASED; urgency=low * Team upload. - * Update Standards-Version: 3.9.2. - - -- Torsten Werner <[email protected]> Thu, 22 Sep 2011 23:11:45 +0200 - -commons-beanutils (1.8.3-2) UNRELEASED; urgency=low + [ Damien Raude-Morvan ] * d/control: Drop Depends on any JRE as a Java library don't need to depends on a runtime (Java Policy) - -- Damien Raude-Morvan <[email protected]> Thu, 28 Apr 2011 23:04:48 +0200 + [ 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 <[email protected]> Thu, 22 Sep 2011 23:24:31 +0200 commons-beanutils (1.8.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 0a41fee..15616d9 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,9 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Michael Koch <[email protected]>, Ludovic Claude <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, ant, ant-optional, libcommons-collections3-java, libcommons-logging-java, junit +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/ @@ -13,7 +14,8 @@ Homepage: http://commons.apache.org/beanutils/ Package: libcommons-beanutils-java Architecture: all -Depends: ${misc:Depends}, 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 @@ Description: utility for manipulating JavaBeans 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 --git a/debian/libcommons-beanutils-java-doc.doc-base b/debian/libcommons-beanutils-java-doc.doc-base.api similarity index 77% rename from debian/libcommons-beanutils-java-doc.doc-base rename to debian/libcommons-beanutils-java-doc.doc-base.api index 33b5567..5964b9b 100644 --- a/debian/libcommons-beanutils-java-doc.doc-base +++ b/debian/libcommons-beanutils-java-doc.doc-base.api @@ -1,6 +1,6 @@ -Document: libcommons-beanutils-java-doc -Title: Programmer API for Beanutils -Author: Apache Beanutils developers +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 diff --git a/debian/libcommons-beanutils-java-doc.install b/debian/libcommons-beanutils-java-doc.install index bc65fd8..49d90b8 100644 --- a/debian/libcommons-beanutils-java-doc.install +++ b/debian/libcommons-beanutils-java-doc.install @@ -1 +1 @@ -dist/docs/api /usr/share/doc/libcommons-beanutils-java/ +target/apidocs/* usr/share/doc/libcommons-beanutils-java/api diff --git a/debian/libcommons-beanutils-java.poms b/debian/libcommons-beanutils-java.poms index 43e746b..31a0ccf 100644 --- a/debian/libcommons-beanutils-java.poms +++ b/debian/libcommons-beanutils-java.poms @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<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=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: 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>: name to use when installing the library in /usr/share/java +# --usj-version=<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=<path>: the destination for the real jar +# it will be installed with mh_install. +# --classifier=<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 --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -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 --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..c4ad5dd --- /dev/null +++ b/debian/maven.ignoreRules @@ -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 --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -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 --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -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 --git a/debian/maven.rules b/debian/maven.rules index 51ec06b..fe82460 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -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 --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..75297ae --- /dev/null +++ b/debian/orig-tar.sh @@ -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 --git a/debian/rules b/debian/rules index f1c9e67..3a77ff2 100755 --- a/debian/rules +++ b/debian/rules @@ -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 --git a/debian/watch b/debian/watch index 8259dfc..6ebe46b 100644 --- a/debian/watch +++ b/debian/watch @@ -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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-beanutils.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
