rev 13680 - in branches/kdebase-legacy/kdelibs/debian: . patches

[Xavier Vello]

Author: wdgt-guest
Date: 2009-01-31 00:10:35 +0000 (Sat, 31 Jan 2009)
New Revision: 13680

Modified:
   branches/kdebase-legacy/kdelibs/debian/changelog
   branches/kdebase-legacy/kdelibs/debian/control
   branches/kdebase-legacy/kdelibs/debian/patches/01_admin_cleanup.diff
   branches/kdebase-legacy/kdelibs/debian/rules
Log:
update libtool and disable arts



Modified: branches/kdebase-legacy/kdelibs/debian/changelog
===================================================================
--- branches/kdebase-legacy/kdelibs/debian/changelog	2009-01-30 23:53:06 UTC (rev 13679)
+++ branches/kdebase-legacy/kdelibs/debian/changelog	2009-01-31 00:10:35 UTC (rev 13680)
@@ -1,3 +1,10 @@
+kdelibs (4:3.5.10.dfsg.1-2) UNRELEASED; urgency=low
+
+  * Rebuild without arts
+  * Update patches/common for libtool/unstable
+
+ -- Xavier Vello <xavier.vello at gmail.com>  Sat, 31 Jan 2009 00:39:40 +0100
+
 kdelibs (4:3.5.10.dfsg.1-1) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:

Modified: branches/kdebase-legacy/kdelibs/debian/control
===================================================================
--- branches/kdebase-legacy/kdelibs/debian/control	2009-01-30 23:53:06 UTC (rev 13679)
+++ branches/kdebase-legacy/kdelibs/debian/control	2009-01-31 00:10:35 UTC (rev 13680)
@@ -5,7 +5,7 @@
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>, Pino Toscano <pino at kde.org>, Raúl Sánchez Siles <rasasi78 at gmail.com>, Sune Vuorela <debian at pusling.com>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
- libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
+ libart-2.0-dev (>= 2.3.17), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaspell-dev, hspell, libbz2-dev, libcups2-dev, libfam-dev | libgamin-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,

Modified: branches/kdebase-legacy/kdelibs/debian/patches/01_admin_cleanup.diff
===================================================================
--- branches/kdebase-legacy/kdelibs/debian/patches/01_admin_cleanup.diff	2009-01-30 23:53:06 UTC (rev 13679)
+++ branches/kdebase-legacy/kdelibs/debian/patches/01_admin_cleanup.diff	2009-01-31 00:10:35 UTC (rev 13680)
@@ -85,32 +85,3 @@
    AC_SUBST(PYTHONINC)
    AC_SUBST(PYTHONLIB)
    AC_SUBST(LIBPYTHON)
---- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
-@@ -2377,16 +2377,16 @@
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
--	    tmp_libs=
--	    for deplib in $dependency_libs; do
--	      deplibs="$deplib $deplibs"
--              if test "X$duplicate_deps" = "Xyes" ; then
--	        case "$tmp_libs " in
--	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	        esac
--              fi
--	      tmp_libs="$tmp_libs $deplib"
--	    done
-+#	    tmp_libs=
-+#	    for deplib in $dependency_libs; do
-+#	      deplibs="$deplib $deplibs"
-+#              if test "X$duplicate_deps" = "Xyes" ; then
-+#	        case "$tmp_libs " in
-+#	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+#	        esac
-+#              fi
-+#	      tmp_libs="$tmp_libs $deplib"
-+#	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
- 	    exit $EXIT_FAILURE

Modified: branches/kdebase-legacy/kdelibs/debian/rules
===================================================================
--- branches/kdebase-legacy/kdelibs/debian/rules	2009-01-30 23:53:06 UTC (rev 13679)
+++ branches/kdebase-legacy/kdelibs/debian/rules	2009-01-31 00:10:35 UTC (rev 13680)
@@ -12,7 +12,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-mitshm --with-alsa --enable-dnotify --enable-inotify \
-	--with-lua-includes=/usr/include/lua50  \
+	--with-lua-includes=/usr/include/lua50 --without-arts  \
 	--with-distribution="$(version) (`cat /etc/debian_version`)"
 
 DEB_FIXPERMS_EXCLUDE := \