[findbugs] 04/06: Rework annotations jar file install

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository findbugs.

commit 508050f717fb764d956ed3c08d040f15d520a5ea
Author: James Page <james.page at ubuntu.com>
Date:   Sat Jan 4 21:30:11 2014 +0000

    Rework annotations jar file install
    
    Also tidy up clean of package
---
 debian/changelog                     |  7 ++++---
 debian/findbugs.install              |  1 +
 debian/findbugs.poms                 |  2 +-
 debian/poms/findbugs-annotations.pom | 22 ++++++++++++++++++++++
 debian/rules                         | 15 +++++++++++----
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c24b37..1c86506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 findbugs (2.0.3+repack-1) UNRELEASED; urgency=medium
 
-  * Install jar file and pom into /usr/share/maven-repo for
-    use of findbugs with projects that use maven. 
+  * Team upload.
+  * Install annotations.jar file and pom into /usr/share/maven-repo for
+    use of findbugs annotations with projects that use maven. 
   * Update orig-tar.sh to fully clean all generated sources from upstream
-    tarball, repack 2.0.3 release.
+    tarball (Closes: #726988), repack 2.0.3 release.
 
  -- James Page <james.page at ubuntu.com>  Thu, 02 Jan 2014 13:37:05 +0000
 
diff --git a/debian/findbugs.install b/debian/findbugs.install
index 0b4292a..d41c00b 100644
--- a/debian/findbugs.install
+++ b/debian/findbugs.install
@@ -1,3 +1,4 @@
+lib/findbugs.jar usr/share/java
 lib/findbugs-ant.jar usr/share/java
 lib/buggy.icns usr/share/findbugs/lib
 lib/bug-logo.icns usr/share/findbugs/lib
diff --git a/debian/findbugs.poms b/debian/findbugs.poms
index d4f7111..0e38661 100644
--- a/debian/findbugs.poms
+++ b/debian/findbugs.poms
@@ -1 +1 @@
-pom.xml
+debian/poms/findbugs-annotations.pom --usj-name=findbugs-annotations --java-lib
diff --git a/debian/poms/findbugs-annotations.pom b/debian/poms/findbugs-annotations.pom
new file mode 100644
index 0000000..1c10fd0
--- /dev/null
+++ b/debian/poms/findbugs-annotations.pom
@@ -0,0 +1,22 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.code.findbugs</groupId>
+    <artifactId>annotations</artifactId>
+    <version>2.0.3</version>
+    <packaging>jar</packaging>
+    <url>http://findbugs.sourceforge.net/</url>
+    <name>FindBugs-Annotations</name>
+    <description>Annotation supports the FindBugs tool</description>
+    <licenses>
+        <license>
+            <name>GNU Lesser Public License</name>
+            <url>http://www.gnu.org/licenses/lgpl.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection>
+        <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection>
+        <url>http://findbugs.googlecode.com/svn/trunk/</url>
+    </scm>
+</project>
diff --git a/debian/rules b/debian/rules
index 9afb9f4..fef23c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,12 @@ SHAREPACDIR=$(SHAREDIR)/$(BASE_NAME)
 
 
 %:
-	dh $@
+	dh $@ --with maven_repo_helper
 
 override_dh_auto_build:
 	ant docs build
 
 override_dh_auto_install:
-
 	chmod -x $(CURDIR)/bin/findbugs.ico
 
 	mkdir -p $(CURDIR)/debian/findbugs/usr/bin
@@ -28,8 +27,9 @@ override_dh_auto_install:
 	dh_install --sourcedir=$(CURDIR)
 	dh_link
 
-	mh_installpom -pfindbugs pom.xml
-	mh_installjar -pfindbugs pom.xml -l lib/findbugs.jar
+	mh_installpom -pfindbugs debian/poms/findbugs-annotations.pom
+	mh_installjar -pfindbugs debian/poms/findbugs-annotations.pom \
+		--usj-name=findbugs-annotations -l lib/annotations.jar
 
 	# prepare findbugs.1
 	help2man -h "-help" -v "-version" \
@@ -41,6 +41,13 @@ override_dh_auto_install:
 		$(CURDIR)/debian/findbugs/usr/bin/findbugs \
 		-o $(CURDIR)/debian/findbugs.1
 
+override_dh_auto_clean:
+	rm -f $(CURDIR)/debian/findbugs.1 $(CURDIR)/debian/fb.1
+	rm -f lib/*.jar
+	rm -rf classesEclipse/
+	rm -f src/doc/allBugDescriptions.html src/doc/bugDescriptions.html
+	dh_auto_clean
+
 override_dh_auto_test:
 	ant test
 	dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/findbugs.git