[Pkg-osm-commits] [SCM] osm-gps-map branch, master, updated. debian/0.7.3-3-28-gc824132

[Andreas Tille]

The following commit has been merged in the master branch:
commit a663ebe29ac97f7ef7184a13549756055ab391fa
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jan 26 10:38:46 2014 +0100

    Use d-shlibs to confirm with library packaging guide

diff --git a/debian/control b/debian/control
index dca71e6..077f2f5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9~),
                libtool,
                automake,
                autoconf,
+               d-shlibs,
                libgtk-3-dev,
                libgirepository1.0-dev,
                libglib2.0-dev,
@@ -25,15 +26,15 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/osm-gps-map.git
 Vcs-Git: git://anonscm.debian.org/pkg-osm/osm-gps-map.git
 Homepage: http://nzjrs.github.com/osm-gps-map/
 
-Package: libosmgpsmap-1.0-dev
+Package: libosmgpsmap-1.0-0-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libosmgpsmap-1.0-0 (= ${binary:Version}),
          gir1.2-osmgpsmap-1.0
-Breaks: libosmgpsmap-dev
-Conflicts: libosmgpsmap-dev
+Provides: libosmgpsmap-dev, libosmgpsmap-1.0-dev
+Conflicts: libosmgpsmap-dev, libosmgpsmap-1.0-dev
 Description: GTK+ library to embed OpenStreetMap maps - development files
  libosmgpsmap is a library to embed maps in applications that when given GPS 
  co-ordinates, draws a GPS track, and points of interest on a moving map 
@@ -46,6 +47,7 @@ Description: GTK+ library to embed OpenStreetMap maps - development files
 Package: libosmgpsmap-1.0-0
 Architecture: any
 Multi-Arch: same
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/libosmgpsmap-1.0-0.install b/debian/libosmgpsmap-1.0-0.install
deleted file mode 100644
index 3ddde58..0000000
--- a/debian/libosmgpsmap-1.0-0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff --git a/debian/libosmgpsmap-1.0-dev.examples b/debian/libosmgpsmap-1.0-dev.examples
index 82011ac..a68b431 100644
--- a/debian/libosmgpsmap-1.0-dev.examples
+++ b/debian/libosmgpsmap-1.0-dev.examples
@@ -1,5 +1,2 @@
-examples/mapviewer.js
-examples/mapviewer.c
-examples/mapviewer.ui
-examples/mapviewer.py
+examples/*.js
 examples/poi.png
diff --git a/debian/libosmgpsmap-1.0-dev.install b/debian/libosmgpsmap-1.0-dev.install
index c3fa8f9..516c249 100644
--- a/debian/libosmgpsmap-1.0-dev.install
+++ b/debian/libosmgpsmap-1.0-dev.install
@@ -1,6 +1 @@
-usr/include/*
-usr/lib/*/lib*.a
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
-
 docs/reference/html/*	/usr/share/gtk-doc/html/osmgpsmap/
diff --git a/debian/rules b/debian/rules
index 1363b07..bb730fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,18 @@ override_dh_auto_install:
 	dh_auto_install
 	dh_girepository
 
+override_dh_install:
+	rm `find debian/tmp -name '*.la'`
+	d-shlibmove --commit \
+		    --multiarch \
+		    --override s/libgtk-3-0-dev/libgtk-3-dev/ \
+		    --override s/libsoup-2.4-1-dev/libsoup2.4-dev/ \
+		    --override s/libcairo-gobject2-dev/libcairo2-dev/ \
+		    --override s/libgdk-3-0-dev/libgtk-3-dev/ \
+		    --movedev debian/tmp/usr/include/* usr/include \
+		    debian/tmp/usr/lib/*/lib*.so
+	dh_install
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf docs/reference/tmpl/

-- 
GTK+ library to embed OpenStreetMap maps