The following commit has been merged in the master branch:
commit 4af86821f39f5ffecd48c1a35ede589484473ad9
Author: Daigo Moriwaki <da...@debian.org>
Date:   Wed Nov 30 17:55:42 2011 +0900

    * Removed the patch: debian/patches/20111007-pom.xml.remove_parent.diff
      - Provided debian/clojure.poms instead.

diff --git a/debian/changelog b/debian/changelog
index 261e020..28e5816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clojure1.3 (1.3.0+dfsg-3) unstable; urgency=low
+
+  * Removed the patch: debian/patches/20111007-pom.xml.remove_parent.diff
+    - Use mh_installpom --no-parent instead.
+
+ -- Daigo Moriwaki <da...@debian.org>  Wed, 30 Nov 2011 18:15:57 +0900
+
 clojure1.3 (1.3.0+dfsg-2) unstable; urgency=low
 
   * Added a patch: debian/patches/20111007-pom.xml.remove_parent.diff
diff --git a/debian/patches/series b/debian/patches/series
index 26a7a20..f124f89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-replace-asm
-20111007-pom.xml.remove_parent.diff
diff --git a/debian/rules b/debian/rules
index b392755..89daf6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ binary-post-install/$(SOURCE)::
        sed -i 's/@VER@/$(VER)/g' debian/$(SOURCE)/usr/bin/*
        prename 's/$$/$(VER)/' debian/$(SOURCE)/usr/bin/*
        prename 's/\.(.)$$/$(VER).$$1/' debian/$(SOURCE)/usr/share/man/*/*
-       mh_installpom -p$(SOURCE) pom.xml
+       mh_installpom -p$(SOURCE) --no-parent pom.xml
        mh_installjar -p$(SOURCE) -l -s pom.xml clojure.jar 
/usr/share/java/clojure-$(VER).jar
 
 clean::

-- 
UNNAMED PROJECT

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to