[pkg-fgfs-crew] [flightgear] 02/02: Adjust to a new pre-release, multiple other improvements.

Markus Wanner markus_wanner-guest at moszumanska.debian.org
Thu Jan 23 23:04:58 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 flightgear.

commit 185a9611b31cba10443d6276f9ee3be3632b7cbc
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri Jan 24 00:00:43 2014 +0100

    Adjust to a new pre-release, multiple other improvements.
    
    * Drop the libsvn-dev dependency, neither flightgear nor simgear depend
      on libsvn, anymore.
    * Add a flightgear-dbg package for debugging symbols, add an .install
      file for the main flightgear package, list icons there, rather than
      copying around from rules.
    * patches/compilation-fix.diff: work-around a compilation error on amd64.
    * flightgear.desktop: add German translation
    
    * Correct the date in the version.
    * Add the required libdbus-1-dev dependency.
---
 debian/changelog                    | 12 ++++++++++--
 debian/control                      | 14 +++++++++++++-
 debian/copyright                    |  1 -
 debian/flightgear.desktop           |  7 ++++---
 debian/flightgear.install           |  4 ++++
 debian/menu                         |  2 +-
 debian/patches/compilation-fix.diff | 24 ++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        | 21 +++++++--------------
 9 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2f6cc0..5dadc84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flightgear (3.0.0~git201401+2c6d4e-1) UNRELEASED; urgency=low
+flightgear (3.0.0~git20140123+f16c99-1) UNRELEASED; urgency=low
 
   [ Markus Wanner ]
   * Adjust B-D to allow building on kfreebsd-*. Closes: #724686.
@@ -6,6 +6,13 @@ flightgear (3.0.0~git201401+2c6d4e-1) UNRELEASED; urgency=low
   * Drop unnecessary man page for gl-info. Closes: #698308.
   * Drop README.Linux: it's outdated to the point of uselessness.
     Closes: #574173.
+  * Drop the libsvn-dev dependency, neither flightgear nor simgear depend
+    on libsvn, anymore.
+  * Add a flightgear-dbg package for debugging symbols, add an .install
+    file for the main flightgear package, list icons there, rather than
+    copying around from rules.
+  * patches/compilation-fix.diff: work-around a compilation error on amd64.
+  * flightgear.desktop: add German translation
   * Bump Standards-Version to 3.9.5; no changes needed.
 
   [ Rebecca Palmer ]
@@ -14,7 +21,8 @@ flightgear (3.0.0~git201401+2c6d4e-1) UNRELEASED; urgency=low
     (Not a complete fix for 713924/LP908153 as it only
     sets the menu/Dash icon, not the running window's icon,
     but better than nothing).
-  * Disable screensaver while running. Closes: LP#793599.
+  * Disable screensaver while running. Closes: LP#793599. Add required
+    libdbus-1-dev dependency.
   * Remove outdated README.Debian.
   * Terrasync now works after just ticking the box. Closes: #252899.
   * Always set Terrasync directory.
diff --git a/debian/control b/debian/control
index bad11a0..8d5c5e3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Ove Kaaven <ovek at arcticnet.no>,
  Markus Wanner <markus at bluegap.ch>
 Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
  libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev, zlib1g-dev,
- libboost-dev, libopenal-dev, libalut-dev, libsvn-dev,
+ libboost-dev, libopenal-dev, libalut-dev,
  libplib-dev (>= 1.8.5), cmake (>= 2.6),
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
@@ -34,3 +34,15 @@ Description: Flight Gear Flight Simulator
  framework, created by volunteers.
  .
  This package contains the runtime binaries.
+
+Package: flightgear-dbg
+Architecture: any
+Section: debug
+Pre-Depends: ${misc-Pre-Depends}
+Depends: flightgear (= ${binary:Version}), ${misc:Depends}
+Description: Flight Gear Flight Simulator - debugging symbols
+ FlightGear Flight Simulator (often shortened to FlightGear or FGFS)
+ is a sophisticated free, completely open-source flight simulator
+ framework, created by volunteers.
+ .
+ This package contains the debugging symbols.
diff --git a/debian/copyright b/debian/copyright
index 1b1f8c1..309fe30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -230,7 +230,6 @@ License: GPL-2+
 
 Files: man/fgfs.1.in
  man/fgjs.1.in
- man/gl-info.1.in
  man/js_demo.1.in
 Copyright: 2002, Cameron Moore
 License: GPL-2+
