[pkg-java] r11899 - trunk/libhamcrest-java/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-19 21:44:19 +0000 (Fri, 19 Mar 2010)
New Revision: 11899

Modified:
   trunk/libhamcrest-java/debian/changelog
   trunk/libhamcrest-java/debian/rules
Log:
  - added maven-repo-helper to Build-Depends
* Upload to unstable

Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog	2010-03-19 21:38:31 UTC (rev 11898)
+++ trunk/libhamcrest-java/debian/changelog	2010-03-19 21:44:19 UTC (rev 11899)
@@ -1,11 +1,16 @@
 libhamcrest-java (1.1-6) unstable; urgency=low
 
+  [ Gabriele Giacone ]
   * Added Maven support.
     - added poms taken from upstream svn trunk
     - added d/copyright section for debian/poms
+    - added maven-repo-helper to Build-Depends
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 15 Mar 2010 01:49:44 +0100
+  [ Damien Raude-Morvan ]
+  * Upload to unstable
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 19 Mar 2010 22:42:34 +0100
+
 libhamcrest-java (1.1-5) unstable; urgency=low
 
   [ Gabriele Giacone ]

Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules	2010-03-19 21:38:31 UTC (rev 11898)
+++ trunk/libhamcrest-java/debian/rules	2010-03-19 21:44:19 UTC (rev 11899)
@@ -12,16 +12,12 @@
 
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java
 
-common-install-prehook-indep::
+binary-post-install/libhamcrest-java::
 	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) \
+		mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \
 		-plibhamcrest-java $$pomfile; \
-		mh_installjar -l -i$(DEB_UPSTREAM_VERSION) \
+		mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -i$(DEB_UPSTREAM_VERSION) \
 		-plibhamcrest-java $$pomfile hamcrest-$$pom.jar; \
 	done
 	install -m 644 -D hamcrest-text.jar \
@@ -29,10 +25,7 @@
 	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
+	-rm -rf debian/tmp
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename