rev 4266 - in trunk/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-08-01 00:20:04 +0000 (Tue, 01 Aug 2006)
New Revision: 4266

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff
Log:
This should get things building.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-07-31 20:31:42 UTC (rev 4265)
+++ trunk/packages/kdelibs/debian/changelog	2006-08-01 00:20:04 UTC (rev 4266)
@@ -1,3 +1,15 @@
+kdelibs (4:3.5.4-3) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Fix the avahi patch so that kdelibs builds with or without --enable-final.
+    (Disabling it on slow architectures had the unfortunate side effect of
+    revealing a problem in the patch, which had unwittingly made
+    --enable-final necessary to build the package.) kdelibs should now build
+    on arm and m68k.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 31 Jul 2006 20:12:25 -0400
+
 kdelibs (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r567679).

Modified: trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff	2006-07-31 20:31:42 UTC (rev 4265)
+++ trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff	2006-08-01 00:20:04 UTC (rev 4266)
@@ -212,12 +212,11 @@
  
  # these are the headers for your project
  noinst_HEADERS = sdevent.h
-@@ -14,7 +14,8 @@
+@@ -14,7 +14,7 @@
  dnssdincludedir = $(includedir)/dnssd
  dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
  	publicservice.h servicebase.h servicebrowser.h settings.h
 -libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
-+libkdnssd_la_CXXFLAGS = $(INCLUDES)
 +libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
  libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0