[pkg-fgfs-crew] [simgear] 03/03: Adjust to 2.12.1
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Tue Jan 21 21:25:01 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 e2f7dcdf9d1b7c481bcbd05a6e146c9e9c91e52f
Author: Markus Wanner <markus at bluegap.ch>
Date: Tue Jan 21 22:05:21 2014 +0100
Adjust to 2.12.1
Automate adjustment of .install and .shlib files via clean targen
in debian/rules.
Bump Standards-Version to 3.9.5.
---
debian/changelog | 9 +++++++++
debian/control | 20 ++++++++++----------
debian/{control => control.in} | 20 ++++++++++----------
debian/libsimgearcore2.12.0.install | 1 -
debian/libsimgearcore2.12.0.shlibs | 1 -
debian/libsimgearcore2.12.1.install | 1 +
debian/libsimgearcore2.12.1.shlibs | 1 +
debian/libsimgearscene2.12.0.install | 1 -
debian/libsimgearscene2.12.0.shlibs | 1 -
debian/libsimgearscene2.12.1.install | 1 +
debian/libsimgearscene2.12.1.shlibs | 1 +
debian/rules | 30 ++++++++++++++++++++++++++----
12 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f1d9e11..50c336d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+simgear (2.12.1-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.
+
+ -- Markus Wanner <markus at bluegap.ch> Tue, 21 Jan 2014 22:03:33 +0100
+
simgear (2.12.0-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index aa8d2ad..4519cf9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,12 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev, libxext-dev, libxi-dev,
freeglut3-dev | libglut3-dev,
libjpeg8-dev | libjpeg62-dev | libjpeg-dev,
libopenscenegraph-dev (>> 3.0.0)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
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.0
+Package: libsimgearcore2.12.1
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.0-dbg
+Package: libsimgearcore2.12.1-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12.1 (= ${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.0
+Package: libsimgearscene2.12.1
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12.1 (= ${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.0-dbg
+Package: libsimgearscene2.12.1-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12.1 (= ${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.0 (= ${binary:Version}),
- libsimgearscene2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore2.12.1 (= ${binary:Version}),
+ libsimgearscene2.12.1 (= ${binary:Version}),
libopenscenegraph-dev, libc6-dev, ${misc:Depends}
Replaces: simgear-dev (<< 2.10.0~)
Breaks: simgear-dev (<< 2.10.0~)
diff --git a/debian/control b/debian/control.in
similarity index 87%
copy from debian/control
copy to debian/control.in
index aa8d2ad..1a69f40 100644
--- a/debian/control
+++ b/debian/control.in
@@ -12,12 +12,12 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev, libxext-dev, libxi-dev,
freeglut3-dev | libglut3-dev,
libjpeg8-dev | libjpeg62-dev | libjpeg-dev,
libopenscenegraph-dev (>> 3.0.0)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
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.0
+Package: libsimgearcore##UVER
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.0-dbg
+Package: libsimgearcore##UVER-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore##UVER (= ${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.0
+Package: libsimgearscene##UVER
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore##UVER (= ${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.0-dbg
+Package: libsimgearscene##UVER-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore##UVER (= ${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.0 (= ${binary:Version}),
- libsimgearscene2.12.0 (= ${binary:Version}),
+Depends: libsimgearcore##UVER (= ${binary:Version}),
+ libsimgearscene##UVER (= ${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.0.install b/debian/libsimgearcore2.12.0.install
deleted file mode 100644
index 5b26217..0000000
--- a/debian/libsimgearcore2.12.0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libSimGearCore.so.2.12*
diff --git a/debian/libsimgearcore2.12.0.shlibs b/debian/libsimgearcore2.12.0.shlibs
deleted file mode 100644
index f301085..0000000
--- a/debian/libsimgearcore2.12.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearCore 2.12.0 libsimgearcore2.12.0 (>= 2.12.0~)
diff --git a/debian/libsimgearcore2.12.1.install b/debian/libsimgearcore2.12.1.install
new file mode 100644
index 0000000..93272c0
--- /dev/null
+++ b/debian/libsimgearcore2.12.1.install
@@ -0,0 +1 @@
+usr/lib/*/libSimGearCore.so.*
diff --git a/debian/libsimgearcore2.12.1.shlibs b/debian/libsimgearcore2.12.1.shlibs
new file mode 100644
index 0000000..0125a7a
--- /dev/null
+++ b/debian/libsimgearcore2.12.1.shlibs
@@ -0,0 +1 @@
+libSimGearCore 2.12.1 libsimgearcore2.12.1 (>= 2.12.1~)
diff --git a/debian/libsimgearscene2.12.0.install b/debian/libsimgearscene2.12.0.install
deleted file mode 100644
index 45b0acd..0000000
--- a/debian/libsimgearscene2.12.0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libSimGearScene.so.2.12*
diff --git a/debian/libsimgearscene2.12.0.shlibs b/debian/libsimgearscene2.12.0.shlibs
deleted file mode 100644
index 12d8123..0000000
--- a/debian/libsimgearscene2.12.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearScene 2.12.0 libsimgearscene2.12.0 (>= 2.12.0~)
diff --git a/debian/libsimgearscene2.12.1.install b/debian/libsimgearscene2.12.1.install
new file mode 100644
index 0000000..14ff3cb
--- /dev/null
+++ b/debian/libsimgearscene2.12.1.install
@@ -0,0 +1 @@
+usr/lib/*/libSimGearScene.so.*
diff --git a/debian/libsimgearscene2.12.1.shlibs b/debian/libsimgearscene2.12.1.shlibs
new file mode 100644
index 0000000..9a22cfd
--- /dev/null
+++ b/debian/libsimgearscene2.12.1.shlibs
@@ -0,0 +1 @@
+libSimGearScene 2.12.1 libsimgearscene2.12.1 (>= 2.12.1~)
diff --git a/debian/rules b/debian/rules
index f2f6605..c5043b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,20 @@
# debian/rules for simgear, by Markus Wanner
# based on the dh7 template provided by dh_make(1)
-#http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
+# Get upstream version for automatic generation of some packaging files
+UVER:=$(shell cat $(CURDIR)/version)
+
+# http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
ifneq (,$(findstring $(DEB_HOST_ARCH) , amd64 i386 mipsel ia64 armel armhf arm64 ))
+
# Note the spaces in the condition above. They stop 'mips' from
# matching 'mipsel'
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
else
-#required on big-endian architectures, see bug #722115
+
+# Required on big-endian architectures, see bug #722115
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -fno-strict-aliasing
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -fno-strict-aliasing
endif
@@ -33,13 +38,30 @@ CMAKE_FLAGS = \
%:
dh $@ --buildsystem=cmake --builddirectory=build --parallel
+override_dh_auto_clean:
+# Generate a couple of files automatically, based on the given
+# upsteram version.
+ cat $(CURDIR)/debian/control.in \
+ | sed 's/\#\#UVER/$(UVER)/' > $(CURDIR)/debian/control
+ rm -f $(CURDIR)/debian/libsimgear*.shlibs $(CURDIR)/debian/libsimgear*.install
+ echo "libSimGearCore $(UVER) libsimgearcore$(UVER) (>= $(UVER)~)" \
+ > $(CURDIR)/debian/libsimgearcore$(UVER).shlibs
+ echo "usr/lib/*/libSimGearCore.so.*" \
+ > $(CURDIR)/debian/libsimgearcore$(UVER).install
+ echo "libSimGearScene $(UVER) libsimgearscene$(UVER) (>= $(UVER)~)" \
+ > $(CURDIR)/debian/libsimgearscene$(UVER).shlibs
+ echo "usr/lib/*/libSimGearScene.so.*" \
+ > $(CURDIR)/debian/libsimgearscene$(UVER).install
+
+ dh_auto_clean
+
override_dh_auto_configure:
mkdir build
cd build && cmake .. $(CMAKE_FLAGS)
override_dh_strip:
- dh_strip -plibsimgearcore2.12.0 --dbg-package=libsimgearcore2.12.0-dbg
- dh_strip -plibsimgearscene2.12.0 --dbg-package=libsimgearscene2.12.0-dbg
+ dh_strip -plibsimgearcore$(UVER) --dbg-package=libsimgearcore$(UVER)-dbg
+ dh_strip -plibsimgearscene$(UVER) --dbg-package=libsimgearscene$(UVER)-dbg
get-orig-source:
uscan --download-current-version --verbose --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/simgear.git
More information about the pkg-fgfs-crew
mailing list