rev 9439 - in trunk/packages/kdeadmin/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Tue Feb 19 21:48:47 UTC 2008 

Author: modax-guest
Date: 2008-02-19 21:48:47 +0000 (Tue, 19 Feb 2008)
New Revision: 9439

Added:
   trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff
   trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff
Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/patches/01_really_recognize_etch.diff
   trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
kdeadmin 3.5.9-1 is ready too. dpkg-shlibdeps clean as well.

Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2008-02-19 20:46:56 UTC (rev 9438)
+++ trunk/packages/kdeadmin/debian/changelog	2008-02-19 21:48:47 UTC (rev 9439)
@@ -1,9 +1,16 @@
-kdeadmin (4:3.5.8-3) UNRELEASED; urgency=low
+kdeadmin (4:3.5.9-1~pre2) unstable; urgency=low
 
-  * ... 
+  +++ Changes by Modestas Vainius:
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 19 Jan 2008 02:55:36 +0100
+  * New upstream release (3.5.9).
+  * Fix offsets for the 01_really_recognize_etch.diff patch.
+  * Add automake cleanup patches:
+    - 001_admin_cleanup.diff
+    - 002_automake_cleanup.diff
+    - Finally, rebuild buildprep with automake 1.10.1
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Feb 2008 23:44:57 +0200
+
 kdeadmin (4:3.5.8-2) unstable; urgency=low
 
   * Update to debhelper 6.

Added: trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff	2008-02-19 21:48:47 UTC (rev 9439)
@@ -0,0 +1,54 @@
+diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
+--- kde/admin/acinclude.m4.in	2008-02-19 03:20:35.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
+@@ -1613,6 +1613,11 @@
+   fi
+ done
+ 
++# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
++LIB_QT_EXT="$LIB_QT"
++LIB_QT="$kde_int_qt"
++
++AC_SUBST(LIB_QT_EXT)
+ AC_SUBST(LIB_QT)
+ AC_SUBST(LIB_QPE)
+ 
+@@ -2696,7 +2701,7 @@
+ ],
+     [return (TIFFOpen( "", "r") == 0); ],
+ [
+-    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
++    kde_cv_libtiff_$1="-l$1"
+ ], [
+     kde_cv_libtiff_$1=no
+ ])
+diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
+--- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-19 03:16:14.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

Added: trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff	2008-02-19 21:48:47 UTC (rev 9439)
@@ -0,0 +1,55 @@
+--- kdeadmin-3.5.9/kfile-plugins/deb/Makefile.am	2008-02-19 23:18:36.000000000 +0200
++++ kdeadmin-3.5.9/kfile-plugins/deb/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_deb_la_SOURCES = kfile_deb.cpp
+ kfile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_deb_la_LIBADD = $(LIB_KSYCOCA)
++kfile_deb_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdeadmin-3.5.9/kfile-plugins/rpm/Makefile.am	2008-02-19 23:18:36.000000000 +0200
++++ kdeadmin-3.5.9/kfile-plugins/rpm/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_rpm_la_SOURCES = kfile_rpm.cpp
+ kfile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_rpm_la_LIBADD = $(LIB_KSYCOCA)
++kfile_rpm_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdeadmin-3.5.9/knetworkconf/knetworkconf/Makefile.am	2008-02-19 23:18:34.000000000 +0200
++++ kdeadmin-3.5.9/knetworkconf/knetworkconf/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kde_module_LTLIBRARIES = kcm_knetworkconfmodule.la
+ 
+-kcm_knetworkconfmodule_la_LIBADD   =  $(LIB_KDEUI)
++kcm_knetworkconfmodule_la_LIBADD   =  $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ 
+ # the library search path. 
+ kcm_knetworkconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+--- kdeadmin-3.5.9/kpackage/Makefile.am	2008-02-19 23:18:37.000000000 +0200
++++ kdeadmin-3.5.9/kpackage/Makefile.am	2008-02-19 23:37:02.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-kpackage_LDADD   =  $(LIB_KFILE) $(LIBINTL) $(LIBZ)  $(LIBUTEMPTER)
++kpackage_LDADD   =  $(LIB_KFILE) $(LIBINTL) $(LIBUTEMPTER)
+ 
+ INCLUDES = $(all_includes)
+ 
+--- kdeadmin-3.5.9/lilo-config/kde/Makefile.am	2008-02-19 23:18:33.000000000 +0200
++++ kdeadmin-3.5.9/lilo-config/kde/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ kcm_lilo_la_SOURCES = kcontrol.cpp Details.cpp InputBox.cpp
+ kcm_lilo_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_KIO)
++kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ kcm_lilo_la_METASOURCES = AUTO
+ AM_CXXFLAGS = -DUSE_KDE
+ 

Modified: trunk/packages/kdeadmin/debian/patches/01_really_recognize_etch.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_really_recognize_etch.diff	2008-02-19 20:46:56 UTC (rev 9438)
+++ trunk/packages/kdeadmin/debian/patches/01_really_recognize_etch.diff	2008-02-19 21:48:47 UTC (rev 9439)
@@ -1,6 +1,6 @@
 --- kdeadmin-3.5.5/knetworkconf/backends/platform.pl.in.orig	2007-01-07 01:22:32.000000000 +0100
 +++ kdeadmin-3.5.5/knetworkconf/backends/platform.pl.in	2007-01-07 01:24:33.000000000 +0100
-@@ -132,9 +132,9 @@ sub check_debian
+@@ -136,9 +136,9 @@ sub check_debian
  {
    my ($ver, $i);
    my %vermap =

Modified: trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================

More information about the pkg-kde-commits mailing list