rev 3769 - in trunk/packages/kdelibs/debian-merge: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-05-15 02:06:35 +0000 (Mon, 15 May 2006)
New Revision: 3769

Removed:
   trunk/packages/kdelibs/debian-merge/README.Debian
   trunk/packages/kdelibs/debian-merge/dh-make/
   trunk/packages/kdelibs/debian-merge/kdelibs.docs
   trunk/packages/kdelibs/debian-merge/patches/22_dont_override_license.diff
Modified:
   trunk/packages/kdelibs/debian-merge/kdelibs4-dev.docs
   trunk/packages/kdelibs/debian-merge/kdelibs4-dev.install
   trunk/packages/kdelibs/debian-merge/patches/21_kfreebsd_support.diff
Log:
Sync the merge branch.


Deleted: trunk/packages/kdelibs/debian-merge/README.Debian

Deleted: trunk/packages/kdelibs/debian-merge/kdelibs.docs

Modified: trunk/packages/kdelibs/debian-merge/kdelibs4-dev.docs
===================================================================
--- trunk/packages/kdelibs/debian-merge/kdelibs4-dev.docs	2006-05-15 01:15:25 UTC (rev 3768)
+++ trunk/packages/kdelibs/debian-merge/kdelibs4-dev.docs	2006-05-15 02:06:35 UTC (rev 3769)
@@ -3,4 +3,3 @@
 NAMING
 README
 debian/Packaging.txt
-debian/README.Debian

Modified: trunk/packages/kdelibs/debian-merge/kdelibs4-dev.install
===================================================================
--- trunk/packages/kdelibs/debian-merge/kdelibs4-dev.install	2006-05-15 01:15:25 UTC (rev 3768)
+++ trunk/packages/kdelibs/debian-merge/kdelibs4-dev.install	2006-05-15 02:06:35 UTC (rev 3769)
@@ -1,4 +1,3 @@
-debian/dh-make/*	usr/share/doc/kdelibs4-dev/dh-make/
 debian/tmp/usr/bin/checkXML
 debian/tmp/usr/bin/dcopidl
 debian/tmp/usr/bin/dcopidl2cpp

Modified: trunk/packages/kdelibs/debian-merge/patches/21_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian-merge/patches/21_kfreebsd_support.diff	2006-05-15 01:15:25 UTC (rev 3768)
+++ trunk/packages/kdelibs/debian-merge/patches/21_kfreebsd_support.diff	2006-05-15 02:06:35 UTC (rev 3769)
@@ -24,7 +24,7 @@
  # endif
  #endif
  
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
 +#if defined(HAVE_TCGETATTR)
 +# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
 +#elif defined(TIOCGETA)
@@ -40,7 +40,7 @@
 +# error
  #endif
  
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
 +#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
 +# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
 +#elif defined(TIOCSETA)

Deleted: trunk/packages/kdelibs/debian-merge/patches/22_dont_override_license.diff