[Pkg-kde-commits] rev 2073 - branches/kde-3.4.0/packages/kdebindings/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-10-20 16:25:02 +0000 (Thu, 20 Oct 2005)
New Revision: 2073

Removed:
   branches/kde-3.4.0/packages/kdebindings/debian/java-blacklist.mk
Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
   branches/kde-3.4.0/packages/kdebindings/debian/control
   branches/kde-3.4.0/packages/kdebindings/debian/rules
Log:
So the DH_OPTION thingie does not play well with cdbs, since dh_whatever
-Npackage -ppackage fails with "I have no package to build". This may or
may not get fixed in debhelper in the future, but for the time being,
use the Architecture field in debian/control, which is not soooooo bad
either.


Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-20 16:11:25 UTC (rev 2072)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-20 16:25:02 UTC (rev 2073)
@@ -20,12 +20,17 @@
     upload closes: #332864, since we no longer build-depend on unavailable
     libgcj4-dev.
 
-  * Add arm and hppa to FUCKED_JAVA_ARCHS in java-blacklist.mk, since gij
+  * Do not build the Java bindings arm and hppa in addition to mips, since gij
     (needed to execute ecj) fails there. Other interpreters than gij may work
     there, but this will need time to investigate. Ideally, j-g-c-d above, or
     some other meta-package, should take care of linking java and javac to the
     right binaries...
 
+    Loose debian/mipsen.mk, because setting -Npackage in DH_OPTIONS no longer
+    works with cdbs (since dh_foo -Npackage -ppackage fails). Instead, list
+    allowed arches in debian/control, and use dh_listpackages -s to determine
+    whether to build java or not.
+
   * Build-depend on python-dev instead of python2.3-dev, and determine
     dependencies of python-dcop with dh_python's ${python:Depends}, so that a
     simple rebuild is enough to transition to a new default python version.

Modified: branches/kde-3.4.0/packages/kdebindings/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/control	2005-10-20 16:11:25 UTC (rev 2072)
+++ branches/kde-3.4.0/packages/kdebindings/debian/control	2005-10-20 16:25:02 UTC (rev 2073)
@@ -28,7 +28,7 @@
  This package is part of the official KDE bindings module.
 
 Package: libdcop3-jni
-Architecture: any
+Architecture: alpha amd64 i386 ia64 m68k powerpc s390 sparc
 Section: libs
 Depends: ${shlibs:Depends}
 Description: DCOP bindings for Java ( Native libraries )
@@ -40,7 +40,7 @@
  This package is part of the official KDE bindings module.
 
 Package: libdcop3-java-dev
-Architecture: any
+Architecture: alpha amd64 i386 ia64 m68k powerpc s390 sparc
 Section: libdevel
 Depends: libdcop3-java (>> ${KDE-Version3}), libdcop3-java (<< ${KDE-Next-Version3})
 Description: DCOP bindings for Java (dcopidl2java program)
@@ -67,7 +67,7 @@
  This package is part of the official KDE bindings module.
 
 Package: libqt3-jni
-Architecture: any
+Architecture: alpha amd64 i386 ia64 m68k powerpc s390 sparc
 Section: libs
 Depends: ${shlibs:Depends}
 Description: Java bindings for Qt ( Native libraries )
@@ -92,7 +92,7 @@
  This package is part of the official KDE bindings module.
 
 Package: libkde3-jni
-Architecture: any
+Architecture: alpha amd64 i386 ia64 m68k powerpc s390 sparc
 Section: libs
 Depends: ${shlibs:Depends}
 Description: kdelibs bindings for java ( Native libraries )

Deleted: branches/kde-3.4.0/packages/kdebindings/debian/java-blacklist.mk

Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-20 16:11:25 UTC (rev 2072)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-20 16:25:02 UTC (rev 2073)
@@ -5,11 +5,19 @@
 include debian/cdbs/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-WITH_JAVA = --with-java=/usr/lib/jvm/java-gcj
-
-include debian/java-blacklist.mk
 include debian/gcc4-blacklist.mk
 
+###
+
+ifneq (,$(shell dh_listpackages -s | grep libqt3-jni))
+    WITH_JAVA := --with-java=/usr/lib/jvm/java-gcj
+else
+    WITH_JAVA    := --without-java
+    WITHOUT_JAVA := 1
+endif
+
+###
+
 DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \
 		  	    DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'