The following commit has been merged in the master branch:
commit 2dde07b304df698151a55c3f473c21f073602cec
Author: Damien Raude-Morvan <draz...@debian.org>
Date:   Sun Jan 8 01:27:25 2012 +0100

    Team upload.
    
    * Team upload.
    * Merge fixes FTBFS with no network proposed by Micah Gersten:
      - Add a maven build target of install so that jars are deployed
        into the local maven repository during the build process
        (Thanks to James Page) (Closes: #643491).
      - Add libmaven-install-plugin-java to Build-Depends-Indep; Needed for 
above
        FTBFS fix.

diff --git a/debian/changelog b/debian/changelog
index edae09f..6edb573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+animal-sniffer (1.7-2) unstable; urgency=low
+
+  * Team upload.
+  * Merge fixes FTBFS with no network proposed by Micah Gersten:
+    - Add a maven build target of install so that jars are deployed
+      into the local maven repository during the build process
+      (Thanks to James Page) (Closes: #643491).
+    - Add libmaven-install-plugin-java to Build-Depends-Indep; Needed for above
+      FTBFS fix.
+
+ -- Damien Raude-Morvan <draz...@debian.org>  Sun, 08 Jan 2012 01:25:29 +0100
+
 animal-sniffer (1.7-1) unstable; urgency=low
 
   * Initial release. (Closes: #621871)
diff --git a/debian/control b/debian/control
index 7520738..d7e9a73 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7), cdbs, default-jdk, 
maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libasm3-java, junit, default-jdk-doc,
  libmaven-javadoc-plugin-java, libmaven-enforcer-plugin-java,
  libmaven-invoker-plugin-java, libmaven-common-artifact-filters-java,
- libbuild-helper-maven-plugin-java, libmaven-shade-plugin-java, 
libmaven-plugin-tools-java
+ libbuild-helper-maven-plugin-java, libmaven-shade-plugin-java, 
libmaven-plugin-tools-java, libmaven-install-plugin-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/animal-sniffer.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/animal-sniffer.git;a=summary
diff --git a/debian/rules b/debian/rules
index b457cb5..0a055a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ include /usr/share/cdbs/1/class/maven.mk
 #      mh_installjar -plib$(PACKAGE)-java -l pom.xml 
target/$(PACKAGE)-$(VERSION).jar 
 
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+DEB_MAVEN_BUILD_TARGET := install
 
 clean::
        mh_clean

-- 
Animal Sniffer Debian packaging

_______________________________________________
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