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

[mjj29 at users.alioth.debian.org]

Author: mjj29
Date: Tue Jul 15 19:27:13 2008
New Revision: 2357

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2357
Log:
openjdk

Modified:
    packages/unstable/dbus-java/debian/changelog
    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=2357&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/changelog (original)
+++ packages/unstable/dbus-java/debian/changelog Tue Jul 15 19:27:13 2008
@@ -1,3 +1,9 @@
+dbus-java (2.5-2) unstable; urgency=low
+
+  * Change to depend on openjdk and move to main from contrib 
+
+ -- Matthew Johnson <mjj29 at debian.org>  Tue, 15 Jul 2008 20:19:23 +0100
+
 dbus-java (2.5-1) unstable; urgency=low
 
   * New Upstream Release

Modified: packages/unstable/dbus-java/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/control?rev=2357&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/control (original)
+++ packages/unstable/dbus-java/debian/control Tue Jul 15 19:27:13 2008
@@ -1,8 +1,8 @@
 Source: dbus-java
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Matthew Johnson <mjj29 at debian.org>
-Build-Depends: sun-java6-jdk,
+Build-Depends: openjdk-6-jdk,
                debhelper (>= 5.0.0),
                docbook-to-man,
                tex4ht,
@@ -19,7 +19,7 @@
 
 Package: libdbus-java
 Architecture: all
-Section: contrib/libs
+Section: libs
 Depends: ${java:Depends}, ${misc:Depends}
 Suggests: libdbus-java-doc
 Recommends: dbus-java-bin
@@ -34,7 +34,7 @@
 
 Package: dbus-java-bin
 Architecture: all
-Section: contrib/utils
+Section: utils
 Depends: ${java:Depends}, ${misc:Depends}, libdbus-java (= ${binary:Version})
 Conflicts: libdbus-java (<< 2.0)
 Replaces: libdbus-java (<< 2.0)
@@ -54,7 +54,7 @@
 Recommends: libdbus-java
 Depends: classpath-doc, ${misc:Depends}
 Architecture: all
-Section: contrib/doc
+Section: doc
 Description: simple interprocess messaging system (Java interface documentation)
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in

Modified: packages/unstable/dbus-java/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/rules?rev=2357&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/rules (original)
+++ packages/unstable/dbus-java/debian/rules Tue Jul 15 19:27:13 2008
@@ -6,7 +6,7 @@
 LOCALE_DIR=debian/locale
 LOCALE_NAME=en_GB
 LOCALE_CHARSET=UTF-8
-JAVA_HOME=/usr/lib/jvm/java-6-sun
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 build: build-stamp
 
@@ -24,7 +24,7 @@
 			  JAVA=${JAVA_HOME}/bin/java \
 			  JAR=${JAVA_HOME}/bin/jar \
 			  JAVADOC="${JAVA_HOME}/bin/javadoc -link /usr/share/doc/classpath-doc/api" \
-			  all doc #check (not until they fix gij to actually be able to run this shit. Client stuff might run soon, DBusDaemon still doesn't)
+			  all doc check 
 	
 	touch $@
 
@@ -64,7 +64,7 @@
 	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_install -i --sourcedir=debian/tmp
-	jh_depends -pdbus-java-bin -jsun
+	jh_depends -pdbus-java-bin -jopen
 	jh_depends -plibdbus-java 
 	dh_compress -i -X.pdf
 	dh_fixperms -i