[clirr] 17/19: Build with maven-debian-helper instead of maven-ant-helper (Closes: #893105)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Mar 18 22:05:43 GMT 2018 

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

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

commit 0cf56abff475d627ca5da729a8c0c32e87afbf5d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 18 23:01:20 2018 +0100

    Build with maven-debian-helper instead of maven-ant-helper (Closes: #893105)
---
 debian/build.properties |   6 --
 debian/changelog        |   1 +
 debian/clean            |   1 +
 debian/clirr.poms       |   2 +-
 debian/control          |   4 +-
 debian/maven.properties |   1 +
 debian/pom.xml          | 242 +++++++++++++++++++++++++-----------------------
 debian/rules            |  27 ++----
 8 files changed, 135 insertions(+), 149 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 2490a42..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-javadoc.dir=build/docs/api
-maven.test.skip=true
-build.sourceDirectory=core/src/java
-build.resourcesDirectory=core/src/conf
-build.testDirectory=core/src/test
-
diff --git a/debian/changelog b/debian/changelog
index d275f25..dc7f8b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 clirr (0.6-6) UNRELEASED; urgency=medium
 
+  * Build with maven-debian-helper instead of maven-ant-helper (Closes: #893105)
   * Removed ant from the recommended dependencies
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d4f7111
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+pom.xml
diff --git a/debian/clirr.poms b/debian/clirr.poms
index 8ceb841..d6e6c06 100644
--- a/debian/clirr.poms
+++ b/debian/clirr.poms
@@ -1 +1 @@
-debian/pom.xml --no-parent --has-package-version
+pom.xml --no-parent --has-package-version --java-lib --usj-name=clirr
diff --git a/debian/control b/debian/control
index 66f7d1c..1743691 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,12 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- cdbs,
  debhelper (>= 9),
  default-jdk,
  libbcel-java,
  libcommons-cli-java,
  libcommons-lang-java,
- maven-ant-helper,
- maven-repo-helper
+ maven-debian-helper
 Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/clirr.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/clirr.git
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..93adf72
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+project.build.sourceEncoding=ISO-8859-1
diff --git a/debian/pom.xml b/debian/pom.xml
index 75c744a..860e0c4 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -1,123 +1,129 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<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/xsd/maven-4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>net.sf.clirr</groupId>
-	<artifactId>clirr-core</artifactId>
-	<version>0.6</version>
-	<packaging>jar</packaging><properties>
-		
-			<debian.ant.ant.originalVersion>1.5.3-1</debian.ant.ant.originalVersion>
-		
-			<debian.bcel.bcel.originalVersion>5.1</debian.bcel.bcel.originalVersion>
-		
-			<debian.commons-cli.commons-cli.originalVersion>1.0</debian.commons-cli.commons-cli.originalVersion>
-		
-			<debian.commons-lang.commons-lang.originalVersion>1.0.1</debian.commons-lang.commons-lang.originalVersion>
-		
-			<debian.originalVersion>0.6</debian.originalVersion>
-		
-			<debian.package>clirr</debian.package>
-	</properties>
-	
-	<name>Clirr</name>
-	<!-- details about the organization that 'owns' the project -->
-	<organization>
-		<name>Lars K�hne</name>
-		<url>mailto:clirr-devel at lists.sourceforge.net</url>
-	</organization>
-	<inceptionYear>2003</inceptionYear>
-	<description>Clirr is a tool that checks Java libraries for binary
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.clirr</groupId>
+  <artifactId>clirr-core</artifactId>
+  <name>Clirr</name>
+  <version>0.6</version>
+
+  <!-- details about the organization that 'owns' the project -->
+  <organization>
+    <name>Lars K�hne</name>
+    <url>mailto:clirr-devel at lists.sourceforge.net</url>
+  </organization>
+
+  <inceptionYear>2003</inceptionYear>
+  <description>
+    Clirr is a tool that checks Java libraries for binary
     compatibility with older releases. Basically you give it two sets
     of jar files and Clirr dumps out a list of changes in the public
     api. Clirr provides an Ant task that can be configured to break
     the build if it detects incompatible api changes. In a continuous
     integration process Clirr can automatically prevent accidental
-    introduction of binary compatibility problems in Java libraries.</description>
-	<url>http://clirr.sourceforge.net/</url>
-	<issueManagement>
-		<system>sourceforge</system>
-		<url>https://sourceforge.net/tracker/?group_id=89627&atid=590799</url>
-	</issueManagement>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous at cvs.sourceforge.net:/cvsroot/clirr:clirr/core</connection>
-		<url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/clirr/core</url>
-	</scm>
-	<mailingLists>
-		<mailingList>
-			<name>clirr-user</name>
-			<subscribe>http://lists.sourceforge.net/lists/listinfo/clirr-user</subscribe>
-			<unsubscribe>http://lists.sourceforge.net/lists/listinfo/clirr-user</unsubscribe>
-			<archive>http://lists.sourceforge.net/lists/listinfo/clirr-user</archive>
-		</mailingList>
-		<mailingList>
-			<name>clirr-devel</name>
-			<subscribe>http://lists.sourceforge.net/lists/listinfo/clirr-devel</subscribe>
-			<unsubscribe>http://lists.sourceforge.net/lists/listinfo/clirr-devel</unsubscribe>
-			<archive>http://lists.sourceforge.net/lists/listinfo/clirr-devel</archive>
-		</mailingList>
-	</mailingLists>
-	<developers>
-		<developer>
-			<name>Lars K�hne</name>
-			<id>lkuehne</id>
-			<organization>ppi Media</organization>
-			<timezone>+1</timezone>
-			<roles>
-				<role>Java Developer</role>
-				<role>Project Admin</role>
-			</roles>
-		</developer>
-		<developer>
-			<name>Vincent Massol</name>
-			<id>vmassol</id>
-			<organization>Apache Software Foundation</organization>
-			<timezone>+1</timezone>
-			<url>http://blogs.codehaus.org/people/vmassol</url>
-			<roles>
-				<role>Initial Inspiration and Feedback</role>
-				<role>Java Developer</role>
-				<role>Maven Guru</role>
-			</roles>
-		</developer>
-		<developer>
-			<name>Simon Kitching</name>
-			<id>s_kitching</id>
-			<organization>ECN</organization>
-			<timezone>+12</timezone>
-			<roles>
-				<role>Java Developer</role>
-			</roles>
-		</developer>
-	</developers>
-	<contributors>
-		<contributor>
-			<name>Stephen Colebourne</name>
-			<organization>Apache Software Foundation</organization>
-		</contributor>
-	</contributors>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.bcel</groupId>
-			<artifactId>bcel</artifactId>
-			<version>5.x</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>debian</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>debian</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>debian</version>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
+    introduction of binary compatibility problems in Java libraries.
+  </description>
+
+  <url>http://clirr.sourceforge.net/</url>
+  <issueManagement>
+    <system>sourceforge</system>
+    <url>https://sourceforge.net/tracker/?group_id=89627&atid=590799</url>
+  </issueManagement>
+
+  <scm>
+    <connection>scm:cvs:pserver:anonymous at cvs.sourceforge.net:/cvsroot/clirr:clirr/core</connection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/clirr/core</url>
+  </scm>
+
+  <mailingLists>
+    <mailingList>
+      <name>clirr-user</name>
+      <subscribe>http://lists.sourceforge.net/lists/listinfo/clirr-user</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/clirr-user</unsubscribe>
+      <archive>http://lists.sourceforge.net/lists/listinfo/clirr-user</archive>
+    </mailingList>
+    <mailingList>
+      <name>clirr-devel</name>
+      <subscribe>http://lists.sourceforge.net/lists/listinfo/clirr-devel</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/clirr-devel</unsubscribe>
+      <archive>http://lists.sourceforge.net/lists/listinfo/clirr-devel</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Lars K�hne</name>
+      <id>lkuehne</id>
+      <organization>ppi Media</organization>
+      <timezone>+1</timezone>
+      <roles>
+        <role>Java Developer</role>
+        <role>Project Admin</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <organization>Apache Software Foundation</organization>
+      <timezone>+1</timezone>
+      <url>http://blogs.codehaus.org/people/vmassol</url>
+      <roles>
+        <role>Initial Inspiration and Feedback</role>
+        <role>Java Developer</role>
+        <role>Maven Guru</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Simon Kitching</name>
+      <id>s_kitching</id>
+      <organization>ECN</organization>
+      <timezone>+12</timezone>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <contributors>
+    <contributor>
+      <name>Stephen Colebourne</name>
+      <organization>Apache Software Foundation</organization>
+    </contributor>
+  </contributors>
+
+  <dependencies>
+    <dependency>
+      <groupId>bcel</groupId>
+      <artifactId>bcel</artifactId>
+      <version>5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.5.3-1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>1.0.1</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>core/src/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>core/src/conf</directory>
+      </resource>
+    </resources>
+  </build>
+
+</project>
+
diff --git a/debian/rules b/debian/rules
index 8e3e28f..5f214a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=maven
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps bcel commons-cli commons-lang
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION) -Dpom.file=debian/pom.xml
+override_dh_auto_configure:
+	cp debian/pom.xml .
+	dh_auto_configure
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
-
-binary-post-install/$(PACKAGE)::
-	mh_installpoms -p$(PACKAGE)
-	mh_installjar -p$(PACKAGE) -l --usj-name=clirr debian/pom.xml build/clirr-core-$(VERSION).jar
-	mkdir -p debian/$(PACKAGE)/usr/share/clirr
-	install -m 755 debian/wrappers/clirr debian/$(PACKAGE)/usr/share/clirr
-	dh_link -p$(PACKAGE) usr/share/clirr/clirr usr/bin/clirr
-
-clean::
-	mh_clean
-	-rm -rf debian/tmp
+	-uscan --download-current-version --force-download --rename --repack
 
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/net/sf/clirr/clirr-core/$(VERSION)/clirr-core-$(VERSION).pom

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

More information about the pkg-java-commits mailing list