[pkg-java] r13713 - in trunk/plexus-bsh-factory/debian: . source

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-05-29 11:37:36 +0000 (Sun, 29 May 2011)
New Revision: 13713

Added:
   trunk/plexus-bsh-factory/debian/source/
   trunk/plexus-bsh-factory/debian/source/format
Modified:
   trunk/plexus-bsh-factory/debian/changelog
   trunk/plexus-bsh-factory/debian/compat
   trunk/plexus-bsh-factory/debian/control
   trunk/plexus-bsh-factory/debian/rules
Log:
* Add myself to Uploaders.
* Bump Standards-Version to 3.9.2: no changes needed.
* Fix FTBFS: remove version param (deprecated in debian-ant-helper)
  and use POM version (Closes: #628345).
* Use mh_clean in clean rule.
* Bump to debhelper 7 compat level.
* Switch to source format 3.0 (quilt).

Modified: trunk/plexus-bsh-factory/debian/changelog
===================================================================
--- trunk/plexus-bsh-factory/debian/changelog	2011-05-29 11:37:30 UTC (rev 13712)
+++ trunk/plexus-bsh-factory/debian/changelog	2011-05-29 11:37:36 UTC (rev 13713)
@@ -1,3 +1,15 @@
+plexus-bsh-factory (1.0~alpha7-3) unstable; urgency=low
+
+  * Add myself to Uploaders.
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Fix FTBFS: remove version param (deprecated in debian-ant-helper)
+    and use POM version (Closes: #628345).
+  * Use mh_clean in clean rule.
+  * Bump to debhelper 7 compat level.
+  * Switch to source format 3.0 (quilt).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 May 2011 13:33:35 +0200
+
 plexus-bsh-factory (1.0~alpha7-2) unstable; urgency=low
 
   * Switch to the new plexus-container package.

Modified: trunk/plexus-bsh-factory/debian/compat
===================================================================
--- trunk/plexus-bsh-factory/debian/compat	2011-05-29 11:37:30 UTC (rev 13712)
+++ trunk/plexus-bsh-factory/debian/compat	2011-05-29 11:37:36 UTC (rev 13713)
@@ -1 +1 @@
-6
+7

Modified: trunk/plexus-bsh-factory/debian/control
===================================================================
--- trunk/plexus-bsh-factory/debian/control	2011-05-29 11:37:30 UTC (rev 13712)
+++ trunk/plexus-bsh-factory/debian/control	2011-05-29 11:37:36 UTC (rev 13713)
@@ -2,10 +2,10 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 6), cdbs, default-jdk
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
 Build-Depends-Indep: maven-ant-helper (>> 4), maven-repo-helper, ant, ant-optional, libplexus-container-default-java, bsh
-Standards-Version: 3.8.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-bsh-factory
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-bsh-factory/
 Homepage: http://plexus.codehaus.org/

Modified: trunk/plexus-bsh-factory/debian/rules
===================================================================
--- trunk/plexus-bsh-factory/debian/rules	2011-05-29 11:37:30 UTC (rev 13712)
+++ trunk/plexus-bsh-factory/debian/rules	2011-05-29 11:37:36 UTC (rev 13713)
@@ -4,12 +4,12 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~alpha/-alpha-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps plexus-container-default-alpha classworlds plexus-utils bsh
 DEB_ANT_BUILD_TARGET := package
 DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
@@ -19,5 +19,5 @@
 	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/plexus-bsh-factory-$(VERSION).jar
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean
 

Added: trunk/plexus-bsh-factory/debian/source/format
===================================================================
--- trunk/plexus-bsh-factory/debian/source/format	                        (rev 0)
+++ trunk/plexus-bsh-factory/debian/source/format	2011-05-29 11:37:36 UTC (rev 13713)
@@ -0,0 +1 @@
+3.0 (quilt)