[pkg-java] r11868 - in trunk/libhamcrest-java/debian: . poms

Gabriele Giacone gg0-guest at alioth.debian.org
Mon Mar 15 00:50:08 UTC 2010 

Author: gg0-guest
Date: 2010-03-15 00:50:08 +0000 (Mon, 15 Mar 2010)
New Revision: 11868

Added:
   trunk/libhamcrest-java/debian/poms/
   trunk/libhamcrest-java/debian/poms/core.xml
   trunk/libhamcrest-java/debian/poms/generator.xml
   trunk/libhamcrest-java/debian/poms/integration.xml
   trunk/libhamcrest-java/debian/poms/library.xml
Modified:
   trunk/libhamcrest-java/debian/changelog
   trunk/libhamcrest-java/debian/control
   trunk/libhamcrest-java/debian/copyright
   trunk/libhamcrest-java/debian/rules
Log:
added maven support

Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog	2010-03-14 23:52:08 UTC (rev 11867)
+++ trunk/libhamcrest-java/debian/changelog	2010-03-15 00:50:08 UTC (rev 11868)
@@ -1,3 +1,11 @@
+libhamcrest-java (1.1-6) unstable; urgency=low
+
+  * Added Maven support.
+    - added poms taken from upstream svn trunk
+    - added d/copyright section for debian/poms
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 15 Mar 2010 01:49:44 +0100
+
 libhamcrest-java (1.1-5) unstable; urgency=low
 
   [ Gabriele Giacone ]

Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control	2010-03-14 23:52:08 UTC (rev 11867)
+++ trunk/libhamcrest-java/debian/control	2010-03-15 00:50:08 UTC (rev 11868)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Michael Koch <konqueror at gmx.de>,
  Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk, maven-repo-helper
 Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java
 Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/hamcrest/

Modified: trunk/libhamcrest-java/debian/copyright
===================================================================
--- trunk/libhamcrest-java/debian/copyright	2010-03-14 23:52:08 UTC (rev 11867)
+++ trunk/libhamcrest-java/debian/copyright	2010-03-15 00:50:08 UTC (rev 11868)
@@ -13,3 +13,10 @@
 License: GPL
   On Debian systems, the complete text of the GPL License can be
   found in `/usr/share/common-licenses/GPL'.
+
+Files: debian/poms/*
+Copyright: 2000-2006, www.hamcrest.org
+License: BSD
+  On Debian systems, the complete text of the BSD License can be
+  found in `/usr/share/common-licenses/BSD'.
+

Added: trunk/libhamcrest-java/debian/poms/core.xml
===================================================================
--- trunk/libhamcrest-java/debian/poms/core.xml	                        (rev 0)
+++ trunk/libhamcrest-java/debian/poms/core.xml	2010-03-15 00:50:08 UTC (rev 11868)
@@ -0,0 +1,11 @@
+<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.hamcrest</groupId>
+    <artifactId>hamcrest-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>hamcrest-core</artifactId>
+  <packaging>jar</packaging>
+  <name>Hamcrest Core</name>
+</project>

Added: trunk/libhamcrest-java/debian/poms/generator.xml
===================================================================
--- trunk/libhamcrest-java/debian/poms/generator.xml	                        (rev 0)
+++ trunk/libhamcrest-java/debian/poms/generator.xml	2010-03-15 00:50:08 UTC (rev 11868)
@@ -0,0 +1,18 @@
+<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.hamcrest</groupId>
+    <artifactId>hamcrest-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>hamcrest-generator</artifactId>
+  <packaging>jar</packaging>
+  <name>Hamcrest Generator</name>
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/libhamcrest-java/debian/poms/integration.xml
===================================================================
--- trunk/libhamcrest-java/debian/poms/integration.xml	                        (rev 0)
+++ trunk/libhamcrest-java/debian/poms/integration.xml	2010-03-15 00:50:08 UTC (rev 11868)
@@ -0,0 +1,18 @@
+<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.hamcrest</groupId>
+    <artifactId>hamcrest-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>hamcrest-integration</artifactId>
+  <packaging>jar</packaging>
+  <name>Hamcrest Integration</name>
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/libhamcrest-java/debian/poms/library.xml
===================================================================
--- trunk/libhamcrest-java/debian/poms/library.xml	                        (rev 0)
+++ trunk/libhamcrest-java/debian/poms/library.xml	2010-03-15 00:50:08 UTC (rev 11868)
@@ -0,0 +1,18 @@
+<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.hamcrest</groupId>
+    <artifactId>hamcrest-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>hamcrest-library</artifactId>
+  <packaging>jar</packaging>
+  <name>Hamcrest Library</name>
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+  </dependencies>
+</project>

Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules	2010-03-14 23:52:08 UTC (rev 11867)
+++ trunk/libhamcrest-java/debian/rules	2010-03-15 00:50:08 UTC (rev 11868)
@@ -8,17 +8,31 @@
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_JARS		:= easymock jmock qdox
 ANT_OPTS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+POMS                    := core generator integration library
 
-ALL_JARS = $(wildcard *.jar)
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java
 
 common-install-prehook-indep::
-	for jar in $(ALL_JARS); do                         \
-	  BASENAME=`basename $$jar .jar`;       	   \
-	  FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
-	  install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME;  \
-	  ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
+	for pom in $(POMS); do \
+		pomfile=debian/poms/$$pom.xml; \
+		sed -i 's/version>1.2-SNAPSHOT<\/version/version>'$(DEB_UPSTREAM_VERSION)'<\/version/' $$pomfile; \
 	done
+	for pom in $(POMS); do \
+		pomfile=debian/poms/$$pom.xml; \
+		mh_installpom -v -o -e$(DEB_UPSTREAM_VERSION) \
+		-plibhamcrest-java $$pomfile; \
+		mh_installjar -l -i$(DEB_UPSTREAM_VERSION) \
+		-plibhamcrest-java $$pomfile hamcrest-$$pom.jar; \
+	done
+	install -m 644 -D hamcrest-text.jar \
+		$(DEST_DIR)/hamcrest-text-$(DEB_UPSTREAM_VERSION).jar
+	ln -s hamcrest-text-$(DEB_UPSTREAM_VERSION).jar $(DEST_DIR)/hamcrest-text.jar
 
+clean::
+	for pom in $(POMS); do \
+		pomfile=debian/poms/$$pom.xml; \
+		sed -i 's/version>'$(DEB_UPSTREAM_VERSION)'<\/version/version>1.2-SNAPSHOT<\/version/' $$pomfile; \
+	done
+
 get-orig-source:
 	-uscan --upstream-version 0 --rename

More information about the pkg-java-commits mailing list