[jnr-x86asm] 01/06: add patch to disable sonatype parent in pom

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jnr-x86asm.

commit eecedd4f57b61650b61795f2a30d0759645079bb
Author: tony mancill <tmancill at debian.org>
Date:   Wed Nov 26 22:13:44 2014 -0800

    add patch to disable sonatype parent in pom
    
    simplify debian/rules
---
 debian/control                  |  9 +++++++--
 debian/patches/01_pom_xml.patch | 18 ++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  7 +------
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index f2e0d6c..c2de526 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,13 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>,
  tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, maven-repo-helper
-Build-Depends-Indep: ant-optional, default-jdk
+Build-Depends: debhelper (>= 9),
+ cdbs,
+ maven-repo-helper,
+ maven-debian-helper,
+ ant-optional,
+ default-jdk,
+ junit4
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jnr-x86asm.git
 Vcs-Browser: http://anonscm.debian.org/cgit/?p=pkg-java/jnr-x86asm.git
diff --git a/debian/patches/01_pom_xml.patch b/debian/patches/01_pom_xml.patch
new file mode 100644
index 0000000..0cd14db
--- /dev/null
+++ b/debian/patches/01_pom_xml.patch
@@ -0,0 +1,18 @@
+Description: Disable sonatype <parent> in pom.xml
+Author: tony mancill <tmancill at debian.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -1,10 +1,12 @@
+ <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>
++  <!--  disable sonatype parent pom
+   <parent>
+     <groupId>org.sonatype.oss</groupId>
+     <artifactId>oss-parent</artifactId>
+     <version>7</version>
+   </parent>
++  -->
+ 
+   <groupId>com.github.jnr</groupId>
+   <artifactId>jnr-x86asm</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5025d71
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_pom_xml.patch
diff --git a/debian/rules b/debian/rules
index 663aa73..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS  := ant-nodeps
-
-install/libjnr-x86asm-java::
-	mh_installpom -plibjnr-x86asm-java pom.xml
-	mh_installjar -plibjnr-x86asm-java pom.xml -l dist/jnr-x86asm.jar
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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