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

[Andreas Tille]

The following commit has been merged in the master branch:
commit e6c1c053fd69176cdad125a04dbb330a5cb32635
Author: Andreas Tille <tille at debian.org>
Date:   Sat Feb 8 21:06:02 2014 +0100

    Revert change of versioned devel package

diff --git a/debian/changelog b/debian/changelog
index a287243..5f95676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osm-gps-map (1.0.1-3) UNRELEASED; urgency=medium
+
+  * Revert versioned development packages since this breaks reverse
+    dependency subsurface
+    Closes: #737312
+
+ -- Andreas Tille <tille at debian.org>  Sat, 08 Feb 2014 21:00:20 +0100
+
 osm-gps-map (1.0.1-2) unstable; urgency=medium
 
   * Apply patch from Ross Gammon <rossgammon at mail.dk>
diff --git a/debian/control b/debian/control
index 077f2f5..3e0bf80 100644
--- a/debian/control
+++ b/debian/control
@@ -26,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-0-dev
+Package: libosmgpsmap-1.0-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libosmgpsmap-1.0-0 (= ${binary:Version}),
          gir1.2-osmgpsmap-1.0
-Provides: libosmgpsmap-dev, libosmgpsmap-1.0-dev
-Conflicts: libosmgpsmap-dev, libosmgpsmap-1.0-dev
+Breaks: libosmgpsmap-dev
+Provides: libosmgpsmap-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 
diff --git a/debian/rules b/debian/rules
index bb730fa..8ecb72a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_install:
 	rm `find debian/tmp -name '*.la'`
 	d-shlibmove --commit \
 		    --multiarch \
+		    --devunversioned \
 		    --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/ \

-- 
GTK+ library to embed OpenStreetMap maps