[libcitygml] 10/11: Disable OpenSceneGraph plugin again, still FTBFS.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libcitygml.

commit 38b667793ad52412e96f08b03017e28ed8b17c9d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 31 23:51:58 2015 +0200

    Disable OpenSceneGraph plugin again, still FTBFS.
    
    Revert "Reinstate openscenegraph plugin packages."
    
    This reverts commit b8a79aec57a3b7a3b76c54e0a007664c5b59e213.
    
    Conflicts:
    	debian/control
---
 debian/changelog                                   |  1 -
 debian/control                                     | 43 ----------------------
 debian/gencontrol                                  |  9 -----
 .../openscenegraph-plugin-citygml-shared.install   |  1 -
 .../openscenegraph-plugin-citygml-static.install   |  1 -
 debian/rules                                       |  4 --
 6 files changed, 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcbba8b..100d020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ libcitygml (2.0-1) UNRELEASED; urgency=medium
   * Update Vcs-Browser URL to use HTTPS.
   * Rename library package for SONAME bump.
   * Update symbols for amd64.
-  * Reinstate openscenegraph plugin packages.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 31 Aug 2015 00:22:05 +0200
 
diff --git a/debian/control b/debian/control
index db4303b..d2048ca 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9),
                libgdal-dev,
                libgl1-mesa-dev | libgl-dev,
                libglu-dev,
-               libopenscenegraph-dev (>= 3.0.1-4~),
                pkg-kde-tools
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/libcitygml.git
@@ -81,45 +80,3 @@ Description: Utils of libcitygml - citygmltest
  .
  This package contains the citygmltest utility.
 
-Package: openscenegraph-plugin-citygml-shared
-Architecture: any
-Section: devel
-Depends: libcitygml2 (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${misc:Depends},
-         ${libosg-share}
-Description: libcitygml OpenSceneGraph plugin (shared version)
- libcitygml is a small and easy to use open source C++ library for parsing
- CityGML files in such a way that data can be easily exploited by 3D
- rendering applications (geometry data are tesselated and optimized for
- rendering during parsing). For instance, it can be used to develop readers
- of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...)
- Most metadata are not lost, they are available through a per-node hashmap.
- .
- CityGML (City Geography Markup Language) is an XML-based schema for the
- modelling and exchange of georeferenced 3D city and landscape models that
- is quickly being adopted on an international level.
- .
- This package contains OpenSceneGraph plugin (.so version).
-
-Package: openscenegraph-plugin-citygml-static
-Architecture: any
-Section: devel
-Depends: libcitygml2 (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${misc:Depends},
-         ${libosg-static}
-Description: libcitygml OpenSceneGraph plugin (static version)
- libcitygml is a small and easy to use open source C++ library for parsing
- CityGML files in such a way that data can be easily exploited by 3D
- rendering applications (geometry data are tesselated and optimized for
- rendering during parsing). For instance, it can be used to develop readers
- of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...)
- Most metadata are not lost, they are available through a per-node hashmap.
- .
- CityGML (City Geography Markup Language) is an XML-based schema for the
- modelling and exchange of georeferenced 3D city and landscape models that
- is quickly being adopted on an international level.
- .
- This package contains OpenSceneGraph plugin (.a version).
-
diff --git a/debian/gencontrol b/debian/gencontrol
deleted file mode 100644
index c7bc71f..0000000
--- a/debian/gencontrol
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBOSG_SHARE=`dpkg --get-selections | grep "libopenscenegraph[0-9]*[v5]*:.*\s*install" | awk '{print $1}' | awk -F: '{print $1}'`
-LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE | grep "^ii\s*$LIBOSG_SHARE" | awk '{print $3}' | sed 's/-.*//'`
-TMP1=`echo $LIBOSG_VERSION | awk -F '.' '{print $1}'`
-TMP2=`echo $LIBOSG_VERSION | awk -F '.' '{print $2}'`
-TMP3=`echo $LIBOSG_VERSION | awk -F '.' '{print $3}' | sed 's/~.*$//'`
-TMP3=$((TMP3+1))
-LIBOSG_VERSIONPLUS=$TMP1.$TMP2.$TMP3~
-echo $LIBOSG_VERSION
-dh_gencontrol -- -Vlibosg-share="$LIBOSG_SHARE" -Vlibosg-static="libopenscenegraph-dev (>= $LIBOSG_VERSION), libopenscenegraph-dev (<< $LIBOSG_VERSIONPLUS)"
diff --git a/debian/openscenegraph-plugin-citygml-shared.install b/debian/openscenegraph-plugin-citygml-shared.install
deleted file mode 100644
index fd4b5ad..0000000
--- a/debian/openscenegraph-plugin-citygml-shared.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/osgPlugins-*/*.so
diff --git a/debian/openscenegraph-plugin-citygml-static.install b/debian/openscenegraph-plugin-citygml-static.install
deleted file mode 100644
index 2025369..0000000
--- a/debian/openscenegraph-plugin-citygml-static.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/osgPlugins-*/*.a
diff --git a/debian/rules b/debian/rules
index c34530e..67261b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,11 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DLIBCITYGML_OSGPLUGIN=ON \
 		-DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_install:
 	dh_install --list-missing
 
-override_dh_gencontrol:
-	sh debian/gencontrol
-
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c0 -v$(CITYGML_VERSION)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git