[pkg-fgfs-crew] [flightgear] 01/01: Revert the addition of flightgear-dbg
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Thu Jan 30 23:01:24 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 59135187c7b28652db73b7adb953ee57211e6c17
Author: Markus Wanner <markus at bluegap.ch>
Date: Thu Jan 30 23:59:36 2014 +0100
Revert the addition of flightgear-dbg
So we don't need to go through NEW. This also uncovered the fact that
I had a dangling install file, before. flightgear.install now merged
back into install.
---
debian/changelog | 4 +---
debian/control | 11 -----------
debian/flightgear.install | 4 ----
debian/install | 2 ++
debian/rules | 9 +++------
5 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b606e5a..f083328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,7 @@ flightgear (3.0.0~git20140123+f16c99-1) unstable; urgency=low
Closes: #574173.
* Drop the libsvn-dev dependency, neither flightgear nor simgear depend
on libsvn, anymore. Closes: #682947.
- * 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.
+ * List icons in debian/install 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.
diff --git a/debian/control b/debian/control
index 8d5c5e3..383b9cc 100644
--- a/debian/control
+++ b/debian/control
@@ -35,14 +35,3 @@ Description: Flight Gear Flight Simulator
.
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/flightgear.install b/debian/flightgear.install
deleted file mode 100644
index 4758945..0000000
--- a/debian/flightgear.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/games
-usr/share
-icons/??x?? usr/share/icons/
-icons/scalable/*.svg usr/share/icons/scalable/apps/
diff --git a/debian/install b/debian/install
index 5f7d23b..f792fe2 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,3 @@
debian/flightgear.desktop usr/share/applications
+icons/??x?? usr/share/icons/
+icons/scalable/*.svg usr/share/icons/scalable/apps/
diff --git a/debian/rules b/debian/rules
index 6070ab9..02a9858 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,9 +40,9 @@ override_dh_auto_install:
dh_auto_install
# 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/; \
+ if [ -d debian/flightgear/usr/bin ]; then \
+ mkdir -p debian/flightgear/usr/games; \
+ mv debian/flightgear/usr/bin/* debian/flightgear/usr/games/; \
fi
# Remove empty directories
@@ -62,9 +62,6 @@ 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