Merge lp:~kvilhaugsvik/packagekit/packagekit-karmic into lp:~packagekit/packagekit/packagekit-karmic

[Sveinung Kvilhaugsvik]

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Fixes bug 378419 and bug 345706 for PackageKit in Karmic.

Unmerged revisions

175. By Sveinung Kvilhaugsvik on 2009-07-10

releasing version 0.4.8-0ubuntu4 to karmic

174. By Sveinung Kvilhaugsvik on 2009-07-10

* Fixed spelling of Qt in package descriptions (LP: #378419)

173. By Sveinung Kvilhaugsvik on 2009-07-10

Put FindQPackageKit.cmake where CMake can see it (LP: #345706)

172. By Sveinung Kvilhaugsvik on 2009-07-10

opened tree for edit

=== modified file 'debian/changelog'
--- debian/changelog	2009-07-04 20:24:38 +0000
+++ debian/changelog	2009-07-10 17:01:13 +0000
@@ -1,3 +1,10 @@
+packagekit (0.4.8-0ubuntu4) karmic; urgency=low
+
+  * Put FindQPackageKit.cmake where CMake can see it (LP: #345706)
+  * Fixed spelling of Qt in package descriptions (LP: #378419)
+
+ -- Sveinung Kvilhaugsvik <[e-mail]>  Fri, 10 Jul 2009 17:41:48 +0200
+
 packagekit (0.4.8-0ubuntu3) karmic; urgency=low
 
   * Add debian/patches/ignore_packages_in_conffiles.patch to avoid crashes

=== modified file 'debian/control'
--- debian/control	2009-07-03 00:01:42 +0000
+++ debian/control	2009-07-10 16:58:42 +0000
@@ -115,12 +115,12 @@
          ${misc:Depends},
 Conflicts: packagekit (<= 0.3.3-0ubuntu1)
 Breaks: kpackagekit (<= 0.4)
-Description: Library for accessing PackageKit using QT.
+Description: Library for accessing PackageKit using Qt.
  PackageKit allows to perform simple software management tasks over a DBus 
  interface e.g. refreshing the cache, updating, installing and removing 
  software packages or searching for multimedia codecs and file handlers.
  .
- This package provides a library to access PackageKit using QT.
+ This package provides a library to access PackageKit using Qt.
 
 Package: libpackagekit-glib11
 Architecture: any
@@ -156,12 +156,12 @@
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
 	 libpackagekit-qt11 (= ${binary:Version})
-Description: Library for accessing PackageKit using QT (development files)
+Description: Library for accessing PackageKit using Qt (development files)
  PackageKit allows to perform simple software management tasks over a DBus 
  interface e.g. refreshing the cache, updating, installing and removing 
  software packages or searching for multimedia codecs and file handlers.
  .
- This package provides the header files for QT.
+ This package provides the header files for Qt.
 
 Package: packagekit-backend-apt
 Architecture: any

=== modified file 'debian/libpackagekit-qt-dev.install'
--- debian/libpackagekit-qt-dev.install	2008-12-02 12:28:19 +0000
+++ debian/libpackagekit-qt-dev.install	2009-07-10 16:57:11 +0000
@@ -2,4 +2,4 @@
 debian/tmp/usr/lib/libpackagekit-qt.la
 debian/tmp/usr/lib/libpackagekit-qt.so
 debian/tmp/usr/lib/pkgconfig/packagekit-qt.pc
-debian/tmp/usr/share/cmake/Modules/FindQPackageKit.cmake
+debian/tmp/usr/share/cmake/Modules/FindQPackageKit.cmake /usr/share/cmake-2.6/Modules