[findbugs] 09/18: Moved the annotations to the libfindbugs-annotations-java package

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository findbugs.

commit 1ca7defd268b4b24c672d4b327bffd94597099d5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 10 11:26:31 2016 +0200

    Moved the annotations to the libfindbugs-annotations-java package
---
 debian/changelog                     |  1 +
 debian/control                       | 13 +++++++++++++
 debian/findbugs.poms                 |  1 -
 debian/poms/findbugs-annotations.pom |  2 +-
 debian/rules                         |  4 ++--
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4639c4f..6040050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ findbugs (3.1.0~preview2-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Depend on Java 8
     - Depend on libbcel-java (>= 6.0) (Closes: #832842)
+  * Moved the annotations to the libfindbugs-annotations-java package
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * debian/watch: Track the release tags on GitHub
   * Standards-Version updated to 3.9.8
diff --git a/debian/control b/debian/control
index 4db2737..6d8db39 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Depends: default-jre (>= 2:1.8) | java8-runtime,
          libbcel-java (>= 6.0),
          libcommons-lang-java (>= 2.4),
          libdom4j-java (>= 1.6.1),
+         libfindbugs-annotations-java,
          libjaxen-java (>= 1.1.1),
          libjcip-annotations-java,
          libjdepend-java (>= 2.9),
@@ -49,3 +50,15 @@ Description: Static java code analyzer to find bugs
  .
  Findbugs provides both GUI and command line interfaces and supports many
  bug patterns.
+
+Package: libfindbugs-annotations-java
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: findbugs (<< 3.1.0~)
+Replaces: findbugs (<< 3.1.0~)
+Description: Static java code analyzer to find bugs (Annotations)
+ Findbugs is a program which uses static analysis to look for bugs in Java
+ code. It can analyze programs compiled for any version of Java, from 1.0
+ to 1.8.
+ .
+ This package contains the Findbugs annotations.
diff --git a/debian/findbugs.poms b/debian/findbugs.poms
deleted file mode 100644
index 0e38661..0000000
--- a/debian/findbugs.poms
+++ /dev/null
@@ -1 +0,0 @@
-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
index 7c254af..516a8eb 100644
--- a/debian/poms/findbugs-annotations.pom
+++ b/debian/poms/findbugs-annotations.pom
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.code.findbugs</groupId>
     <artifactId>annotations</artifactId>
-    <version>3.0.1</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
     <url>http://findbugs.sourceforge.net/</url>
     <name>FindBugs-Annotations</name>
diff --git a/debian/rules b/debian/rules
index e32478f..e72ef5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,8 @@ override_dh_auto_install:
 	dh_install --sourcedir=$(CURDIR)
 	dh_link
 
-	mh_installpom -pfindbugs debian/poms/findbugs-annotations.pom
-	mh_installjar -pfindbugs debian/poms/findbugs-annotations.pom \
+	mh_installpom -plibfindbugs-annotations-java debian/poms/findbugs-annotations.pom
+	mh_installjar -plibfindbugs-annotations-java debian/poms/findbugs-annotations.pom \
 		--usj-name=findbugs-annotations -l lib/annotations.jar
 
 	# prepare findbugs.1

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