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 73445291c512c73d875a82737819b3f61b770314 Author: Emmanuel Bourg <[email protected]> Date: Thu Apr 4 09:55:46 2013 +0000 Fixed the watch file --- debian/changelog | 8 ++++++++ debian/control | 5 +++-- debian/libcommons-beanutils-java.poms | 16 +++++++++------- debian/maven.cleanIgnoreRules | 16 ---------------- debian/maven.ignoreRules | 15 --------------- debian/maven.publishedRules | 19 +------------------ debian/maven.rules | 19 +------------------ debian/orig-tar.sh | 16 ---------------- debian/watch | 4 +--- 9 files changed, 23 insertions(+), 95 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8af6bc..7cfe0e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +commons-beanutils (1.8.3-4) unstable; urgency=low + + * Team upload. + * Bump Standards-Version to 3.9.4: no changes needed + * debian/watch: Fixed the URL + + -- Emmanuel Bourg <[email protected]> Thu, 04 Apr 2013 11:29:45 +0200 + commons-beanutils (1.8.3-3) unstable; urgency=low * Update Standards-Version: 3.9.3. diff --git a/debian/control b/debian/control index c4f633d..0330e94 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]>, - Damien Raude-Morvan <[email protected]> + Damien Raude-Morvan <[email protected]>, + Emmanuel Bourg <[email protected]> Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: default-jdk-doc, libclirr-maven-plugin-java, @@ -12,7 +13,7 @@ Build-Depends-Indep: default-jdk-doc, libcommons-parent-java, libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 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/ diff --git a/debian/libcommons-beanutils-java.poms b/debian/libcommons-beanutils-java.poms index 34fb4ec..1d885c3 100644 --- a/debian/libcommons-beanutils-java.poms +++ b/debian/libcommons-beanutils-java.poms @@ -2,7 +2,9 @@ # Format of this file is: # <path to pom file> [option]* # where option can be: -# --ignore: ignore this POM or +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] # --no-parent: remove the <parent> tag from the POM # --package=<package>: an alternative package to use when installing this POM # and its artifact @@ -11,16 +13,16 @@ # --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 +# it will be installed when using the command mh_install. [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. +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [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. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] # -pom.xml --has-package-version --java-lib +pom.xml --has-package-version --java-lib diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules index b47b61d..8b13789 100644 --- a/debian/maven.cleanIgnoreRules +++ b/debian/maven.cleanIgnoreRules @@ -1,17 +1 @@ -# 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 index c4ad5dd..ffd8ede 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,18 +1,3 @@ -# 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 * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules index 822f087..452a986 100644 --- a/debian/maven.publishedRules +++ b/debian/maven.publishedRules @@ -1,19 +1,2 @@ -# 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/ +commons-beanutils commons-beanutils jar s/.*/debian/ * * diff --git a/debian/maven.rules b/debian/maven.rules index 22f9277..518216b 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,22 +1,5 @@ -# 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/ * * org.apache.commons commons-parent pom s/.*/debian/ * * +commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index 75297ae..0000000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/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/watch b/debian/watch index 6ebe46b..d5363ef 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,2 @@ version=3 -opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ - http://svn.apache.org/repos/asf/commons/proper/beanutils/tags/ \ - commons-beanutils-(\d.*)/ debian debian/orig-tar.sh +http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-([\d.]+)-src\.tar\.gz -- 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
