[Pkg-utopia-commits] r3330 - in /packages/unstable/dbus-java/debian: changelog compat control rules

[mjj29 at users.alioth.debian.org]

Author: mjj29
Date: Sun Dec  6 11:19:52 2009
New Revision: 3330

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3330
Log:
new upstream release, dh7-ify

Modified:
    packages/unstable/dbus-java/debian/changelog
    packages/unstable/dbus-java/debian/compat
    packages/unstable/dbus-java/debian/control
    packages/unstable/dbus-java/debian/rules

Modified: packages/unstable/dbus-java/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/changelog?rev=3330&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/changelog (original)
+++ packages/unstable/dbus-java/debian/changelog Sun Dec  6 11:19:52 2009
@@ -1,3 +1,11 @@
+dbus-java (2.7-1) unstable; urgency=low
+
+  * New Upstream Release 
+  * Convert to dh 7
+  * Remove dependencies on locales
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sun, 06 Dec 2009 11:10:53 +0000
+
 dbus-java (2.6-1) unstable; urgency=low
 
   * New Upstream Release 

Modified: packages/unstable/dbus-java/debian/compat
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/compat?rev=3330&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/compat (original)
+++ packages/unstable/dbus-java/debian/compat Sun Dec  6 11:19:52 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/unstable/dbus-java/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/control?rev=3330&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/control (original)
+++ packages/unstable/dbus-java/debian/control Sun Dec  6 11:19:52 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Matthew Johnson <mjj29 at debian.org>
 Build-Depends: openjdk-6-jdk,
-               debhelper (>= 5.0.0),
+               debhelper (>= 7),
                docbook-to-man,
                tex4ht,
                libmatthew-debug-java,
@@ -14,8 +14,7 @@
                texlive-latex-recommended,
                classpath-doc,
                gettext,
-               locales,
-               javahelper
+               javahelper (>= 0.23)
 Standards-Version: 3.8.1
 
 Package: libdbus-java
@@ -36,7 +35,7 @@
 Package: dbus-java-bin
 Architecture: all
 Section: utils
-Depends: ${java:Depends}, ${misc:Depends}, libdbus-java (= ${binary:Version})
+Depends: ${java:Depends}, ${misc:Depends}
 Conflicts: libdbus-java (<< 2.0)
 Replaces: libdbus-java (<< 2.0)
 Description: simple interprocess messaging system (Java Binaries)

Modified: packages/unstable/dbus-java/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/rules?rev=3330&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/rules (original)
+++ packages/unstable/dbus-java/debian/rules Sun Dec  6 11:19:52 2009
@@ -3,21 +3,15 @@
 # Rules file to build dbus-java packages by Matthew Johnson
 #
 
-LOCALE_DIR=debian/locale
-LOCALE_NAME=en_GB
-LOCALE_CHARSET=UTF-8
 JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
-build: build-stamp
+%:
+	dh --with javahelper $@
 
-build-stamp: locale-stamp
-	dh_testdir
-	
+override_dh_auto_build:
 	# Add here commands to compile the package.
-	$(MAKE) LOCPATH="$(LOCALE_DIR)" \
-			  LC_ALL="$(LOCALE_NAME).$(LOCALE_CHARSET)" \
-			  DEBUG=disable \
-			  JCFLAGS="-O" \
+	$(MAKE) DEBUG=disable \
+			  JCFLAGS="-O -encoding UTF-8" \
 			  PREFIX=/usr \
 			  JAVA_HOME=${JAVA_HOME}/bin/ \
 			  JAVAC=${JAVA_HOME}/bin/javac \
@@ -28,53 +22,24 @@
 	
 	touch $@
 
-locale: locale-stamp
-
-locale-stamp:
-	dh_testdir
-	mkdir -p "$(LOCALE_DIR)"
-	localedef  -i "$(LOCALE_NAME)" -f "$(LOCALE_CHARSET)" "$(LOCALE_DIR)/$(LOCALE_NAME).$(LOCALE_CHARSET)"
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp locale-stamp
-	rm -rf "$(LOCALE_DIR)"
-	
+override_dh_auto_clean:
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
-	
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	
+override_dh_auto_install:
 	$(MAKE) DEBUG=disable \
 			  DESTDIR=$(CURDIR)/debian/tmp \
 			  PREFIX=/usr \
 			  install install-man install-doc
 	
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
+override_dh_install:
 	dh_install -i --sourcedir=debian/tmp
+override_jh_manifest:
 	jh_manifest -plibdbus-java -c"/usr/share/java/unix.jar /usr/share/java/hexdump.jar"
+override_jh_depends:
 	jh_depends -pdbus-java-bin -jopen
 	jh_depends -plibdbus-java 
+override_jh_compress:
 	dh_compress -i -X.pdf
-	dh_fixperms -i 
-	dh_installdeb -i 
-	dh_gencontrol -i 
-	dh_md5sums -i 
+override_dh_builddeb:
 	dh_builddeb -i -- -Zbzip2
-
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install