[pkg-fgfs-crew] [simgear] 02/03: Adapt to the 3.0.0 pre-release.

Wed Jan 22 21:56:08 UTC 2014

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

markus_wanner-guest pushed a commit to branch master
in repository simgear.

commit 3a44cd02ea634117ddc083e4d231eb90d919ca54
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Jan 22 22:54:51 2014 +0100

    Adapt to the 3.0.0 pre-release.
    
    * Drop patch cppbind-charsignedness.diff, it got applied upstream
---
 debian/changelog                                       |  5 +++--
 debian/control                                         | 18 +++++++++---------
 debian/libsimgearcore2.12.1.shlibs                     |  1 -
 ...rcore2.12.1.install => libsimgearcore3.0.0.install} |  0
 debian/libsimgearcore3.0.0.shlibs                      |  1 +
 debian/libsimgearscene2.12.1.shlibs                    |  1 -
 ...cene2.12.1.install => libsimgearscene3.0.0.install} |  0
 debian/libsimgearscene3.0.0.shlibs                     |  1 +
 debian/patches/cppbind-charsignedness.diff             | 15 ---------------
 debian/patches/series                                  |  1 -
 10 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50c336d..179c5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-simgear (2.12.1-1) UNRELEASED; urgency=low
+simgear (3.0.0~git20140121+2c6d4e-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Automate adjustment of .install and .shlibs via clean target in
     debian/rules.
   * Bump Standards-Version to 3.9.5; no changes needed.
+  * Drop patch cppbind-charsignedness.diff, it got applied upstream.
 
- -- Markus Wanner <markus at bluegap.ch>  Tue, 21 Jan 2014 22:03:33 +0100
+ -- Markus Wanner <markus at bluegap.ch>  Wed, 22 Jan 2014 22:48:02 +0100
 
 simgear (2.12.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 4519cf9..78eaca1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://www.simgear.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/simgear.git
 
-Package: libsimgearcore2.12.1
+Package: libsimgearcore3.0.0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -30,12 +30,12 @@ Description: Simulator Construction Gear -- core library
  .
  This package contains the core library.
 
-Package: libsimgearcore2.12.1-dbg
+Package: libsimgearcore3.0.0-dbg
 Architecture: any
 Section: debug
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.1 (= ${binary:Version}),
+Depends: libsimgearcore3.0.0 (= ${binary:Version}),
  ${misc:Depends}
 Description: debugging symbols for libsimgearcore
  SimGear is a collection of libraries useful for constructing
@@ -44,11 +44,11 @@ Description: debugging symbols for libsimgearcore
  .
  This package contains the debug symbols for the core library.
 
-Package: libsimgearscene2.12.1
+Package: libsimgearscene3.0.0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.1 (= ${binary:Version}),
+Depends: libsimgearcore3.0.0 (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: simgear0
 Description: Simulator Construction Gear -- scene library
@@ -58,12 +58,12 @@ Description: Simulator Construction Gear -- scene library
  .
  This package contains the scene library.
 
-Package: libsimgearscene2.12.1-dbg
+Package: libsimgearscene3.0.0-dbg
 Architecture: any
 Section: debug
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.1 (= ${binary:Version}),
+Depends: libsimgearcore3.0.0 (= ${binary:Version}),
  ${misc:Depends}
 Conflicts: simgear0
 Description: debugging symbols for libsimgearscene
@@ -76,8 +76,8 @@ Description: debugging symbols for libsimgearscene
 Package: libsimgear-dev
 Architecture: any
 Section: libdevel
-Depends: libsimgearcore2.12.1 (= ${binary:Version}),
- libsimgearscene2.12.1 (= ${binary:Version}),
+Depends: libsimgearcore3.0.0 (= ${binary:Version}),
+ libsimgearscene3.0.0 (= ${binary:Version}),
  libopenscenegraph-dev, libc6-dev, ${misc:Depends}
 Replaces: simgear-dev (<< 2.10.0~)
 Breaks: simgear-dev (<< 2.10.0~)
diff --git a/debian/libsimgearcore2.12.1.shlibs b/debian/libsimgearcore2.12.1.shlibs
deleted file mode 100644
index 0125a7a..0000000
--- a/debian/libsimgearcore2.12.1.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearCore 2.12.1 libsimgearcore2.12.1 (>= 2.12.1~)
diff --git a/debian/libsimgearcore2.12.1.install b/debian/libsimgearcore3.0.0.install
similarity index 100%
rename from debian/libsimgearcore2.12.1.install
rename to debian/libsimgearcore3.0.0.install
diff --git a/debian/libsimgearcore3.0.0.shlibs b/debian/libsimgearcore3.0.0.shlibs
new file mode 100644
index 0000000..4a13f43
--- /dev/null
+++ b/debian/libsimgearcore3.0.0.shlibs
@@ -0,0 +1 @@
+libSimGearCore 3.0.0 libsimgearcore3.0.0 (>= 3.0.0~)
diff --git a/debian/libsimgearscene2.12.1.shlibs b/debian/libsimgearscene2.12.1.shlibs
deleted file mode 100644
index 9a22cfd..0000000
--- a/debian/libsimgearscene2.12.1.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearScene 2.12.1 libsimgearscene2.12.1 (>= 2.12.1~)
diff --git a/debian/libsimgearscene2.12.1.install b/debian/libsimgearscene3.0.0.install
similarity index 100%
rename from debian/libsimgearscene2.12.1.install
rename to debian/libsimgearscene3.0.0.install
diff --git a/debian/libsimgearscene3.0.0.shlibs b/debian/libsimgearscene3.0.0.shlibs
new file mode 100644
index 0000000..759d19f
--- /dev/null
+++ b/debian/libsimgearscene3.0.0.shlibs
@@ -0,0 +1 @@
+libSimGearScene 3.0.0 libsimgearscene3.0.0 (>= 3.0.0~)
diff --git a/debian/patches/cppbind-charsignedness.diff b/debian/patches/cppbind-charsignedness.diff
deleted file mode 100644
index 5c50c58..0000000
--- a/debian/patches/cppbind-charsignedness.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Subject: correct signedness of 'emblen' in struct naStr.
-From: Rebecca Palmer
-Last-Update: 2013-09-13
-
---- a/simgear/nasal/data.h
-+++ b/simgear/nasal/data.h
-@@ -96,7 +96,7 @@
- #define MAX_STR_EMBLEN 15
- struct naStr {
-     GC_HEADER;
--    char emblen; /* [0-15], or -1 to indicate "not embedded" */
-+    signed char emblen; /* [0-15], or -1 to indicate "not embedded" */
-     unsigned int hashcode;
-     union {
-         unsigned char buf[16];
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0ca05fd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-cppbind-charsignedness.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/simgear.git

