[pkg-fgfs-crew] [flightgear-data] 01/02: Use dh_link rather than the former dance in postinst/prerm. Drop these two for flightgear-data-base. As hinted by Florent Rougon.

Markus Wanner markus_wanner-guest at moszumanska.debian.org
Wed Feb 18 19:56:58 UTC 2015


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

markus_wanner-guest pushed a commit to branch experimental
in repository flightgear-data.

commit df03df74617d7ec1af7323f6fa7d3bb2192889c6
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Feb 18 20:14:34 2015 +0100

    Use dh_link rather than the former dance in postinst/prerm. Drop
    these two for flightgear-data-base. As hinted by Florent Rougon.
---
 debian/changelog                     |  7 +++++--
 debian/flightgear-data-base.links    |  5 +++++
 debian/flightgear-data-base.postinst | 27 ---------------------------
 debian/flightgear-data-base.prerm    | 25 -------------------------
 4 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8a1a49..07b699e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flightgear-data (3.4.0+dfsg-0~exp1) UNRELEASED; urgency=medium
+flightgear-data (3.4.0~rc99+dfsg-0~exp1) UNRELEASED; urgency=medium
 
   [ Florent Rougon ]
   * New upstream release 3.2 (Closes: #766251).
@@ -12,7 +12,8 @@ flightgear-data (3.4.0+dfsg-0~exp1) UNRELEASED; urgency=medium
     /usr/share/doc/fgfs-base/Docs to /usr/share/games/FlightGear/Docs).
 
   [ Markus Wanner ]
-  * New upstream release 3.4 (Closes: #776913, #760698, #760077,
+  * New upstream almost-release 3.4, tagged 3.4.0~rc99 to avoid confusion
+    with the eventual real 3.4.0 (Closes: #776913, #760698, #760077,
     #760083).
   * Drop patch translation-update-pt.diff, it got applied upstream.
   * Drop references to Textures.high from d/rules. These directories
@@ -27,6 +28,8 @@ flightgear-data (3.4.0+dfsg-0~exp1) UNRELEASED; urgency=medium
   * Add missing-sources for the sprintf js library.
   * Bump S-V: no changes needed.
   * Update the watch file.
+  * Use dh_link rather than the former dance in postinst/prerm. Drop
+    these two for flightgear-data-base.
 
  -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 12:19:59 +0100
 
diff --git a/debian/flightgear-data-base.links b/debian/flightgear-data-base.links
new file mode 100644
index 0000000..167a450
--- /dev/null
+++ b/debian/flightgear-data-base.links
@@ -0,0 +1,5 @@
+usr/share/zoneinfo                  usr/share/games/flightgear/Timezone
+usr/share/fonts/truetype/liberation usr/share/games/flightgear/Fonts/LiberationFonts
+usr/share/javascript/jquery         usr/share/games/flightgear/webgui/3rdparty/jquery
+usr/share/javascript/jquery-flot    usr/share/games/flightgear/webgui/3rdparty/flot
+usr/share/javascript/leaflet        usr/share/games/flightgear/webgui/3rtparty/leaflet-0.7.3
diff --git a/debian/flightgear-data-base.postinst b/debian/flightgear-data-base.postinst
deleted file mode 100644
index cd9b1ed..0000000
--- a/debian/flightgear-data-base.postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -d /usr/share/games/FlightGear ]; then
-  # the user seem to have manually added scenery to the old location
-  echo Moving /usr/share/games/FlightGear to /usr/share/games/flightgear...
-  cp -a /usr/share/games/FlightGear/. /usr/share/games/flightgear
-  rm -rf /usr/share/games/FlightGear
-fi
-
-[ -e /usr/share/games/flightgear/Timezone ] || \
-	ln -sTf /usr/share/zoneinfo /usr/share/games/flightgear/Timezone
-
-[ -e /usr/share/games/flightgear/Fonts/LiberationFonts ] || \
-	ln -sTf /usr/share/fonts/truetype/liberation /usr/share/games/flightgear/Fonts/LiberationFonts
-
-[ -e /usr/share/games/flightgear/webgui/3rdparty/jquery ] || \
-	ln -sTf /usr/share/javascript/jquery /usr/share/games/flightgear/webgui/3rdparty/jquery
-
-[ -e /usr/share/games/flightgear/webgui/3rdparty/flot ] || \
-	ln -sTf /usr/share/javascript/jquery-flot /usr/share/games/flightgear/webgui/3rdparty/flot
-
-[ -e /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3 ] || \
-	ln -sTf /usr/share/javascript/leaflet /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3
-
-#DEBHELPER#
diff --git a/debian/flightgear-data-base.prerm b/debian/flightgear-data-base.prerm
deleted file mode 100644
index 7a79174..0000000
--- a/debian/flightgear-data-base.prerm
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -h /usr/share/games/flightgear/Timezone ] ; then
-	rm -f /usr/share/games/flightgear/Timezone
-fi
-
-if [ -h /usr/share/games/flightgear/Fonts/LiberationFonts ] ; then
-	rm -f /usr/share/games/flightgear/Fonts/LiberationFonts
-fi
-
-if [ -h /usr/share/games/flightgear/webgui/3rdparty/jquery ] ; then
-	rm -f /usr/share/games/flightgear/webgui/3rdparty/jquery
-fi
-
-if [ -h /usr/share/games/flightgear/webgui/3rdparty/flot ] ; then
-	rm -f /usr/share/games/flightgear/webgui/3rdparty/flot
-fi
-
-if [ -h /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3 ] ; then
-	rm -f /usr/share/games/flightgear/webgui/3rdparty/leaflet-0.7.3
-fi
-
-#DEBHELPER#

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



More information about the pkg-fgfs-crew mailing list