rev 10880 - branches/kde4/packages/kdegraphics/debian

[Fathi Boudra]

Author: fabo
Date: 2008-06-04 21:34:12 +0000 (Wed, 04 Jun 2008)
New Revision: 10880

Added:
   branches/kde4/packages/kdegraphics/debian/libkexiv2-6-dev.install
   branches/kde4/packages/kdegraphics/debian/libkexiv2-6.install
Removed:
   branches/kde4/packages/kdegraphics/debian/libkexiv26-dev.install
   branches/kde4/packages/kdegraphics/debian/libkexiv26.install
Modified:
   branches/kde4/packages/kdegraphics/debian/changelog
   branches/kde4/packages/kdegraphics/debian/control
Log:
Add conflicts against KDE3 libraries.


Modified: branches/kde4/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde4/packages/kdegraphics/debian/changelog	2008-06-04 20:55:26 UTC (rev 10879)
+++ branches/kde4/packages/kdegraphics/debian/changelog	2008-06-04 21:34:12 UTC (rev 10880)
@@ -20,8 +20,7 @@
   +++ Changes by Fathi Boudra:
 
   * Add Provides: pdf-viewer to okular as requested by Pino. (Closes: #471964)
-  * Add libkdcraw5, libkexiv26, libkipi5 packages.
-    TODO: check conflicting files against KDE3 versions.
+  * Add libkdcraw5, libkexiv2-6, libkipi5 packages.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Jun 2008 01:04:34 +0200
 

Modified: branches/kde4/packages/kdegraphics/debian/control
===================================================================
--- branches/kde4/packages/kdegraphics/debian/control	2008-06-04 20:55:26 UTC (rev 10879)
+++ branches/kde4/packages/kdegraphics/debian/control	2008-06-04 21:34:12 UTC (rev 10880)
@@ -214,6 +214,7 @@
 Section: libdevel
 Architecture: any
 Depends: libkdcraw5 (= ${binary:Version}), pkg-config
+Conflicts: libkdcraw-dev
 Description: RAW picture decoding C++ library (development)
  Libkdcraw is a C++ interface around dcraw binary program used to
  decode Raw picture files.
@@ -233,17 +234,18 @@
  .
  libkdcraw5 contains the library of libkdcraw.
 
-Package: libkexiv26-dev
+Package: libkexiv2-6-dev
 Section: libdevel
 Architecture: any
-Depends: libkexiv26 (= ${binary:Version}), pkg-config
+Depends: libkexiv2-6 (= ${binary:Version}), pkg-config
+Conflicts: libkexiv2-dev
 Description: Qt like interface for the libexiv2 library (development)
  libkexif2-dev contains development files and documentation for libkexiv2
  library.  The library documentation is available on kexiv2.h header file.
  .
  Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 
-Package: libkexiv26
+Package: libkexiv2-6
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -256,6 +258,7 @@
 Section: libdevel
 Architecture: any
 Depends: libkipi5 (= ${binary:Version}), pkg-config
+Conflicts: libkipi0-dev
 Description: library for apps that want to use kipi-plugins (development version)
  Libkipi is a library
  .
@@ -269,6 +272,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libkipi0
 Description: library for apps that want to use kipi-plugins (runtime version)
  Libkipi is a library
  .

Copied: branches/kde4/packages/kdegraphics/debian/libkexiv2-6-dev.install (from rev 10879, branches/kde4/packages/kdegraphics/debian/libkexiv26-dev.install)
===================================================================
--- branches/kde4/packages/kdegraphics/debian/libkexiv2-6-dev.install	                        (rev 0)
+++ branches/kde4/packages/kdegraphics/debian/libkexiv2-6-dev.install	2008-06-04 21:34:12 UTC (rev 10880)
@@ -0,0 +1,5 @@
+usr/include/libkexiv2/kexiv2.h
+usr/include/libkexiv2/libkexiv2_export.h
+usr/include/libkexiv2/version.h
+usr/lib/libkexiv2.so
+usr/lib/pkgconfig/libkexiv2.pc

Copied: branches/kde4/packages/kdegraphics/debian/libkexiv2-6.install (from rev 10879, branches/kde4/packages/kdegraphics/debian/libkexiv26.install)
===================================================================
--- branches/kde4/packages/kdegraphics/debian/libkexiv2-6.install	                        (rev 0)
+++ branches/kde4/packages/kdegraphics/debian/libkexiv2-6.install	2008-06-04 21:34:12 UTC (rev 10880)
@@ -0,0 +1,2 @@
+usr/lib/libkexiv2.so.6
+usr/lib/libkexiv2.so.6.0.0

Deleted: branches/kde4/packages/kdegraphics/debian/libkexiv26-dev.install

Deleted: branches/kde4/packages/kdegraphics/debian/libkexiv26.install