[osgearth] 09/15: Update packaging for libosgEarthQt changes.

Bas Couwenberg sebastic at debian.org
Sun Jan 7 14:41:00 UTC 2018


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

sebastic pushed a commit to branch experimental
in repository osgearth.

commit e2f1f8dfa404f434fdaa0a9412e353c43c60e135
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 7 11:14:45 2018 +0100

    Update packaging for libosgEarthQt changes.
---
 debian/changelog                                            | 1 +
 debian/control                                              | 4 ++--
 debian/libosgearthqt5-5.install                             | 1 +
 debian/{libosgearthqt5.symbols => libosgearthqt5-5.symbols} | 2 +-
 debian/libosgearthqt5.install                               | 1 -
 debian/rules                                                | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a931fd6..189e7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osgearth (2.9~rc1+dfsg-1) UNRELEASED; urgency=medium
   * Strip trailing whitespace from changelog.
   * Update Files-Excluded for osgEarth 2.9rc1.
   * Refresh patches.
+  * Update packaging for libosgEarthQt changes.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Jan 2018 10:14:55 +0100
 
diff --git a/debian/control b/debian/control
index 7c0f55b..db3abc6 100644
--- a/debian/control
+++ b/debian/control
@@ -111,7 +111,7 @@ Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthFe
  .
  This package contains the shared library libosgEarthFeatures.
 
-Package: libosgearthqt5
+Package: libosgearthqt5-5
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -195,7 +195,7 @@ Section: libdevel
 Depends: libosgearth5 (= ${binary:Version}),
          libosgearthannotation5 (= ${binary:Version}),
          libosgearthfeatures5 (= ${binary:Version}),
-         libosgearthqt5 (= ${binary:Version}),
+         libosgearthqt5-5 (= ${binary:Version}),
          libosgearthsplat5 (= ${binary:Version}),
          libosgearthsymbology5 (= ${binary:Version}),
          libosgearthutil5 (= ${binary:Version}),
diff --git a/debian/libosgearthqt5-5.install b/debian/libosgearthqt5-5.install
new file mode 100644
index 0000000..5ee8005
--- /dev/null
+++ b/debian/libosgearthqt5-5.install
@@ -0,0 +1 @@
+usr/lib/libosgEarthQt5.so.*
diff --git a/debian/libosgearthqt5.symbols b/debian/libosgearthqt5-5.symbols
similarity index 98%
rename from debian/libosgearthqt5.symbols
rename to debian/libosgearthqt5-5.symbols
index da7ed71..bf6ac0a 100644
--- a/debian/libosgearthqt5.symbols
+++ b/debian/libosgearthqt5-5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 2.8.0 armhf
-libosgEarthQt.so.5 #PACKAGE# #MINVER#
+libosgEarthQt5.so.5 #PACKAGE# #MINVER#
  (optional=templinst|arch=armel)_ZN5QListI7QStringE9node_copyEPNS1_4NodeES3_S3_ at Base 2.7.0
  _ZN5osgQt16GraphicsWindowQt10WindowDataD0Ev at Base 2.4.0
  _ZN5osgQt16GraphicsWindowQt10WindowDataD1Ev at Base 2.4.0
diff --git a/debian/libosgearthqt5.install b/debian/libosgearthqt5.install
deleted file mode 100644
index 33c92c1..0000000
--- a/debian/libosgearthqt5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libosgEarthQt.so.*
diff --git a/debian/rules b/debian/rules
index 41368c7..5f927c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ override_dh_auto_configure:
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH) \
 		-DLIB_POSTFIX="" \
-		-DOSGEARTH_USE_QT=1
+		-DOSGEARTH_QT_BUILD=1
 
 override_dh_auto_build:
 	# Create man pages from DocBook XML

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



More information about the Pkg-grass-devel mailing list