[pkg-java] r11694 - trunk/jmdns/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-02-24 17:30:52 +0000 (Wed, 24 Feb 2010)
New Revision: 11694

Modified:
   trunk/jmdns/debian/changelog
   trunk/jmdns/debian/control
   trunk/jmdns/debian/rules
Log:
update jmdns to latest version

Modified: trunk/jmdns/debian/changelog
===================================================================
--- trunk/jmdns/debian/changelog	2010-02-24 11:14:15 UTC (rev 11693)
+++ trunk/jmdns/debian/changelog	2010-02-24 17:30:52 UTC (rev 11694)
@@ -1,3 +1,10 @@
+jmdns (3.1-1) unstable; urgency=low
+
+  * New upstream.
+  * Change gjdoc depends to gcj-jdk as suggested by lintian
+
+ -- Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com>  Wed, 24 Feb 2010 18:22:21 +0100
+
 jmdns (2.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #486697)

Modified: trunk/jmdns/debian/control
===================================================================
--- trunk/jmdns/debian/control	2010-02-24 11:14:15 UTC (rev 11693)
+++ trunk/jmdns/debian/control	2010-02-24 17:30:52 UTC (rev 11694)
@@ -3,15 +3,15 @@
 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 (>> 5), javahelper, gjdoc, default-jdk
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>> 7), javahelper, gcj-jdk, default-jdk
+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/
 Homepage: http://jmdns.sourceforge.net/
 
 Package: libjmdns-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: java1-runtime | java2-runtime, ${misc:Depends}
 Description: Java implementation of multi-cast DNS (Apple Rendezvous)
  JmDNS is a Java implementation of the IETF draft RFP multicast 
  extensions for DNS.
@@ -22,6 +22,7 @@
 Package: libjmdns-java-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: The Java implementation of multi-cast DNS documentation
  JmDNS is a Java implementation of the IETF draft RFP multicast 
  extensions for DNS.

Modified: trunk/jmdns/debian/rules
===================================================================
--- trunk/jmdns/debian/rules	2010-02-24 11:14:15 UTC (rev 11693)
+++ trunk/jmdns/debian/rules	2010-02-24 17:30:52 UTC (rev 11694)
@@ -11,11 +11,8 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-VER_MAJOR = 3
-VER_MINOR = 0
+VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
 
-VER_FULL = $(VER_MAJOR).$(VER_MINOR)
-
 UPSTREAM_SRC = jmdns-$(VER_FULL)
 DEBIAN_SRC_DIR = jmdns-$(VER_FULL)
 DEBIAN_SRC_TAR = jmdns_$(VER_FULL).orig.tar.gz
@@ -80,6 +77,8 @@
 	unzip -q $(UPSTREAM_SRC).zip
 	# Also remove pre-generated Javadoc
 	rm -rf $(UPSTREAM_SRC)/docs/
+	# Remove pre-generated jar file:
+	rm -rf $(UPSTREAM_SRC)/lib/jmdns.jar
 	GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(UPSTREAM_SRC)