[pkg-java] r7584 - in trunk/plexus-interpolation/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-07 20:33:58 +0000 (Sun, 07 Dec 2008)
New Revision: 7584

Added:
   trunk/plexus-interpolation/debian/patches/
   trunk/plexus-interpolation/debian/patches/pom.diff
   trunk/plexus-interpolation/debian/patches/series
Modified:
   trunk/plexus-interpolation/debian/
   trunk/plexus-interpolation/debian/control
   trunk/plexus-interpolation/debian/rules
Log:
install into /usr/share/maven-repo



Property changes on: trunk/plexus-interpolation/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/plexus-interpolation/debian/control
===================================================================
--- trunk/plexus-interpolation/debian/control	2008-12-07 20:22:44 UTC (rev 7583)
+++ trunk/plexus-interpolation/debian/control	2008-12-07 20:33:58 UTC (rev 7584)
@@ -3,7 +3,8 @@
 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 (>= 0.4.5.3), default-jdk, maven-ant-helper
+Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, maven-ant-helper,
+ quilt
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-interpolation
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-interpolation/

Added: trunk/plexus-interpolation/debian/patches/pom.diff
===================================================================
--- trunk/plexus-interpolation/debian/patches/pom.diff	                        (rev 0)
+++ trunk/plexus-interpolation/debian/patches/pom.diff	2008-12-07 20:33:58 UTC (rev 7584)
@@ -0,0 +1,27 @@
+Index: plexus-interpolation-1.7/pom.xml
+===================================================================
+--- plexus-interpolation-1.7.orig/pom.xml	2008-12-07 21:25:09.000000000 +0100
++++ plexus-interpolation-1.7/pom.xml	2008-12-07 21:04:45.000000000 +0100
+@@ -1,12 +1,15 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
++  <!--
+   <parent>
+     <groupId>org.codehaus.plexus</groupId>
+     <artifactId>plexus</artifactId>
+     <version>1.0.11</version>
+   </parent>
++  -->
+   
+   <artifactId>plexus-interpolation</artifactId>
++  <groupId>org.codehaus.plexus</groupId>
+   <version>1.7</version>
+   
+   <name>Plexus Interpolation API</name>
+@@ -94,4 +97,4 @@
+     </profile>
+   </profiles>  
+   
+-</project>
+\ No newline at end of file
++</project>

Added: trunk/plexus-interpolation/debian/patches/series
===================================================================
--- trunk/plexus-interpolation/debian/patches/series	                        (rev 0)
+++ trunk/plexus-interpolation/debian/patches/series	2008-12-07 20:33:58 UTC (rev 7584)
@@ -0,0 +1 @@
+pom.diff

Modified: trunk/plexus-interpolation/debian/rules
===================================================================
--- trunk/plexus-interpolation/debian/rules	2008-12-07 20:22:44 UTC (rev 7583)
+++ trunk/plexus-interpolation/debian/rules	2008-12-07 20:33:58 UTC (rev 7584)
@@ -2,6 +2,7 @@
 
 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,g")
@@ -15,6 +16,9 @@
 get-orig-source:
 	uscan --force-download --rename
 
+REPO := /usr/share/maven-repo
+DEST := $(REPO)/org/codehaus/plexus
+
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java build/*.jar /usr/share/java/
-	dh_link -plib$(PACKAGE)-java /usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+	dh_install build/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/
+	install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom