[pkg-java] r13407 - trunk/cglib/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-03-12 01:03:26 +0000 (Sat, 12 Mar 2011)
New Revision: 13407

Added:
   trunk/cglib/debian/pom-nodep.xml
Modified:
   trunk/cglib/debian/changelog
   trunk/cglib/debian/rules
Log:
d/rules, d/pom-nodep.xml: Install -nodep jar with another artifactId
to avoid conflict in /usr/share/maven-repo (Closes: #617865).

Modified: trunk/cglib/debian/changelog
===================================================================
--- trunk/cglib/debian/changelog	2011-03-11 16:32:58 UTC (rev 13406)
+++ trunk/cglib/debian/changelog	2011-03-12 01:03:26 UTC (rev 13407)
@@ -1,3 +1,10 @@
+cglib (2.2+dfsg-4) unstable; urgency=low
+
+  * d/rules, d/pom-nodep.xml: Install -nodep jar with another artifactId
+    to avoid conflict in /usr/share/maven-repo (Closes: #617865).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Mar 2011 02:03:14 +0100
+
 cglib (2.2+dfsg-3) unstable; urgency=low
 
   * d/patches/02_build_split.patch: Drop, re-enable cglib-nodep

Added: trunk/cglib/debian/pom-nodep.xml
===================================================================
--- trunk/cglib/debian/pom-nodep.xml	                        (rev 0)
+++ trunk/cglib/debian/pom-nodep.xml	2011-03-12 01:03:26 UTC (rev 13407)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>cglib</groupId>
+  <artifactId>cglib-nodep</artifactId>
+  <name>Code Generation Library</name>
+  <version>2.2</version>
+  <url>http://cglib.sourceforge.net/</url>
+  <licenses>
+    <license>
+            <name>ASF 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://cglib.cvs.sourceforge.net/cglib</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.6.2</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

Modified: trunk/cglib/debian/rules
===================================================================
--- trunk/cglib/debian/rules	2011-03-11 16:32:58 UTC (rev 13406)
+++ trunk/cglib/debian/rules	2011-03-12 01:03:26 UTC (rev 13407)
@@ -16,11 +16,12 @@
 JAR_DIR   := /usr/share/java
 
 install/libcglib-java::
-	mh_installpom -v -o -e$(VERSION) -plibcglib-java debian/pom.xml; \
-	mh_installjar -l -i$(VERSION) -plibcglib-java debian/pom.xml \
-		dist/cglib-$(VERSION).jar; 
-	mh_installjar -l -i$(VERSION) -plibcglib-java -ncglib-nodep debian/pom.xml \
-		dist/cglib-nodep-$(VERSION).jar;
+	mh_installpom -plibcglib-java -e$(VERSION) debian/pom.xml
+	mh_installpom -plibcglib-java -e$(VERSION) debian/pom-nodep.xml
+	mh_installjar -plibcglib-java -l -i$(VERSION) -e$(VERSION) debian/pom.xml \
+		dist/cglib-$(VERSION).jar
+	mh_installjar -plibcglib-java -l -i$(VERSION) -e$(VERSION) debian/pom-nodep.xml \
+		dist/cglib-nodep-$(VERSION).jar
 
 get-orig-source:
 	uscan --upstream-version 0 --rename