[SCM] osgearth branch, master, updated. debian/1.4.1-1-83-gbcb0d90

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 4c5f2715f377fe60dbc36bb766e4c4c872f3cb4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 22 00:20:12 2013 +0200

    Add versioned Breaks/Replaces for libosgearth2.
    Add versioned Breaks/Replaces for libosgearth2.
    Drop transitional package libosgearth1.

diff --git a/debian/changelog b/debian/changelog
index 2c65a16..40447b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osgearth (2.4.0+dfsg-5) UNRELEASED; urgency=low
+
+  * Add versioned Breaks/Replaces for libosgearth2.
+  * Drop transitional package libosgearth1.
+    (closes: #723980)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 22 Sep 2013 00:18:20 +0200
+
 osgearth (2.4.0+dfsg-4) unstable; urgency=low
 
   * Upload for Debian closes: #718382, #719376, #722408.
diff --git a/debian/control b/debian/control
index 84b9368..933e037 100644
--- a/debian/control
+++ b/debian/control
@@ -56,31 +56,15 @@ Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (data)
  .
  This package contains data files.
 
-Package: libosgearth1
-Architecture: any
-Section: oldlibs
-Depends: libosgearth2,
-         libosgearthannotation2,
-         libosgearthfeatures2,
-         libosgearthqt2,
-         libosgearthsymbology2,
-         libosgearthutil2,
-         ${misc:Depends}
-Description: Transitional dummy package for libosgearth2
- This is a transitional dummy package to ease upgrades from the
- libosgearth1 package to the libosgearth2 package.
- It can safely be removed.
-
 Package: libosgearth2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: openscenegraph
-Breaks: libosgearth1,
+Breaks: libosgearth1 (<< 2.4.0+dfsg-4~),
         osgearth (<< 1.4-2)
-Provides: libosgearth1
-Replaces: libosgearth1,
+Replaces: libosgearth1 (<< 2.4.0+dfsg-4~),
           osgearth (<< 1.4-2)
 Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared lib)
  osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph

-- 
osgEarth terrain rendering toolkit