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

[mjj29 at users.alioth.debian.org]

Author: mjj29
Date: Tue Jan 29 23:40:04 2008
New Revision: 2070

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2070
Log:
when the latest HEAD is uploaded we will build and run (most stuff) with free VMs. Woo

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

Modified: packages/unstable/dbus-java/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-java/debian/control?rev=2070&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/control (original)
+++ packages/unstable/dbus-java/debian/control Tue Jan 29 23:40:04 2008
@@ -1,5 +1,5 @@
 Source: dbus-java
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Matthew Johnson <mjj29 at debian.org>
 Build-Depends: java-gcj-compat-dev,
@@ -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,8 +34,9 @@
 
 Package: dbus-java-bin
 Architecture: all
-Section: contrib/utils
+Section: utils
 Depends: ${java:Depends}, ${misc:Depends}
+Suggests: sun-java5-jre | sun-java6-jre
 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=2070&op=diff
==============================================================================
--- packages/unstable/dbus-java/debian/rules (original)
+++ packages/unstable/dbus-java/debian/rules Tue Jan 29 23:40:04 2008
@@ -6,6 +6,7 @@
 LOCALE_DIR=debian/locale
 LOCALE_NAME=en_GB
 LOCALE_CHARSET=UTF-8
+JAVA_HOME=/usr/lib/jvm/java-gcj
 
 build: build-stamp
 
@@ -18,12 +19,12 @@
 			  DEBUG=disable \
 			  JCFLAGS="-source 5.0 -O" \
 			  PREFIX=/usr \
-			  JAVA_HOME=/usr/lib/jvm/java-gcj/bin/ \
-			  JAVAC=/usr/lib/jvm/java-gcj/bin/javac \
-			  JAVA=/usr/lib/jvm/java-gcj/bin/java \
-			  JAR=/usr/lib/jvm/java-gcj/bin/jar \
-			  JAVADOC="/usr/lib/jvm/java-gcj/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)
+			  JAVA_HOME=${JAVA_HOME}/bin/ \
+			  JAVAC=${JAVA_HOME}/bin/javac \
+			  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 runs, DBusDaemon still doesn't)
 	
 	touch $@
 
@@ -63,7 +64,7 @@
 	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_install -i --sourcedir=debian/tmp
-	jh_depends -p dbus-java-bin -j sun
+	jh_depends -p dbus-java-bin -j
 	jh_depends -p libdbus-java 
 	dh_compress -i -X.pdf
 	dh_fixperms -i