[pkg-java] r10617 - trunk/velocity-tools/debian

Fri Sep 25 21:44:08 UTC 2009

Author: drazzib
Date: 2009-09-25 21:44:08 +0000 (Fri, 25 Sep 2009)
New Revision: 10617

Added:
   trunk/velocity-tools/debian/libvelocity-tools-java.poms
   trunk/velocity-tools/debian/maven.rules
Modified:
   trunk/velocity-tools/debian/changelog
   trunk/velocity-tools/debian/control
   trunk/velocity-tools/debian/copyright
   trunk/velocity-tools/debian/libvelocity-tools-java-doc.doc-base
   trunk/velocity-tools/debian/rules
Log:
* Bump Standards-Version to 3.8.3:
* Install api documentation to /usr/share/doc/libvelocity-tools-java/api/ 
* Maven POMs:
  - Add a Build-Depends-Indep dependency on maven-repo-helper
  - Use mh_installpoms and mh_installjar to install the POM and the jar to the
   Maven repository
* Update my email address

Modified: trunk/velocity-tools/debian/changelog
===================================================================

--- trunk/velocity-tools/debian/changelog	2009-09-25 21:29:56 UTC (rev 10616)
+++ trunk/velocity-tools/debian/changelog	2009-09-25 21:44:08 UTC (rev 10617)
@@ -6,12 +6,18 @@
     - Refresh all patchs
     - Remove B-D on dpatch, Add B-D on quilt
     - Include patchsys-quilt.mk in debian/rules
-  * Bump Standards-Version to 3.8.2:
+  * Bump Standards-Version to 3.8.3:
     - Add a README.source to describe patch system
   * Build-Depends on default-jdk instead of default-jdk-builddep
     because we don't build a native GCJ package.
+  * Install api documentation to /usr/share/doc/libvelocity-tools-java/api/ 
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+     Maven repository
+  * Update my email address
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 16 Jul 2009 17:56:56 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 25 Sep 2009 23:38:50 +0200
 
 velocity-tools (1.4-2) unstable; urgency=low
 

Modified: trunk/velocity-tools/debian/control
===================================================================
--- trunk/velocity-tools/debian/control	2009-09-25 21:29:56 UTC (rev 10616)
+++ trunk/velocity-tools/debian/control	2009-09-25 21:44:08 UTC (rev 10617)
@@ -2,10 +2,10 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, quilt, debhelper (>= 5), default-jdk, ant
-Build-Depends-Indep: antlr, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity, junit4, ant-optional
-Standards-Version: 3.8.2
+Build-Depends-Indep: antlr, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.4-java, velocity, junit4, ant-optional, maven-repo-helper
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/velocity-tools
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/velocity-tools
 Homepage: http://velocity.apache.org/tools/

Modified: trunk/velocity-tools/debian/copyright
===================================================================
--- trunk/velocity-tools/debian/copyright	2009-09-25 21:29:56 UTC (rev 10616)
+++ trunk/velocity-tools/debian/copyright	2009-09-25 21:44:08 UTC (rev 10617)
@@ -1,4 +1,4 @@
-This package was debianized by Damien Raude-Morvan <drazzib at drazzib.com> on
+This package was debianized by Damien Raude-Morvan <drazzib at debian.org> on
 Thu, 27 Aug 2008 20:59:38 +0200.
 
 It was downloaded from http://www.apache.org/dist/velocity/tools/
@@ -26,5 +26,5 @@
   The full text of the Apache-2.0 license can be found in
   `/usr/share/common-licenses/Apache-2.0' on Debian systems.
 
-The Debian packaging is Copyright 2008, Damien Raude-Morvan <drazzib at drazzib.com> and
+The Debian packaging is Copyright 2008, Damien Raude-Morvan <drazzib at debian.org> and
 is licensed under the Apache-2.0, see `/usr/share/common-licenses/Apache-2.0'.

Modified: trunk/velocity-tools/debian/libvelocity-tools-java-doc.doc-base
===================================================================
--- trunk/velocity-tools/debian/libvelocity-tools-java-doc.doc-base	2009-09-25 21:29:56 UTC (rev 10616)
+++ trunk/velocity-tools/debian/libvelocity-tools-java-doc.doc-base	2009-09-25 21:44:08 UTC (rev 10617)
@@ -5,5 +5,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libvelocity-tools-java-doc/api/index.html
-Files: /usr/share/doc/libvelocity-tools-java-doc/api/*
+Index: /usr/share/doc/libvelocity-tools-java/api/index.html
+Files: /usr/share/doc/libvelocity-tools-java/api/*

Added: trunk/velocity-tools/debian/libvelocity-tools-java.poms
===================================================================
--- trunk/velocity-tools/debian/libvelocity-tools-java.poms	                        (rev 0)
+++ trunk/velocity-tools/debian/libvelocity-tools-java.poms	2009-09-25 21:44:08 UTC (rev 10617)
@@ -0,0 +1 @@
+pom.xml

Modified: trunk/velocity-tools/debian/rules
===================================================================
--- trunk/velocity-tools/debian/rules	2009-09-25 21:29:56 UTC (rev 10616)
+++ trunk/velocity-tools/debian/rules	2009-09-25 21:44:08 UTC (rev 10617)
@@ -18,13 +18,18 @@
 API_DOCS             := docs/javadoc/*
 
 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
-	dh_install -plib$(DEB_SOURCE_PACKAGE)-java dist/$(DEB_SOURCE_PACKAGE)-generic-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link -plib$(DEB_SOURCE_PACKAGE)-java usr/share/java/$(DEB_SOURCE_PACKAGE)-generic-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE)-generic.jar
+	# Generic JAR
+	mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java
+	mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java -l pom.xml -n$(DEB_SOURCE_PACKAGE)-generic dist/$(DEB_SOURCE_PACKAGE)-generic-$(DEB_UPSTREAM_VERSION).jar
+	# View JAR
 	dh_install -plib$(DEB_SOURCE_PACKAGE)-java dist/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_link -plib$(DEB_SOURCE_PACKAGE)-java usr/share/java/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE)-view.jar
 
+clean::
+	-rm -rf debian/tmp
+
 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java-doc::
-	dh_install -plib$(DEB_SOURCE_PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(DEB_SOURCE_PACKAGE)-java-doc/api
+	dh_install -plib$(DEB_SOURCE_PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(DEB_SOURCE_PACKAGE)-java/api
 
 # Rename content directory to velocity-tools-X.Y in orig.tar.gz
 get-orig-source:


