[SCM] libkgeomap packaging branch, master, updated. 619125c46fa9d16b4747bac2a294a7546ed5e937

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkgeomap.git;a=commitdiff;h=df97885

The following commit has been merged in the master branch:
commit df97885a5c9f2daa253f914b89b7cbaad387681f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 23 21:57:48 2015 +0200

    Update install files.
---
 debian/control                                    | 8 ++++----
 debian/libkgeomap-data.install                    | 1 +
 debian/libkgeomap-dev.install                     | 5 +++--
 debian/libkgeomap0.install                        | 2 --
 debian/{libkgeomap0.acc.in => libkgeomap2.acc.in} | 2 +-
 debian/libkgeomap2.install                        | 2 ++
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index aac75c8..dab1762 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Homepage: https://projects.kde.org/projects/kde/kdegraphics/libs/libkgeomap
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libkgeomap.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkgeomap.git
 
-Package: libkgeomap0
+Package: libkgeomap2
 Architecture: any
-Depends: libkgeomap-data (>= ${source:Version}),
+Depends: libkgeomap-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: World-Map Library interface for KDE - shared library
@@ -38,7 +38,7 @@ Description: World-Map Library interface for KDE - data files
 Package: libkgeomap-dev
 Section: libdevel
 Architecture: any
-Depends: libkgeomap0 (= ${binary:Version}), ${misc:Depends}
+Depends: libkgeomap2 (= ${binary:Version}), ${misc:Depends}
 Description: World-Map Library interface for KDE - development files
  Libkgeomap is a wrapper around different world-map components, to browse and
  arrange photos over a map.
@@ -49,7 +49,7 @@ Package: libkgeomap-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libkgeomap0 (= ${binary:Version}), ${misc:Depends}
+Depends: libkgeomap2 (= ${binary:Version}), ${misc:Depends}
 Description: World-Map Library interface for KDE - debugging symbols
  Libkgeomap is a wrapper around different world-map components, to browse and
  arrange photos over a map.
diff --git a/debian/libkgeomap-data.install b/debian/libkgeomap-data.install
new file mode 100644
index 0000000..c391823
--- /dev/null
+++ b/debian/libkgeomap-data.install
@@ -0,0 +1 @@
+usr/share/kde4/apps/libkgeomap/
diff --git a/debian/libkgeomap-dev.install b/debian/libkgeomap-dev.install
index 62cc435..43fb2f1 100644
--- a/debian/libkgeomap-dev.install
+++ b/debian/libkgeomap-dev.install
@@ -1,3 +1,4 @@
 usr/include/libkgeomap/
-usr/lib/cmake/KGeoMap/
-usr/lib/*/libkgeomap.so
+usr/lib/libkgeomap.so
+usr/lib/pkgconfig/libkgeomap.pc
+usr/share/kde4/apps/cmake/modules/FindKGeoMap.cmake
diff --git a/debian/libkgeomap0.install b/debian/libkgeomap0.install
deleted file mode 100644
index edd6df5..0000000
--- a/debian/libkgeomap0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkgeomap.so.0
-usr/lib/*/libkgeomap.so.0.*
diff --git a/debian/libkgeomap0.acc.in b/debian/libkgeomap2.acc.in
similarity index 80%
rename from debian/libkgeomap0.acc.in
rename to debian/libkgeomap2.acc.in
index 71b539d..9cb2023 100644
--- a/debian/libkgeomap0.acc.in
+++ b/debian/libkgeomap2.acc.in
@@ -10,7 +10,7 @@
 </headers>
 
 <libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libkgeomap.so
+    /usr/lib/libkgeomap.so
 </libs>
 
 <gcc_options>
diff --git a/debian/libkgeomap2.install b/debian/libkgeomap2.install
new file mode 100644
index 0000000..ada012f
--- /dev/null
+++ b/debian/libkgeomap2.install
@@ -0,0 +1,2 @@
+usr/lib/libkgeomap.so.2
+usr/lib/libkgeomap.so.2.*

-- 
libkgeomap packaging