rev 9442 - in trunk/packages/kdetoys/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Feb 20 13:53:00 UTC 2008
Author: modax-guest
Date: 2008-02-20 13:52:59 +0000 (Wed, 20 Feb 2008)
New Revision: 9442
Added:
trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff
trunk/packages/kdetoys/debian/patches/02_automake_cleanup.diff
Modified:
trunk/packages/kdetoys/debian/changelog
trunk/packages/kdetoys/debian/control
trunk/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
kdetoys 3.5.9 is ready and dpkg-shlibdeps clean
Modified: trunk/packages/kdetoys/debian/changelog
===================================================================
--- trunk/packages/kdetoys/debian/changelog 2008-02-20 13:37:53 UTC (rev 9441)
+++ trunk/packages/kdetoys/debian/changelog 2008-02-20 13:52:59 UTC (rev 9442)
@@ -1,5 +1,14 @@
-kdetoys (4:3.5.8-2) UNRELEASED; urgency=low
+kdetoys (4:3.5.9-1~pre2) unstable; urgency=low
+ +++ Changes by Modestas Vainius:
+
+ * New upstream release (3.5.9).
+ * Add patches for automake cleanup:
+ - 01_admin_cleanup.diff
+ - 02_automake_cleanup.diff
+
+ +++ Changes by Ana Beatriz Guerrero Lopez:
+
* Update to debhelper 6.
* Update to Standards-Version 3.7.3:
- Replace Source-Version for proper variables.
@@ -7,7 +16,7 @@
* debian/copyright file: GFDL text removed and replaced by a
link to common-licenses.
- -- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 21 Jan 2008 14:26:32 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 20 Feb 2008 15:30:28 +0200
kdetoys (4:3.5.8-1) unstable; urgency=low
Modified: trunk/packages/kdetoys/debian/control
===================================================================
--- trunk/packages/kdetoys/debian/control 2008-02-20 13:37:53 UTC (rev 9441)
+++ trunk/packages/kdetoys/debian/control 2008-02-20 13:52:59 UTC (rev 9442)
@@ -2,17 +2,18 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Modestas Vainius <geromanas at mailas.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
-Standards-Version: 3.7.2
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modestas at vainius.eu>
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, kdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
+Standards-Version: 3.7.3
+Homepage: http://www.kde.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdetoys
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdetoys
Package: kdetoys
Architecture: all
Section: kde
-Depends: amor (>= ${Source-Version}), eyesapplet (>= ${Source-Version}), fifteenapplet (>= ${Source-Version}), kmoon (>= ${Source-Version}), kodo (>= ${Source-Version}), kteatime (>= ${Source-Version}), ktux (>= ${Source-Version}), kweather (>= ${Source-Version}), kworldclock (>= ${Source-Version})
-Suggests: kdetoys-doc-html (>= ${Source-Version})
+Depends: amor (>= ${source:Version}), eyesapplet (>= ${source:Version}), fifteenapplet (>= ${source:Version}), kmoon (>= ${source:Version}), kodo (>= ${source:Version}), kteatime (>= ${source:Version}), ktux (>= ${source:Version}), kweather (>= ${source:Version}), kworldclock (>= ${source:Version})
+Suggests: kdetoys-doc-html (>= ${source:Version})
Description: toys from the official KDE release
KDE (the K Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
Added: trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff (rev 0)
+++ trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff 2008-02-20 13:52:59 UTC (rev 9442)
@@ -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/kdetoys/debian/patches/02_automake_cleanup.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/02_automake_cleanup.diff (rev 0)
+++ trunk/packages/kdetoys/debian/patches/02_automake_cleanup.diff 2008-02-20 13:52:59 UTC (rev 9442)
@@ -0,0 +1,85 @@
+diff -ur kdetoys-3.5.9_src/eyesapplet/Makefile.am kdetoys-3.5.9_dst/eyesapplet/Makefile.am
+--- kdetoys-3.5.9_src/eyesapplet/Makefile.am 2008-02-20 13:35:13.000000000 +0000
++++ kdetoys-3.5.9_dst/eyesapplet/Makefile.am 2008-02-20 13:35:14.000000000 +0000
+@@ -13,7 +13,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+
+ eyes_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-eyes_panelapplet_la_LIBADD = $(LIB_KDEUI)
++eyes_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+
+ messages:
+ $(XGETTEXT) *.cpp *.h -o $(podir)/keyesapplet.pot
+diff -ur kdetoys-3.5.9_src/fifteenapplet/Makefile.am kdetoys-3.5.9_dst/fifteenapplet/Makefile.am
+--- kdetoys-3.5.9_src/fifteenapplet/Makefile.am 2008-02-20 13:35:14.000000000 +0000
++++ kdetoys-3.5.9_dst/fifteenapplet/Makefile.am 2008-02-20 13:35:14.000000000 +0000
+@@ -13,7 +13,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+
+ fifteen_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-fifteen_panelapplet_la_LIBADD = $(LIB_KDEUI)
++fifteen_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+
+ messages:
+ $(XGETTEXT) *.cpp *.h -o $(podir)/kfifteenapplet.pot
+diff -ur kdetoys-3.5.9_src/kmoon/Makefile.am kdetoys-3.5.9_dst/kmoon/Makefile.am
+--- kdetoys-3.5.9_src/kmoon/Makefile.am 2008-02-20 13:35:14.000000000 +0000
++++ kdetoys-3.5.9_dst/kmoon/Makefile.am 2008-02-20 13:35:14.000000000 +0000
+@@ -3,7 +3,7 @@
+
+ kmoon_panelapplet_la_SOURCES = kmoonapplet.cpp phases.cpp kmoondlg.cpp kmoonwidget.cpp
+ kmoon_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-kmoon_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
++kmoon_panelapplet_la_LIBADD = $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+
+ lnkdir = $(kde_datadir)/kicker/applets
+ lnk_DATA = kmoonapplet.desktop
+diff -ur kdetoys-3.5.9_src/kweather/Makefile.am kdetoys-3.5.9_dst/kweather/Makefile.am
+--- kdetoys-3.5.9_src/kweather/Makefile.am 2008-02-20 13:35:13.000000000 +0000
++++ kdetoys-3.5.9_dst/kweather/Makefile.am 2008-02-20 13:35:14.000000000 +0000
+@@ -26,7 +26,7 @@
+ weatherIface.skel weatherservice.stub \
+ weatherbutton.cpp
+ weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-weather_panelapplet_la_LIBADD = $(LIB_KHTML)
++weather_panelapplet_la_LIBADD = $(LIB_KHTML) $(LIB_KDECORE) $(LIB_QT) -lDCOP $(LIB_KDEUI) $(LIB_KUTILS)
+
+ appletdir = $(kde_datadir)/kicker/applets
+ applet_DATA = kweather.desktop
+@@ -37,13 +37,13 @@
+ kcm_weather_la_SOURCES = kcmweather.cpp prefdialogdata.ui weatherservice.stub
+ kcm_weather_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+ -avoid-version -no-undefined
+-kcm_weather_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
++kcm_weather_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+
+ kcm_weatherservice_la_SOURCES = kcmweatherservice.cpp serviceconfigwidget.cpp \
+ serviceconfigdata.ui weatherservice.stub
+ kcm_weatherservice_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+ -avoid-version -no-undefined
+-kcm_weatherservice_la_LIBADD = $(LIB_KDEUI)
++kcm_weatherservice_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+
+ #weather_sidebar_la_SOURCES = sidebarwidgetbase.ui sidebarwidget.cpp dockwidget.cpp weatherbar.cpp weatherbar.skel
+ #weather_sidebar_la_LDFLAGS = $(all_libraries) -module -no-undefined
+@@ -67,7 +67,7 @@
+ kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop
+
+ kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+-kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
++kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+ kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
+
+ KDE_ICON = kweather
+diff -ur kdetoys-3.5.9_src/kworldwatch/Makefile.am kdetoys-3.5.9_dst/kworldwatch/Makefile.am
+--- kdetoys-3.5.9_src/kworldwatch/Makefile.am 2008-02-20 13:35:14.000000000 +0000
++++ kdetoys-3.5.9_dst/kworldwatch/Makefile.am 2008-02-20 13:35:14.000000000 +0000
+@@ -35,7 +35,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+
+ ww_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-ww_panelapplet_la_LIBADD = libww.la $(LIB_KSYCOCA)
++ww_panelapplet_la_LIBADD = libww.la $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+
+ messages: rc.cpp
+ $(XGETTEXT) rc.cpp $(kworldclock_SOURCES) $(libww_la_SOURCES) -o $(podir)/kworldclock.pot
Modified: trunk/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list