[pkg-java] r8942 - trunk/maven-reporting-impl/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Tue Jul 7 23:52:15 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-07 23:52:15 +0000 (Tue, 07 Jul 2009)
New Revision: 8942

Modified:
   trunk/maven-reporting-impl/debian/build.properties
   trunk/maven-reporting-impl/debian/changelog
   trunk/maven-reporting-impl/debian/control
   trunk/maven-reporting-impl/debian/copyright
   trunk/maven-reporting-impl/debian/orig-tar.sh
   trunk/maven-reporting-impl/debian/rules
Log:
* New version

Modified: trunk/maven-reporting-impl/debian/build.properties
===================================================================
--- trunk/maven-reporting-impl/debian/build.properties	2009-07-07 23:51:57 UTC (rev 8941)
+++ trunk/maven-reporting-impl/debian/build.properties	2009-07-07 23:52:15 UTC (rev 8942)
@@ -1 +1,3 @@
-javadoc.dir=build/api
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true

Modified: trunk/maven-reporting-impl/debian/changelog
===================================================================
--- trunk/maven-reporting-impl/debian/changelog	2009-07-07 23:51:57 UTC (rev 8941)
+++ trunk/maven-reporting-impl/debian/changelog	2009-07-07 23:52:15 UTC (rev 8942)
@@ -1,3 +1,16 @@
+maven-reporting-impl (2.0.4.1-3) unstable; urgency=low
+
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Remove Depends on Java runtimes as it is a library
+  * Replace the dependency on maven2 to libmaven2-core-java
+  * Add a Build-Depends on quilt and use it to patch a file for doxia 1.1
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 May 2009 17:39:00 +0100
+
 maven-reporting-impl (2.0.4.1-2) unstable; urgency=low
 
   * Fix Vcs-* and Homepage headers in debian/control.

Modified: trunk/maven-reporting-impl/debian/control
===================================================================
--- trunk/maven-reporting-impl/debian/control	2009-07-07 23:51:57 UTC (rev 8941)
+++ trunk/maven-reporting-impl/debian/control	2009-07-07 23:52:15 UTC (rev 8942)
@@ -1,19 +1,20 @@
 Source: maven-reporting-impl
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, libdoxia-java, maven2,
- libcommons-validator-java, libplexus-utils-java, maven-ant-helper,
- libdoxia-sitetools-java
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+ libmaven2-core-java, libdoxia-java, libcommons-validator-java, 
+ libplexus-utils-java, libdoxia-sitetools-java
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-reporting-impl
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-reporting-impl
 Homepage: http://maven.apache.org/shared/maven-reporting-impl/
 
 Package: libmaven-reporting-impl-java
 Architecture: all
-Depends: default-jre | java2-runtime, libdoxia-java, maven2, libcommons-validator-java,
+Depends: libmaven2-core-java, libdoxia-java, libcommons-validator-java,
  libplexus-utils-java, libdoxia-sitetools-java, ${misc:Depends}
 Description: Maven Reporting API Implementation
  Maven is a software project management and comprehension tool. Based on the

Modified: trunk/maven-reporting-impl/debian/copyright
===================================================================
--- trunk/maven-reporting-impl/debian/copyright	2009-07-07 23:51:57 UTC (rev 8941)
+++ trunk/maven-reporting-impl/debian/copyright	2009-07-07 23:52:15 UTC (rev 8942)
@@ -3,7 +3,7 @@
 The Debian packaging is Copyright (c) 2008 Torsten Werner and is
 licensed under the GNU General Public License version 3. On Debian
 systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+found in '/usr/share/common-licenses/GPL-3'.
 
 It was downloaded from <http://maven.apache.org>.
 


Property changes on: trunk/maven-reporting-impl/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/maven-reporting-impl/debian/rules
===================================================================
--- trunk/maven-reporting-impl/debian/rules	2009-07-07 23:51:57 UTC (rev 8941)
+++ trunk/maven-reporting-impl/debian/rules	2009-07-07 23:52:15 UTC (rev 8942)
@@ -2,20 +2,25 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := doxia-sink-api doxia-site-renderer maven2 doxia-module-xhtml \
-  doxia-core commons-validator plexus-utils
+DEB_JARS             := ant-nodeps doxia-sink-api doxia-site-renderer maven-core maven-reporting-api \
+  maven-plugin-api maven-project doxia-module-xhtml doxia-core doxia-logging-api \
+  doxia-decoration-model commons-validator plexus-utils
 DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dversion=$(VERSION)
-API_DOCS             := build/api
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS             := target/api
 
 get-orig-source:
-	uscan --force-download
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar /usr/share/java
-	dh_link -plib$(PACKAGE)-java /usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
+
+clean::
+	-rm -rf debian/tmp


Property changes on: trunk/maven-reporting-impl/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *

More information about the pkg-java-commits mailing list