[pkg-java] r11617 - trunk/libservlet2.4-java/debian

[Gabriele Giacone]

Author: gg0-guest
Date: 2010-02-17 23:17:13 +0000 (Wed, 17 Feb 2010)
New Revision: 11617

Added:
   trunk/libservlet2.4-java/debian/pom.xml
Modified:
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/control
   trunk/libservlet2.4-java/debian/rules
Log:
added maven support

Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2010-02-17 23:04:39 UTC (rev 11616)
+++ trunk/libservlet2.4-java/debian/changelog	2010-02-17 23:17:13 UTC (rev 11617)
@@ -1,3 +1,11 @@
+libservlet2.4-java (5.0.30-11) unstable; urgency=low
+
+  * Added Maven support
+  * Standards-Version to 3.8.4
+  * Build-Depends: default-jdk replaces default-jdk-builddep, added gcj-jdk
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 18 Feb 2010 00:12:36 +0100
+
 libservlet2.4-java (5.0.30-10) unstable; urgency=low
 
   * Corrected the placement of the OSGi metadata in the manifest.

Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control	2010-02-17 23:04:39 UTC (rev 11616)
+++ trunk/libservlet2.4-java/debian/control	2010-02-17 23:17:13 UTC (rev 11617)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, gcj-jdk, maven-repo-helper
+Standards-Version: 3.8.4
 Homepage: http://jakarta.apache.org/tomcat/index.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libservlet2.4-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libservlet2.4-java

Added: trunk/libservlet2.4-java/debian/pom.xml
===================================================================
--- trunk/libservlet2.4-java/debian/pom.xml	                        (rev 0)
+++ trunk/libservlet2.4-java/debian/pom.xml	2010-02-17 23:17:13 UTC (rev 11617)
@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>javax.servlet</groupId>
+  <artifactId>servlet-api</artifactId>
+  <version>2.4</version>
+</project>

Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules	2010-02-17 23:04:39 UTC (rev 11616)
+++ trunk/libservlet2.4-java/debian/rules	2010-02-17 23:17:13 UTC (rev 11617)
@@ -30,6 +30,9 @@
 	ln -s jsp-api-2.0.jar debian/$(cdbs_curpkg)/usr/share/java/jsp-api.jar
 	install -m 644 tmp/dist-servlet-api/lib/servlet-api.jar debian/$(cdbs_curpkg)/usr/share/java/servlet-api-2.4.jar
 	ln -s servlet-api-2.4.jar debian/$(cdbs_curpkg)/usr/share/java/servlet-api.jar
+	mh_installpom -plibservlet2.4-java $(CURDIR)/debian/pom.xml
+	mh_installjar -plibservlet2.4-java -l $(CURDIR)/debian/pom.xml \
+		tmp/dist-servlet-api/lib/servlet-api.jar
 
 install/libservlet2.4-java-doc::
 	mv tmp/dist-jsp/docs/api tmp/dist-jsp/docs/api-jsp