[pkg-fgfs-crew] [flightgear-data] 01/02: Adjust descriptions to consistently use FlightGear (w/o space).

Markus Wanner markus_wanner-guest at alioth.debian.org
Thu Aug 29 20:09:57 UTC 2013


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

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

commit 5492d2bc1dc47bb4f52d7b708c0397d0b59a142f
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Aug 28 22:23:34 2013 +0200

    Adjust descriptions to consistently use FlightGear (w/o space).
    
    Correct rules, so dummy packages really remain empty. Drop
    Windows executable files and empty directories.
    
    Extend long description of the transitional packages so as to
    avoid a lintian warning.
---
 debian/changelog |    6 ++++--
 debian/control   |   40 ++++++++++++++++++++++++----------------
 debian/rules     |   14 ++++++++++++--
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5cbfbc8..590d643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 flightgear-data (2.10.0-1) experimental; urgency=low
 
   * New upstream release. (Closes: #714260).
-  * Rename data packages for clarity - now including 'flightgear' rather
-    than 'fgfs'.
+  * Rename data source and binary packages for clarity - now including
+    'flightgear' rather than 'fgfs'.
   * Move all scenery data into the base data package, make it sufficient
     to run a stripped down variant of Flight Gear.
   * Drop browser patch - no browser settings in preferences.xml, anymore.
@@ -11,7 +11,9 @@ flightgear-data (2.10.0-1) experimental; urgency=low
   * Revamp rules to use debhpler 7, bump compat and debhelper dependency.
   * Drop the copy of the liberation font, depend on ttf-liberation and
     symlink it instead (from postinst and prerm).
+  * Drop Windows executable files and empty directories.
   * Adjust description of flightgear-data-base (former fgfs-base).
+    Consistently use FlightGear (w/o space) in the descriptions.
   * Add a virtual flightgear-data-all package.
   * Add debian/docs.
   * control: let VCS point to new git repo in collab-maint
diff --git a/debian/control b/debian/control
index bf26db7..827cfef 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Depends: tzdata, ttf-liberation, ${misc:Depends}
 Replaces: fgfs-base (<< 2.10.0), fgfs-scenery (<< 2.10.0)
 Breaks: flightgear (<< 2.10.0~),
  fgfs-base (<< 2.10.0~), fgfs-scenery (<< 2.10.0~)
-Description: Flight Gear Flight Simulator -- base files
- Flight Gear is a free and highly sophisticated flight simulator.
+Description: FlightGear Flight Simulator -- base files
+ FlightGear is a free and highly sophisticated flight simulator.
  .
  This package contains the default aircraft, graphics, sounds, models,
  and the minimum scenery (San Francisco) you need to start Flight
@@ -30,8 +30,8 @@ Package: flightgear-data-ai
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: flightgear (<< 2.10.0~), fgfs-base (<< 2.10.0~)
-Description: Flight Gear Flight Simulator -- standard AI data
- Flight Gear is a free and highly sophisticated flight simulator.
+Description: FlightGear Flight Simulator -- standard AI data
+ FlightGear is a free and highly sophisticated flight simulator.
  .
  This package contains AI data, including AI aircrafts, flight plans,
  traffic data and scenarios.
@@ -41,22 +41,22 @@ Architecture: all
 Depends: ${misc:Depends}
 Replaces: fgfs-base (<< 2.0.0), fgfs-aircraft-base (<< 2.10.0~)
 Breaks: flightgear (<< 2.10.0~), fgfs-aircraft-base (<< 2.10.0~)
-Description: Flight Gear Flight Simulator -- standard aircraft
- Flight Gear is a free and highly sophisticated flight simulator.
+Description: FlightGear Flight Simulator -- standard aircraft
+ FlightGear is a free and highly sophisticated flight simulator.
  .
  This package contains more aircrafts that come with the standard
- Flight Gear distribution.
+ FlightGear distribution.
 
 Package: flightgear-data-models
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: fgfs-base (<< 2.0.0), fgfs-models-base (<< 2.10.0)
 Breaks: flightgear (<< 2.10.0~), fgfs-models-base (<< 2.10.0~)
-Description: Flight Gear Flight Simulator -- standard models
- Flight Gear is a free and highly sophisticated flight simulator.
+Description: FlightGear Flight Simulator -- standard models
+ FlightGear is a free and highly sophisticated flight simulator.
  .
  This package contains the object models that come with the standard
- Flight Gear distribution.
+ FlightGear distribution.
 
 Package: flightgear-data-all
 Architecture: all
@@ -66,8 +66,8 @@ Depends:
  flightgear-data-aircrafts (>= 2.10.0),
  flightgear-data-models (>= 2.10.0),
  ${misc:Depends}
-Description: Flight Gear Flight Simulator - virtual package
- Flight Gear is a free and highly sophisticated flight simulator.
+Description: FlightGear Flight Simulator - virtual package
+ FlightGear is a free and highly sophisticated flight simulator.
  .
  This virtual package contains all data packages for FlightGear.
 
@@ -75,26 +75,34 @@ Package: fgfs-base
 Depends: flightgear-data-base, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: Flight Gear base data - transitional dummy package
+Description: FlightGear base data - transitional dummy package
+ Old FlightGear base data package.
+ .
  This is a transitional dummy package. It can safely be removed.
 
 Package: fgfs-aircraft-base
 Depends: flightgear-data-aircraft, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: Flight Gear aircraft data - transitional dummy package
+Description: FlightGear aircraft data - transitional dummy package
+ Old FlightGear aircrafts data package.
+ .
  This is a transitional dummy package. It can safely be removed.
 
 Package: fgfs-models-base
 Depends: flightgear-data-models, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: Flight Gear models data - transitional dummy package
+Description: FlightGear models data - transitional dummy package
+ Old FlightGear models data package.
+ .
  This is a transitional dummy package. It can safely be removed.
 
 Package: fgfs-scenery-base
 Depends: flightgear-base-data, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: Flight Gear scenery data - transitional dummy package
+Description: FlightGear scenery data - transitional dummy package
+ Old FlightGear scenery data package.
+ .
  This is a transitional dummy package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index 0105757..9655b2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,10 @@
 	dh $@
 
 override_dh_auto_install:
-	dh_installdirs -i -A usr/share/games/flightgear
+	dh_installdirs -pflightgear-data-base      usr/share/games/flightgear
+	dh_installdirs -pflightgear-data-ai        usr/share/games/flightgear
+	dh_installdirs -pflightgear-data-aircrafts usr/share/games/flightgear
+	dh_installdirs -pflightgear-data-models    usr/share/games/flightgear
 
 # Contents of flightgear-data-base
 	cp -av \
@@ -74,7 +77,14 @@ override_dh_auto_install:
 			$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/AI/Aircraft/
 
 # Fix some insane permissions
-	find debian/flightgear-data-*/usr/share/games/flightgear -type f -exec chmod 644 {} \;
+	find $(CURDIR)/debian/flightgear-data-*/usr/share/games/flightgear \
+		-type f -exec chmod 644 {} \;
+
+# Drop some silly Windows PE32 executable files
+	find $(CURDIR)/debian -type f -iname "*.mdl" -delete
+
+# Drop empty directories
+	find $(CURDIR)/debian -type d -empty -delete
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog

-- 
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