diff --git a/debian/flightgear.desktop b/debian/flightgear.desktop
index 64caf95..6b0862f 100644
--- a/debian/flightgear.desktop
+++ b/debian/flightgear.desktop
@@ -5,8 +5,9 @@ Name=FlightGear
 GenericName=Flight Simulator
 Exec=fgfs
 Terminal=false
-Categories=Game;Simulation;
-Comment=A flight simulator
+Categories=Game;Simulation
+Comment=open-source flight simulator
+Comment[de]=Open-Source Flugsimulator
 Comment[pt]=Simulação de Vôo
 Keywords=
-Icon=fgfs
+Icon=flightgear
diff --git a/debian/flightgear.install b/debian/flightgear.install
new file mode 100644
index 0000000..4758945
--- /dev/null
+++ b/debian/flightgear.install
@@ -0,0 +1,4 @@
+usr/games
+usr/share
+icons/??x?? usr/share/icons/
+icons/scalable/*.svg                            usr/share/icons/scalable/apps/
diff --git a/debian/menu b/debian/menu
index 367de42..530897a 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
 ?package(flightgear):needs="X11" section="Games/Simulation"\
-  title="Flight Gear" command="/usr/games/fgfs"
+  title="FlightGear" command="/usr/games/fgfs"
diff --git a/debian/patches/compilation-fix.diff b/debian/patches/compilation-fix.diff
new file mode 100644
index 0000000..570c39c
--- /dev/null
+++ b/debian/patches/compilation-fix.diff
@@ -0,0 +1,24 @@
+Description: fix for amd64 build issue
+Author: Markus Wanner <markus at bluegap.ch>
+Forwarded: no
+Last-Update: 2014-01-23
+
+--- a/src/Navaids/NavDataCache.cxx
++++ b/src/Navaids/NavDataCache.cxx
+@@ -942,6 +942,7 @@
+   assert(rowid == sqlite3_column_int64(loadPositioned, 0));
+   FGPositioned::Type ty = (FGPositioned::Type) sqlite3_column_int(loadPositioned, 1);
+   
++  PositionedID prowid = static_cast<PositionedID>(rowid);
+   string ident = (char*) sqlite3_column_text(loadPositioned, 2);
+   string name = (char*) sqlite3_column_text(loadPositioned, 3);
+   sqlite3_int64 aptId = sqlite3_column_int64(loadPositioned, 4);
+@@ -959,7 +960,7 @@
+       return loadAirport(rowid, ty, ident, name, pos);
+       
+     case FGPositioned::TOWER:
+-      return new AirportTower(rowid, aptId, ident, pos);
++      return new AirportTower(prowid, aptId, ident, pos);
+       
+     case FGPositioned::RUNWAY:
+     case FGPositioned::HELIPAD:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..57306cb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+compilation-fix.diff
diff --git a/debian/rules b/debian/rules
index 27a26dd..6070ab9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,25 +39,15 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install
 
-#	The CMAKE_INSTALL_BINDIR might be ignored
-	if [ -d debian/flightgear/usr/bin ]; then \
-	  mv debian/flightgear/usr/bin/* debian/flightgear/usr/games; \
+#	The CMAKE_INSTALL_BINDIR is ignored
+	if [ -d debian/tmp/usr/bin ]; then \
+	  mkdir -p debian/tmp/usr/games; \
+	  mv debian/tmp/usr/bin/* debian/tmp/usr/games/; \
 	fi
 
-#	Drop an unneeded man page.
-	rm $(CURDIR)/debian/flightgear/usr/share/man/man1/gl-info.1
-
 #	Remove empty directories
 	find $(CURDIR)/debian/flightgear -type d -empty -delete
 
-#	Install icons
-	dh_installdirs --package=flightgear usr/share/pixmaps
-	cp -a icons/fg-48.png debian/flightgear/usr/share/pixmaps/fgfs.png
-	for size in 16 32 48 64 128 ; do \
-	  dh_installdirs --package=flightgear usr/share/icons/hicolor/$${size}x$${size}/apps ; \
-	  cp -a icons/fg-$$size.png debian/flightgear/usr/share/icons/hicolor/$${size}x$${size}/apps/fgfs.png ; \
-	done
-
 override_dh_installdocs:
 	dh_installdocs
 	cp docs-mini/* debian/flightgear/usr/share/doc/flightgear || true
@@ -72,6 +62,9 @@ override_dh_installdocs:
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
+override_dh_strip:
+	dh_strip --dbg-package=flightgear-dbg
+
 copyright_check:
 	${MAKE} -f /usr/share/cdbs/1/rules/utils.mk debian/stamp-copyright-check
 	rm debian/stamp-copyright-check

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

More information about the pkg-fgfs-crew mailing list