[Pkg-kde-commits] rev 252 - in people/dato/packages/trunk/kdebindings/debian: . patches

[Adeodato Sim??]

Author: dato-guest
Date: 2004-11-13 16:50:47 -0700 (Sat, 13 Nov 2004)
New Revision: 252

Modified:
   people/dato/packages/trunk/kdebindings/debian/changelog
   people/dato/packages/trunk/kdebindings/debian/control
   people/dato/packages/trunk/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
   people/dato/packages/trunk/kdebindings/debian/rules
Log:
Preparing kdebindings 3.3.1-2 packages, new changelog entries being:

  * Don't build java packages on mipsen, since gcj is not available there (and
    gcj-3.4 will be removed soon). Changes needed:

    - debian/control: add "[!mips !mipsel]" stanzas to Build-Depends entries
      for gij, gcj, libgcj4-dev and fastjar.

    - debian/rules: exclude libdcop3-jni, libqt3-jni and libkde3-jni (via
      appropriate -N arguments in DH_OPTIONS) when $DEB_BUILD_GNU_TYPE is mips
      or mipsel. (Change done here and not in debian/control's Architecture:
      field for the benefit of unofficial architectures.)

  * Fix build failure on machines with a lower limit on argument list length,
    e.g. q650 on the m68k buildd network. Modify the already existing patch
    030-koala-makefile-too-much-arguments.diff to apply the same changes to
    qtjava/javalib/org/kde/qt/Makefile.in.



Modified: people/dato/packages/trunk/kdebindings/debian/changelog
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/changelog	2004-11-12 22:39:12 UTC (rev 251)
+++ people/dato/packages/trunk/kdebindings/debian/changelog	2004-11-13 23:50:47 UTC (rev 252)
@@ -1,3 +1,23 @@
+kdebindings (4:3.3.1-2) unstable; urgency=low
+
+  * Don't build java packages on mipsen, since gcj is not available there (and
+    gcj-3.4 will be removed soon). Changes needed:
+
+    - debian/control: add "[!mips !mipsel]" stanzas to Build-Depends entries
+      for gij, gcj, libgcj4-dev and fastjar.
+
+    - debian/rules: exclude libdcop3-jni, libqt3-jni and libkde3-jni (via
+      appropriate -N arguments in DH_OPTIONS) when $DEB_BUILD_GNU_TYPE is mips
+      or mipsel. (Change done here and not in debian/control's Architecture:
+      field for the benefit of unofficial architectures.)
+
+  * Fix build failure on machines with a lower limit on argument list length,
+    e.g. q650 on the m68k buildd network. Modify the already existing patch
+    030-koala-makefile-too-much-arguments.diff to apply the same changes to
+    qtjava/javalib/org/kde/qt/Makefile.in.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Sat, 13 Nov 2004 23:58:07 +0100
+
 kdebindings (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release plus KDE_3_3_BRANCH update.

Modified: people/dato/packages/trunk/kdebindings/debian/control
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/control	2004-11-12 22:39:12 UTC (rev 251)
+++ people/dato/packages/trunk/kdebindings/debian/control	2004-11-13 23:50:47 UTC (rev 252)
@@ -1,5 +1,5 @@
 Source: kdebindings
-Build-Depends: binutils-dev, debhelper (>> 4.0.0), gawk, gettext, gij, gcj, libgcj4-dev, fastjar, kdelibs4-dev (>= 4:3.3.1), libglib1.2-dev, libgtk1.2-dev, python2.3-dev, perl (>= 5.6.0-16), libqt3-compat-headers (>= 3:3.3.3), sharutils, ruby, ruby1.8-dev
+Build-Depends: binutils-dev, debhelper (>> 4.0.0), gawk, gettext, gij [!mips !mipsel], gcj [!mips !mipsel], libgcj4-dev [!mips !mipsel], fastjar [!mips !mipsel], kdelibs4-dev (>= 4:3.3.1), libglib1.2-dev, libgtk1.2-dev, python2.3-dev, perl (>= 5.6.0-16), libqt3-compat-headers (>= 3:3.3.3), sharutils, ruby, ruby1.8-dev
 Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>

Modified: people/dato/packages/trunk/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2004-11-12 22:39:12 UTC (rev 251)
+++ people/dato/packages/trunk/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2004-11-13 23:50:47 UTC (rev 252)
@@ -1,6 +1,6 @@
 --- kdebindings/kdejava/koala/org/kde/koala/Makefile.in
 +++ kdebindings/kdejava/koala/org/kde/koala/Makefile.in
-@@ -427,8 +427,7 @@
+@@ -426,8 +426,7 @@
  uninstall-info-am:
  
  classnoinst.stamp: $(noinst_JAVA)
@@ -10,3 +10,15 @@
  	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
  	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
  	else :; fi
+--- kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
++++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
+@@ -426,8 +426,7 @@
+ uninstall-info-am:
+ 
+ classnoinst.stamp: $(noinst_JAVA)
+-	@if test -n "$?"; then \
+-	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
++	if test -n "$?"; then \
+ 	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
+ 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
+ 	else :; fi

Modified: people/dato/packages/trunk/kdebindings/debian/rules
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/rules	2004-11-12 22:39:12 UTC (rev 251)
+++ people/dato/packages/trunk/kdebindings/debian/rules	2004-11-13 23:50:47 UTC (rev 252)
@@ -56,3 +56,11 @@
 			    libdcop3-java-dev libdcop3-java \
 			    libsmokekde-dev libsmokeqt-dev \
 			    kjscmd libkjsembed-dev
+
+# Override DH_OPTIONS to exclude jni packages in mipsen.
+FUCKED_GCJ_ARCHS = mips mipsel
+DEB_HOST_ARCH   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(FUCKED_GCJ_ARCHS)))
+  override DH_OPTIONS += -Nlibdcop3-jni -Nlibqt3-jni -Nlibkde3-jni
+endif