reverted: --- kdeutils-4.1.1/debian/kdeutils-dev.install +++ kdeutils-4.1.1.orig/debian/kdeutils-dev.install @@ -1,3 +0,0 @@ -usr/lib/libkerfuffle.so -usr/lib/libsuperkaramba.so - diff -u kdeutils-4.1.1/debian/control kdeutils-4.1.1/debian/control --- kdeutils-4.1.1/debian/control +++ kdeutils-4.1.1/debian/control @@ -1,14 +1,14 @@ Source: kdeutils Section: kde Priority: optional -Maintainer: Kubuntu Developers -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Matthew Rosewarne , Sune Vuorela , Matthew Rosewarne -Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), cmake (>= 2.4.5), quilt, - kdepimlibs5-dev (>= 4:4.1.1-0ubuntu2), libplasma-dev (>= 4:4.1.1-0ubuntu2), python-sip4-dev, python-kde4, - libgmp3-dev, libqimageblitz-dev (>= 1:0.0.4-2), libsnmp-dev, - python-all-dev, libarchive-dev, libx11-dev, libxrender-dev, - python-qt4-dev, python-kde4-dev, python-cups, hal-cups-utils, system-config-printer-common, libzip-dev +Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), cmake (>= 2.6), quilt, + kdepimlibs5-dev (>= 4:4.1.0), libplasma-dev (>= 4:4.1.0), python-sip4-dev, + python-kde4, libgmp3-dev, libqimageblitz-dev (>= 1:0.0.4-2), libsnmp-dev, + libzip-dev, python-all-dev, libarchive-dev, libx11-dev, libxrender-dev, + python-qt4-dev, python-kde4-dev, python-cups, hal-cups-utils, + system-config-printer-common Standards-Version: 3.8.0 Homepage: http://www.kde.org/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdeutils @@ -17,13 +17,12 @@ Package: kdeutils Architecture: all Depends: ark (>= ${source:Version}), kcalc (>= ${source:Version}), - kcharselect (>= ${source:Version}), kdessh (>= ${source:Version}), + kcharselect (>= ${source:Version}), + kde-printer-applet (>= ${source:Version}), kdessh (>= ${source:Version}), kdf (>= ${source:Version}), kfloppy (>= ${source:Version}), kgpg (>= ${source:Version}), ktimer (>= ${source:Version}), - kwalletmanager (>= ${source:Version}), superkaramba (>= ${source:Version}), - sweeper (>= ${source:Version}), okteta (>= ${source:Version}), kde-printer-applet (>= ${source:Version}) -Replaces: kdeutils-kde4 -Conflicts: kdeutils-kde4 + kwalletmanager (>= ${source:Version}), okteta (>= ${source:Version}), + superkaramba (>= ${source:Version}), sweeper (>= ${source:Version}) Description: general-purpose utilities from the official KDE 4 release KDE is produced by an international technology team that creates free and open source software for desktop and portable computing. Among KDE's products are a @@ -46,15 +45,6 @@ This package contains debugging files used to investigate problems with binaries included in the KDE 4 utilities module. -Package: kdeutils-dev -Section: libdevel -Architecture: any -Depends: ark (= ${binary:Version}), superkaramba (= ${binary:Version}) -Replaces: kdeutils-dev-kde4 -Conflicts: kdeutils-dev-kde4 -Description: development files for the KDE 4 utilities module - This package contains development files for building software that uses - libraries from the KDE 4 utilities module. Package: ark Section: utils @@ -101,6 +91,20 @@ . This package is part of the KDE 4 utilities module. +Package: kde-printer-applet +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, + python-cups (>= 1.9.27), system-config-printer-common, hal-cups-utils, + python-kde4, python-qt4-dbus, python +Description: printer status applet + printer-applet is a system tray utility. It shows current print jobs, + shows printer warnings and errors and shows when printers that have + been plugged in for the first time are being auto-configured by + hal-cups-utils. + . + This package is part of the KDE 4 utilities module. + Package: kdessh Section: net Architecture: any @@ -220,14 +223,0 @@ -Package: kde-printer-applet -Section: utils -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, - python-cups (>= 1.9.27), system-config-printer-common, hal-cups-utils, - python-kde4, python-qt4-dbus, python -Description: printer status applet - printer-applet is a system tray utility. It shows current print jobs, - shows printer warnings and errors and shows when printers that have - been plugged in for the first time are being auto-configured by - hal-cups-utils. - . - This package is part of the KDE 4 utilities module. - diff -u kdeutils-4.1.1/debian/not-installed kdeutils-4.1.1/debian/not-installed --- kdeutils-4.1.1/debian/not-installed +++ kdeutils-4.1.1/debian/not-installed @@ -2,0 +3,3 @@ +./usr/lib/libkerfuffle.so +./usr/lib/libsuperkaramba.so + diff -u kdeutils-4.1.1/debian/changelog kdeutils-4.1.1/debian/changelog --- kdeutils-4.1.1/debian/changelog +++ kdeutils-4.1.1/debian/changelog @@ -1,3 +1,19 @@ +kdeutils (4:4.1.1-1ubuntu1) intrepid; urgency=low + + * Merge from Debian + * Bumped Standards-Version to 3.8.0 + * Use our kde4.mk + * Add conflicts/replaces on -kde4 packages + * Add package for kde-printer-applet, needs build-deps on + python-kde4-dev, python-cups, hal-cups-utils, + system-config-printer-common + * Add kde-printer-applet to kdeutils metapackage + * Add desktop/utilities-file-archiver.xpm icon (needed by Ark), (LP: #256466) + * -dbg depends kdeutils + * Remove useless 97_fix_target_link_libraries.diff from debian/patches + + -- Jonathan Thomas (The man) Sun, 14 Sep 2008 08:55:15 -0400 + kdeutils (4:4.1.1-0ubuntu2) intrepid; urgency=low * Rebuild against kdelibs 4:4.1.1+really4.1.1 @@ -15,6 +31,14 @@ -- Harald Sitter Sun, 31 Aug 2008 12:56:51 +0200 +kdeutils (4:4.1.1-1) experimental; urgency=low + + * New upstream release + * Remove 97_fix_target_link_libraries.diff, implemented upstram + * Remove kdeutils-dev, useless. + + -- Sune Vuorela Fri, 29 Aug 2008 11:39:50 +0200 + kdeutils (4:4.1.0-0ubuntu5) intrepid; urgency=low * Add build-dep on libzip-dev, now in main @@ -39,6 +63,13 @@ -- Jonathan Riddell Fri, 01 Aug 2008 15:29:44 +0000 +kdeutils (4:4.1.0-1) experimental; urgency=low + + * New upstream release. + * Update installed files and build depends versions. + + -- Ana Beatriz Guerrero Lopez Mon, 28 Jul 2008 02:06:25 +0200 + kdeutils (4:4.1.0-0ubuntu1) intrepid; urgency=low * New upstream release @@ -51,6 +82,12 @@ -- Jonathan Riddell Fri, 18 Jul 2008 11:56:36 +0100 +kdeutils (4:4.0.98-1) experimental; urgency=low + + * New upstream release, Release Candidate 1. + + -- Ana Beatriz Guerrero Lopez Mon, 14 Jul 2008 23:01:27 +0200 + kdeutils (4:4.0.98-0ubuntu1) intrepid; urgency=low * New upstream release candidate @@ -61,6 +98,16 @@ -- Harald Sitter Sat, 12 Jul 2008 14:19:17 +0200 +kdeutils (4:4.0.84-1) experimental; urgency=low + + * New upstream snapshot. + + +++ Changes by Fathi Boudra: + + * Add okteta to kdeutils meta package. + + -- Debian Qt/KDE Maintainers Sun, 29 Jun 2008 01:47:14 +0200 + kdeutils (4:4.0.83-0ubuntu6) intrepid; urgency=low * Add build-dep on python-kde4 @@ -98,6 +145,16 @@ -- Jonathan Riddell Thu, 19 Jun 2008 11:45:18 +0000 +kdeutils (4:4.0.82+svn819867-1) experimental; urgency=low + + * New upstream snapshot. + * Update build dependencies: + - Bump kdepimlibs5-dev to (>= 4:4.0.82). + - Add libplasma-dev. + * Update superkaramba.install to install plasmoid related files. + + -- Ana Beatriz Guerrero Lopez Sun, 15 Jun 2008 20:23:57 +0200 + kdeutils (4:4.0.80-1ubuntu2) intrepid; urgency=low * Fix config install paths diff -u kdeutils-4.1.1/debian/rules kdeutils-4.1.1/debian/rules --- kdeutils-4.1.1/debian/rules +++ kdeutils-4.1.1/debian/rules @@ -4 +3,0 @@ - diff -u kdeutils-4.1.1/debian/superkaramba.install kdeutils-4.1.1/debian/superkaramba.install --- kdeutils-4.1.1/debian/superkaramba.install +++ kdeutils-4.1.1/debian/superkaramba.install @@ -1,5 +1,7 @@ usr/share/kde4/config/superkaramba.knsrc usr/bin/superkaramba +usr/lib/kde4/plasma_package_superkaramba.so +usr/lib/kde4/plasma_scriptengine_superkaramba.so usr/lib/libsuperkaramba.so.4 usr/lib/libsuperkaramba.so.4.1.0 usr/share/applications/kde4/superkaramba.desktop @@ -18,4 +20,3 @@ -usr/lib/kde4/plasma_package_superkaramba.so -usr/lib/kde4/plasma_scriptengine_superkaramba.so -usr/share/kde4/services/plasma-scriptengine-superkaramba.desktop usr/share/kde4/services/plasma-package-superkaramba.desktop +usr/share/kde4/services/plasma-scriptengine-superkaramba.desktop + diff -u kdeutils-4.1.1/debian/ark.install kdeutils-4.1.1/debian/ark.install --- kdeutils-4.1.1/debian/ark.install +++ kdeutils-4.1.1/debian/ark.install @@ -2,7 +2,7 @@ usr/bin/ark usr/lib/kde4/kerfuffle_bk.so usr/lib/kde4/kerfuffle_libarchive.so -#usr/lib/kde4/kerfuffle_libzip.so +usr/lib/kde4/kerfuffle_libzip.so usr/lib/kde4/kerfuffle_rar.so usr/lib/kde4/libarkpart.so usr/lib/libkerfuffle.so.4 @@ -21,5 +21,3 @@ -#usr/share/kde4/services/kerfuffle_libzip.desktop +usr/share/kde4/services/kerfuffle_libzip.desktop usr/share/kde4/services/kerfuffle_rar.desktop usr/share/kde4/servicetypes/kerfufflePlugin.desktop -usr/lib/kde4/kerfuffle_libzip.so -usr/share/kde4/services/kerfuffle_libzip.desktop diff -u kdeutils-4.1.1/debian/KUBUNTU-DEBIAN-DIFFERENCES kdeutils-4.1.1/debian/KUBUNTU-DEBIAN-DIFFERENCES --- kdeutils-4.1.1/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ kdeutils-4.1.1/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -7,3 +7,6 @@ - * Add okteta and kde-printer-applet to kdeutils metapackage + * Add kde-printer-applet to kdeutils metapackage * Add desktop/utilities-file-archiver.xpm icon (needed by Ark), (LP: #256466) + + * -dbg depends kdeutils + * Remove useless 97_fix_target_link_libraries.diff from debian/patches