[Pkg-kde-commits] rev 2185 - kde-extras/ksubtile/trunk/debian

[Isaac Clerencia]

Author: isaac
Date: 2005-11-11 11:21:58 +0000 (Fri, 11 Nov 2005)
New Revision: 2185

Modified:
   kde-extras/ksubtile/trunk/debian/changelog
   kde-extras/ksubtile/trunk/debian/control
   kde-extras/ksubtile/trunk/debian/rules
Log:
Fix FTBFS in m68k, arm and hppa
Teh upstream package no longer includes the ksubtile_client thing, so need
to remove it now


Modified: kde-extras/ksubtile/trunk/debian/changelog
===================================================================
--- kde-extras/ksubtile/trunk/debian/changelog	2005-11-11 11:20:31 UTC (rev 2184)
+++ kde-extras/ksubtile/trunk/debian/changelog	2005-11-11 11:21:58 UTC (rev 2185)
@@ -1,3 +1,15 @@
+ksubtile (1.2-2) unstable; urgency=low
+
+  * Fix FTBFS in arm, m68k and hppa by building with gcc-3.4 there
+
+ -- Isaac Clerencia <isaac at debian.org>  Fri, 11 Nov 2005 09:32:15 +0100
+
+ksubtile (1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Isaac Clerencia <isaac at localhost.localdomain>  Thu, 10 Nov 2005 09:14:11 +0100
+
 ksubtile (1.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #331319)

Modified: kde-extras/ksubtile/trunk/debian/control
===================================================================
--- kde-extras/ksubtile/trunk/debian/control	2005-11-11 11:20:31 UTC (rev 2184)
+++ kde-extras/ksubtile/trunk/debian/control	2005-11-11 11:21:58 UTC (rev 2185)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Ana Beatriz Guerrero Lopez <anja_isbilia at yahoo.es>
 Uploaders: Isaac Clerencia <isaac at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), kdelibs4-dev, libqt3-mt-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), kdelibs4-dev, libqt3-mt-dev, g++-3.4 [arm m68k hppa]
+
 Standards-Version: 3.6.2
 
 Package: ksubtile

Modified: kde-extras/ksubtile/trunk/debian/rules
===================================================================
--- kde-extras/ksubtile/trunk/debian/rules	2005-11-11 11:20:31 UTC (rev 2184)
+++ kde-extras/ksubtile/trunk/debian/rules	2005-11-11 11:21:58 UTC (rev 2185)
@@ -1,10 +1,19 @@
 #!/usr/bin/make -f
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+   export CC=gcc-3.4
+   export CPP=cpp-3.4
+   export CXX=g++-3.4
+endif
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 install/ksubtile::
-	rm -f $(CURDIR)/debian/ksubtile/usr/bin/ksubtile_client
 	install -d $(CURDIR)/debian/ksubtile/usr/share/applications/kde/
 	mv $(CURDIR)/debian/ksubtile/usr/share/applnk/Editors/ksubtile.desktop $(CURDIR)/debian/ksubtile/usr/share/applications/kde/
 	rmdir $(CURDIR)/debian/ksubtile/usr/share/applnk/Editors/