[pkg-java] r13522 - in trunk/jmdns/debian: . patches poms source

Sun Apr 10 21:45:24 UTC 2011

Author: ieugen-guest
Date: 2011-04-10 21:45:24 +0000 (Sun, 10 Apr 2011)
New Revision: 13522

Added:
   trunk/jmdns/debian/libjmdns-java.poms
   trunk/jmdns/debian/patches/
   trunk/jmdns/debian/patches/javaDocLink
   trunk/jmdns/debian/patches/series
   trunk/jmdns/debian/poms/
   trunk/jmdns/debian/poms/jmdns.pom
   trunk/jmdns/debian/source/
   trunk/jmdns/debian/source/format
Modified:
   trunk/jmdns/debian/changelog
   trunk/jmdns/debian/control
   trunk/jmdns/debian/rules
Log:
closes bug 620048,  moved to quilt, links JavaDoc to system doc


Modified: trunk/jmdns/debian/changelog
===================================================================

--- trunk/jmdns/debian/changelog	2011-04-10 21:20:32 UTC (rev 13521)
+++ trunk/jmdns/debian/changelog	2011-04-10 21:45:24 UTC (rev 13522)
@@ -1,3 +1,19 @@
+jmdns (3.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Package does not install Maven artifacts" (Closes: #620048)
+  * Enabled maven artifact deployment:
+    - debian/control: Build-Depends added maven-repo-helper
+    - debian/rules: install maven artifacts
+    - debian/libjmdns-java.poms: pom location for maven-repo-helper
+    - debian/poms/jmdns.pom: localised pom for maven
+   * switched to quilt
+     - debian/source/format: vesion 3
+     - debian/patches/javaDocLink: patch to link JavaDoc to system doc
+     - debian/patches/series: the series of patches
+
+ -- Ioan Eugen STAN <stan.ieugen at gmail.com>  Mon, 11 Apr 2011 00:42:54 +0300
+
 jmdns (3.1-1) unstable; urgency=low
 
   * New upstream.

Modified: trunk/jmdns/debian/control
===================================================================
--- trunk/jmdns/debian/control	2011-04-10 21:20:32 UTC (rev 13521)
+++ trunk/jmdns/debian/control	2011-04-10 21:45:24 UTC (rev 13522)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>> 7), javahelper, gcj-jdk, default-jdk
+Build-Depends: debhelper (>> 7), javahelper, gcj-jdk, default-jdk, maven-repo-helper
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jmdns
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jmdns/

Added: trunk/jmdns/debian/libjmdns-java.poms
===================================================================
--- trunk/jmdns/debian/libjmdns-java.poms	                        (rev 0)
+++ trunk/jmdns/debian/libjmdns-java.poms	2011-04-10 21:45:24 UTC (rev 13522)
@@ -0,0 +1 @@
+debian/poms/jmdns.pom

Added: trunk/jmdns/debian/patches/javaDocLink
===================================================================
--- trunk/jmdns/debian/patches/javaDocLink	                        (rev 0)
+++ trunk/jmdns/debian/patches/javaDocLink	2011-04-10 21:45:24 UTC (rev 13522)
@@ -0,0 +1,10 @@
+--- a/build.xml
++++ b/build.xml
+@@ -71,6 +71,7 @@
+        version="true"
+        header="JmDNS ${version}"
+        windowtitle="JmDNS">
++      <link href="/usr/share/doc/default-jdk-doc/api/" />
+       <fileset dir="${src}" defaultexcludes="yes">
+         <include name="javax/**/*.java"/>
+         <include name="com/**/*.java"/>

Added: trunk/jmdns/debian/patches/series
===================================================================
--- trunk/jmdns/debian/patches/series	                        (rev 0)
+++ trunk/jmdns/debian/patches/series	2011-04-10 21:45:24 UTC (rev 13522)
@@ -0,0 +1 @@
+javaDocLink

Added: trunk/jmdns/debian/poms/jmdns.pom
===================================================================
--- trunk/jmdns/debian/poms/jmdns.pom	                        (rev 0)
+++ trunk/jmdns/debian/poms/jmdns.pom	2011-04-10 21:45:24 UTC (rev 13522)
@@ -0,0 +1,20 @@
+<?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/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>jmdns</groupId>
+	<artifactId>jmdns</artifactId>
+	<version>3.1</version>
+	<name>JmDNS</name>
+	<description>JmDNS is a Java implementation of multi-cast DNS and can be used for service registration and discovery in local area networks. JmDNS is fully compatible with Apple's Rendezvous.</description>
+	<url>http://jmdns.sourceforge.net/</url>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+</project>

Modified: trunk/jmdns/debian/rules
===================================================================
--- trunk/jmdns/debian/rules	2011-04-10 21:20:32 UTC (rev 13521)
+++ trunk/jmdns/debian/rules	2011-04-10 21:45:24 UTC (rev 13522)
@@ -16,6 +16,7 @@
 UPSTREAM_SRC = jmdns-$(VER_FULL)
 DEBIAN_SRC_DIR = jmdns-$(VER_FULL)
 DEBIAN_SRC_TAR = jmdns_$(VER_FULL).orig.tar.gz
+PACKAGE = jmdns
 
 # Put depended upon jars in here
 # export CLASSPATH=
@@ -61,6 +62,8 @@
 	jh_installlibs -i
 	jh_manifest -i
 	jh_depends -i
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom $(PACKAGE).jar 
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -80,6 +83,5 @@
 	GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(UPSTREAM_SRC)
 
-
 binary: binary-indep binary-arch
 .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep

Added: trunk/jmdns/debian/source/format
===================================================================
--- trunk/jmdns/debian/source/format	                        (rev 0)
+++ trunk/jmdns/debian/source/format	2011-04-10 21:45:24 UTC (rev 13522)
@@ -0,0 +1 @@
+3.0 (quilt)


