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

[Mathieu Malaterre]

Author: malat
Date: 2012-04-10 17:15:50 +0000 (Tue, 10 Apr 2012)
New Revision: 15934

Added:
   trunk/jmdns/debian/javabuild
Modified:
   trunk/jmdns/debian/changelog
   trunk/jmdns/debian/control
   trunk/jmdns/debian/rules
Log:
Update to new release

Modified: trunk/jmdns/debian/changelog
===================================================================
--- trunk/jmdns/debian/changelog	2012-04-10 12:51:04 UTC (rev 15933)
+++ trunk/jmdns/debian/changelog	2012-04-10 17:15:50 UTC (rev 15934)
@@ -2,8 +2,10 @@
 
   * New upstream: 3.4.1.
   * Fix d/copyright lintian reports
+  * Simplify d/rules
+  * Bump Std-Vers to 3.9.3, no changes needed
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 12 Dec 2011 15:13:39 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 10 Apr 2012 18:42:21 +0200
 
 jmdns (3.4.0-2) unstable; urgency=low
 

Modified: trunk/jmdns/debian/control
===================================================================
--- trunk/jmdns/debian/control	2012-04-10 12:51:04 UTC (rev 15933)
+++ trunk/jmdns/debian/control	2012-04-10 17:15:50 UTC (rev 15934)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>, 
+Uploaders: Mathieu Malaterre <malat at debian.org>, 
  James Page <james.page at ubuntu.com>
-Build-Depends: debhelper (>> 7), javahelper, gcj-jdk, default-jdk, maven-repo-helper
+Build-Depends: debhelper (>= 7.0.50~), javahelper, gcj-jdk, default-jdk, maven-repo-helper
 Build-Depends-Indep: junit4, libeasymock-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jmdns
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jmdns/
 Homepage: http://jmdns.sourceforge.net/

Added: trunk/jmdns/debian/javabuild
===================================================================
--- trunk/jmdns/debian/javabuild	                        (rev 0)
+++ trunk/jmdns/debian/javabuild	2012-04-10 17:15:50 UTC (rev 15934)
@@ -0,0 +1 @@
+jmdns.jar src

Modified: trunk/jmdns/debian/rules
===================================================================
--- trunk/jmdns/debian/rules	2012-04-10 12:51:04 UTC (rev 15933)
+++ trunk/jmdns/debian/rules	2012-04-10 17:15:50 UTC (rev 15934)
@@ -1,75 +1,22 @@
 #!/usr/bin/make -f
-#
-# Sample debian/rules that uses javahelper.
-# This file was generated by jh_makepkg and may be used
-# without restriction. It was inspired by the dh-make
-# sample debian/rules
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-#include /usr/share/cdbs/1/rules/debhelper.mk
 
 export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/junit4.jar:/usr/share/java/easymock.jar
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
-
 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=/usr/share/java/junit4.jar:/usr/share/java/easymock.jar
+%:
+	dh $@ --with javahelper
 
-build: build-arch-stamp build-indep-stamp
-build-arch: build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:
-	dh_testdir
-	# Build the package
-	jh_build jmdns.jar src
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	jh_build --clean
-	dh_clean
-	mh_clean
-	rm -f build-arch-stamp build-indep-stamp jmdns*.jar
-
-install-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-binary-arch: build-arch
-	# Java packages are arch: all, nothing to do here
-
-binary-indep: build-indep install-indep
-	# Create the package here
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install -i
-	dh_installdocs -i
-	dh_installchangelogs -i CHANGELOG.txt
-	dh_javadoc -Nlibjmdns-java -plibjmdns-java-doc -i --sourcedir=src 
-	jh_manifest -i
-	jh_depends -i
+override_dh_install:
 	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
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+	dh_javadoc -Nlibjmdns-java -plib$(PACKAGE)-java-doc -i --sourcedir=src 
 
 $(UPSTREAM_SRC).zip:
 	wget http://voxel.dl.sourceforge.net/sourceforge/jmdns/$@
@@ -88,6 +35,3 @@
 	mkdir -p debian/poms
 	wget -O debian/poms/jmdns.pom -U NoAgent-1.0 \
 		http://repo1.maven.org/maven2/javax/jmdns/jmdns/$(VER_FULL)/jmdns-$(VER_FULL).pom
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep