[findbugs] 13/18: Moved the core library and the Ant tasks to distinct packages (Closes: #808707)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 10 17:55:48 UTC 2016


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

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

commit 7dfe543c25f9e104af913ce058fad7f255c6521d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 10 18:31:27 2016 +0200

    Moved the core library and the Ant tasks to distinct packages (Closes: #808707)
---
 debian/changelog             |   3 +-
 debian/control               |  44 +++--
 debian/findbugs.install      |   2 -
 debian/findbugs.poms         |  30 ++++
 debian/maven.ignoreRules     |   2 +
 debian/maven.rules           |   3 +
 debian/poms/findbugs-ant.pom | 159 ++++++++++++++++++
 debian/poms/findbugs.pom     | 377 +++++++++++++++++++++++++++++++++++++++++++
 debian/rules                 |   9 +-
 9 files changed, 610 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d132f5c..eb696b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ 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
+  * Moved the core library, the annotations and the Ant tasks to distinct
+    packages (Closes: #808707)
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Removed junit4 and jdepend from the runtime dependencies
   * debian/rules: Generate the man pages during the build phase
diff --git a/debian/control b/debian/control
index 0ed5530..c7b58e2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: ant,
                libjaxen-java (>= 1.1.1),
                libjcip-annotations-java,
                libjdepend-java (>= 2.9),
-               libjformatstring-java (>= 0.10~20081016-2),
+               libjformatstring-java (>= 0.10~20131207-2~),
                libjsr305-java,
                libsaxon-java,
                maven-repo-helper
@@ -30,16 +30,9 @@ Homepage: http://findbugs.sourceforge.net
 Package: findbugs
 Architecture: all
 Depends: default-jre (>= 2:1.8) | java8-runtime,
+         libfindbugs-ant-java,
+         libfindbugs-java,
          java-wrappers,
-         libasm-java (>= 5.0),
-         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,
-         libjformatstring-java (>= 0.10~20081016-2),
-         libjsr305-java,
          ${misc:Depends}
 Description: Static java code analyzer to find bugs
  Findbugs is a program which uses static analysis to look for bugs in Java
@@ -49,6 +42,25 @@ Description: Static java code analyzer to find bugs
  Findbugs provides both GUI and command line interfaces and supports many
  bug patterns.
 
+Package: libfindbugs-java
+Architecture: all
+Depends: libasm-java (>= 5.0),
+         libcommons-lang-java (>= 2.4),
+         libbcel-java (>= 6.0),
+         libdom4j-java (>= 1.6.1),
+         libjaxen-java (>= 1.1.1),
+         libjcip-annotations-java, libjsr305-java,
+         libjformatstring-java (>= 0.10~20131207-2~),
+         ${misc:Depends}
+Breaks: findbugs (<< 3.1.0~)
+Replaces: findbugs (<< 3.1.0~)
+Description: Static java code analyzer to find bugs (Library)
+ 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 library.
+
 Package: libfindbugs-annotations-java
 Architecture: all
 Depends: ${misc:Depends}
@@ -60,3 +72,15 @@ Description: Static java code analyzer to find bugs (Annotations)
  to 1.8.
  .
  This package contains the Findbugs annotations.
+
+Package: libfindbugs-ant-java
+Architecture: all
+Depends: libfindbugs-java, ${misc:Depends}
+Breaks: findbugs (<< 3.1.0~)
+Replaces: findbugs (<< 3.1.0~)
+Description: Static java code analyzer to find bugs (Ant tasks)
+ 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 Ant tasks.
diff --git a/debian/findbugs.install b/debian/findbugs.install
index e848b36..bcc3f02 100644
--- a/debian/findbugs.install
+++ b/debian/findbugs.install
@@ -23,5 +23,3 @@ bin/unionBugs usr/bin/
 bin/xpathFind usr/bin/
 lib/bug-logo.icns usr/share/findbugs/lib
 lib/buggy.icns usr/share/findbugs/lib
-lib/findbugs-ant.jar usr/share/java
-lib/findbugs.jar usr/share/java
diff --git a/debian/findbugs.poms b/debian/findbugs.poms
new file mode 100644
index 0000000..fbd78ba
--- /dev/null
+++ b/debian/findbugs.poms
@@ -0,0 +1,30 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+debian/poms/findbugs.pom             --java-lib --usj-name=findbugs             --artifact=lib/findbugs.jar     --package=libfindbugs-java
+debian/poms/findbugs-annotations.pom --java-lib --usj-name=findbugs-annotations --artifact=lib/annotations.jar  --package=libfindbugs-annotations-java
+debian/poms/findbugs-ant.pom         --java-lib --usj-name=findbugs-ant         --artifact=lib/findbugs-ant.jar --package=libfindbugs-ant-java
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..270ed21
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+com.apple AppleJavaExtensions * * * *
+junit junit * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8f7a0b4
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+
+s/com.google.code.findbugs/org.apache.bcel/ s/bcel-findbugs/bcel/ * s/.*/5.x/ * *
+com.google.code.findbugs jsr305 * s/.*/0.x/ * *
diff --git a/debian/poms/findbugs-ant.pom b/debian/poms/findbugs-ant.pom
new file mode 100644
index 0000000..73b4d06
--- /dev/null
+++ b/debian/poms/findbugs-ant.pom
@@ -0,0 +1,159 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.google.code.findbugs</groupId>
+	<artifactId>findbugs-ant</artifactId>
+	<version>3.1.0</version>
+	<packaging>jar</packaging>
+	<url>http://findbugs.sourceforge.net/</url>
+	<name>FindBugs-AntTask</name>
+	<description>AntTask to run Findbugs</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:git:http://code.google.com/p/findbugs/</connection>
+    <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection>
+    <url>https://code.google.com/p/findbugs/</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>bp</id>
+      <name>Bill Pugh</name>
+      <email>pugh at cs.umd.edu</email>
+      <url>http://www.cs.umd.edu/~pugh/</url>
+      <roles>
+        <role>Project Lead</role>
+        <role>Primary Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>al</id>
+      <name>Andrey Loskutov</name>
+      <email>Loskutov at gmx.de</email>
+      <url>http://andrei.gmxhome.de/privat.html</url>
+      <roles>
+        <role>Eclipse plugin</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>bp</id>
+      <name>Keith Lea</name>
+      <email></email>
+      <url>http://keithlea.com/</url>
+      <roles>
+        <role>web cloud</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Garvin LeClaire</name>
+      <email>garvin.leclaire at gmail.com</email>
+      <url></url>
+      <roles>
+        <role>Maven</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>David H. Hovemeyer</name>
+      <email>dhovemey at ycp.edu</email>
+      <url>http://goose.ycp.edu/~dhovemey/</url>
+      <roles>
+        <role>project founder</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Nay Ayewah</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Ben Langmead</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Tomas Pollak</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role>Eclipse plugin tests</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Phil Crosby</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Peter Friese</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role>Eclipse plugin</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Dave Brosius</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Brian Goetz</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Rohan Lloyd</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+  </contributors>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>findbugs</artifactId>
+			<version>3.0.0</version>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/debian/poms/findbugs.pom b/debian/poms/findbugs.pom
new file mode 100644
index 0000000..7f6e19f
--- /dev/null
+++ b/debian/poms/findbugs.pom
@@ -0,0 +1,377 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+    <relativePath />
+  </parent>
+
+  <groupId>com.google.code.findbugs</groupId>
+  <artifactId>findbugs</artifactId>
+  <version>3.0.1</version>
+  <packaging>jar</packaging>
+
+  <url>http://findbugs.sourceforge.net/</url>
+  <name>FindBugs-Project</name>
+  <description>Findbugs: Because it's easy!</description>
+  <inceptionYear>2003</inceptionYear>
+  <licenses>
+    <license>
+      <name>GNU Lesser Public License</name>
+      <url>http://www.gnu.org/licenses/lgpl.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
+
+  <scm>
+    <connection>scm:git:http://code.google.com/p/findbugs/</connection>
+    <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection>
+    <url>https://code.google.com/p/findbugs/</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>bp</id>
+      <name>Bill Pugh</name>
+      <email>pugh at cs.umd.edu</email>
+      <url>http://www.cs.umd.edu/~pugh/</url>
+      <roles>
+        <role>Project Lead</role>
+        <role>Primary Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>al</id>
+      <name>Andrey Loskutov</name>
+      <email>Loskutov at gmx.de</email>
+      <url>http://andrei.gmxhome.de/privat.html</url>
+      <roles>
+        <role>Eclipse plugin</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>bp</id>
+      <name>Keith Lea</name>
+      <email />
+      <url>http://keithlea.com/</url>
+      <roles>
+        <role>web cloud</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Garvin LeClaire</name>
+      <email>gleclaire at codehaus.org</email>
+      <url>http://gdleclaire.blogspot.com</url>
+      <roles>
+        <role>Maven</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>David H. Hovemeyer</name>
+      <email>dhovemey at ycp.edu</email>
+      <url>http://goose.ycp.edu/~dhovemey/</url>
+      <roles>
+        <role>project founder</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Nay Ayewah</name>
+      <email />
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Ben Langmead</name>
+      <email />
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Tomas Pollak</name>
+      <email />
+      <url />
+      <roles>
+        <role>Eclipse plugin tests</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Phil Crosby</name>
+      <email />
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Peter Friese</name>
+      <email />
+      <url />
+      <roles>
+        <role>Eclipse plugin</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Dave Brosius</name>
+      <email />
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Brian Goetz</name>
+      <email />
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Rohan Lloyd</name>
+      <email />
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Tagir Valeev</name>
+      <email>lany at ngs.ru</email>
+      <url />
+      <roles>
+        <role />
+      </roles>
+      <timezone>+6</timezone>
+    </contributor>
+  </contributors>
+
+  <properties>
+    <asmVersion>5.0.2</asmVersion>
+    <junitVersion>4.11</junitVersion>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>bcel-findbugs</artifactId>
+      <version>6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jFormatString</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-debug-all</artifactId>
+      <version>${asmVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>${asmVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>com.apple</groupId>
+      <artifactId>AppleJavaExtensions</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junitVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.1.6</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>icu4j</artifactId>
+          <groupId>com.ibm.icu</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>${basedir}/src/java</sourceDirectory>
+    <testSourceDirectory>${basedir}/src/junit</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>${basedir}/etc</directory>
+        <includes>
+          <include>*.xsd</include>
+          <include>bugrank.txt</include>
+          <include>findbugs.xml</include>
+          <include>messages*.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/xsl</directory>
+        <includes>
+          <include>*.xsl</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/antTask</directory>
+        <includes>
+          <include>**/*.xsl</include>
+          <include>**/*.properties</include>
+          <include>**/*.db</include>
+          <include>**/*.png</include>
+          <include>**/*.html</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/gui</directory>
+        <includes>
+          <include>**/*.xsl</include>
+          <include>**/*.properties</include>
+          <include>**/*.db</include>
+          <include>**/*.png</include>
+          <include>**/*.html</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/java</directory>
+        <includes>
+          <include>**/*.xsl</include>
+          <include>**/*.properties</include>
+          <include>**/*.db</include>
+          <include>**/*.png</include>
+          <include>**/*.html</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.9.1</version>
+          <executions>
+              <execution>
+                  <phase>generate-sources</phase>
+                  <goals><goal>add-source</goal></goals>
+                  <configuration>
+                      <sources>
+                          <source>src/antTask</source>
+                          <source>src/tools</source>
+                          <source>src/gui</source>
+                      </sources>
+                  </configuration>
+              </execution>
+          </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+          <excludes>
+            <exclude>**/junit/**</exclude>
+            <exclude>**/infonodeJava/**</exclude>
+            <exclude>**/obsolete/**</exclude>
+          </excludes>
+          <testExcludes>
+            <exclude>**/architecture/**</exclude>
+            <exclude>**/cloud/**</exclude>
+            <exclude>**/DetectorsTest.java</exclude>
+          </testExcludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <archive>
+            <manifestFile>${basedir}/etc/MANIFEST-findbugs.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>deploy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/debian/rules b/debian/rules
index 1132f54..5ce6b6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DH_VERBOSE=1
 #JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
-	dh $@ --with maven_repo_helper
+	dh $@ --with maven-repo-helper
 
 override_dh_auto_build:
 	ant docs build -Dant.java.version=1.8
@@ -16,6 +16,8 @@ override_dh_auto_build:
 	help2man -h "-textui" -v "-version" -n "Static Java Code Analyzer" ./bin/findbugs -o debian/findbugs.1
 
 override_dh_auto_install:
+	dh_auto_install
+
 	chmod -x $(CURDIR)/bin/findbugs.ico
 
 	mkdir -p $(CURDIR)/debian/findbugs/usr/bin
@@ -23,10 +25,6 @@ override_dh_auto_install:
 	dh_install --sourcedir=$(CURDIR)
 	dh_link
 
-	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
-
 override_dh_auto_clean:
 	rm -f $(CURDIR)/debian/findbugs.1 $(CURDIR)/debian/fb.1
 	rm -f lib/*.jar
@@ -37,4 +35,3 @@ override_dh_auto_clean:
 override_dh_auto_test:
 	ant test -Dant.java.version=1.8
 	dh_auto_test
-

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



More information about the pkg-java-commits mailing list