[pkg-java] r16485 - trunk/commons-beanutils/debian

Emmanuel Bourg ebourg-guest at alioth.debian.org
Thu Apr 4 09:55:46 UTC 2013 

Author: ebourg-guest
Date: 2013-04-04 09:55:46 +0000 (Thu, 04 Apr 2013)
New Revision: 16485

Removed:
   trunk/commons-beanutils/debian/orig-tar.sh
Modified:
   trunk/commons-beanutils/debian/changelog
   trunk/commons-beanutils/debian/control
   trunk/commons-beanutils/debian/libcommons-beanutils-java.poms
   trunk/commons-beanutils/debian/maven.cleanIgnoreRules
   trunk/commons-beanutils/debian/maven.ignoreRules
   trunk/commons-beanutils/debian/maven.publishedRules
   trunk/commons-beanutils/debian/maven.rules
   trunk/commons-beanutils/debian/watch
Log:
Fixed the watch file

Modified: trunk/commons-beanutils/debian/changelog
===================================================================
--- trunk/commons-beanutils/debian/changelog	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/changelog	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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 <ebourg at apache.org>  Thu, 04 Apr 2013 11:29:45 +0200
+
 commons-beanutils (1.8.3-3) unstable; urgency=low
 
   * Update Standards-Version: 3.9.3.

Modified: trunk/commons-beanutils/debian/control
===================================================================
--- trunk/commons-beanutils/debian/control	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/control	2013-04-04 09:55:46 UTC (rev 16485)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
-           Damien Raude-Morvan <drazzib at debian.org>
+           Damien Raude-Morvan <drazzib at debian.org>,
+           Emmanuel Bourg <ebourg at apache.org>
 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 @@
                      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/

Modified: trunk/commons-beanutils/debian/libcommons-beanutils-java.poms
===================================================================
--- trunk/commons-beanutils/debian/libcommons-beanutils-java.poms	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/libcommons-beanutils-java.poms	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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

Modified: trunk/commons-beanutils/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/commons-beanutils/debian/maven.cleanIgnoreRules	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/maven.cleanIgnoreRules	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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/
 

Modified: trunk/commons-beanutils/debian/maven.ignoreRules
===================================================================
--- trunk/commons-beanutils/debian/maven.ignoreRules	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/maven.ignoreRules	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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 * * * *

Modified: trunk/commons-beanutils/debian/maven.publishedRules
===================================================================
--- trunk/commons-beanutils/debian/maven.publishedRules	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/maven.publishedRules	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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/ * *

Modified: trunk/commons-beanutils/debian/maven.rules
===================================================================
--- trunk/commons-beanutils/debian/maven.rules	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/maven.rules	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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/ * *

Deleted: trunk/commons-beanutils/debian/orig-tar.sh
===================================================================
--- trunk/commons-beanutils/debian/orig-tar.sh	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/orig-tar.sh	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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

Modified: trunk/commons-beanutils/debian/watch
===================================================================
--- trunk/commons-beanutils/debian/watch	2013-04-04 06:14:07 UTC (rev 16484)
+++ trunk/commons-beanutils/debian/watch	2013-04-04 09:55:46 UTC (rev 16485)
@@ -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

More information about the pkg-java-commits mailing list