[pkg-fgfs-crew] r111 - in /fgfs-base/trunk: Docs/ Docs/README debian/changelog debian/control debian/dirs debian/rules

ovek at users.alioth.debian.org ovek at users.alioth.debian.org
Tue Oct 19 16:11:31 UTC 2010


Author: ovek
Date: Tue Oct 19 16:11:25 2010
New Revision: 111

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=111
Log:
Split aircraft and object models into separate packages.

Added:
    fgfs-base/trunk/Docs/
      - copied from r99, fgfs-base/branches/upstream/2.0.0/Docs/
    fgfs-base/trunk/Docs/README
      - copied unchanged from r99, fgfs-base/branches/upstream/2.0.0/Docs/README
Removed:
    fgfs-base/trunk/debian/dirs
Modified:
    fgfs-base/trunk/debian/changelog
    fgfs-base/trunk/debian/control
    fgfs-base/trunk/debian/rules

Modified: fgfs-base/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-base/trunk/debian/changelog?rev=111&op=diff
==============================================================================
--- fgfs-base/trunk/debian/changelog (original)
+++ fgfs-base/trunk/debian/changelog Tue Oct 19 16:11:25 2010
@@ -3,8 +3,13 @@
   * New upstream release.
   * Made the pkg-fgfs-crew mailing list the official maintainer of the
     fgfs-base package, and myself a mere uploader.
+  * Split aircraft models into a separate fgfs-aircraft-base package,
+    and object models into a separate fgfs-models-base package.
+    This reduces the size of the fgfs-base package, and facilitates
+    aircraft and scenery updates between FlightGear releases.
+    Closes: #534839.
 
- -- Ove Kaaven <ovek at arcticnet.no>  Sun, 03 Oct 2010 16:05:46 +0200
+ -- Ove Kaaven <ovek at arcticnet.no>  Sun, 10 Oct 2010 16:32:41 +0200
 
 fgfs-base (1.9.0-1) unstable; urgency=low
 

Modified: fgfs-base/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-base/trunk/debian/control?rev=111&op=diff
==============================================================================
--- fgfs-base/trunk/debian/control (original)
+++ fgfs-base/trunk/debian/control Tue Oct 19 16:11:25 2010
@@ -16,8 +16,26 @@
 Description: Flight Gear Flight Simulator -- base files
  Flight Gear is a free and highly sophisticated flight simulator.
  .
- This package contains graphics, sounds, aircraft models, and the
- minimum scenery you need to start Flight Gear.
+ This package contains graphics, sounds, models, and the minimum
+ scenery you need to start Flight Gear.
  .
  This package does not contain the flight simulator itself.
  If you want to fly, install the flightgear package.
+
+Package: fgfs-aircraft-base
+Architecture: all
+Replaces: fgfs-base (<< 2.0.0)
+Description: Flight Gear Flight Simulator -- standard aircraft
+ Flight Gear is a free and highly sophisticated flight simulator.
+ .
+ This package contains the aircraft models that come with the
+ standard Flight Gear distribution.
+
+Package: fgfs-models-base
+Architecture: all
+Replaces: fgfs-base (<< 2.0.0)
+Description: Flight Gear Flight Simulator -- standard models
+ Flight Gear is a free and highly sophisticated flight simulator.
+ .
+ This package contains the object models that come with the
+ standard Flight Gear distribution.

Modified: fgfs-base/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-base/trunk/debian/rules?rev=111&op=diff
==============================================================================
--- fgfs-base/trunk/debian/rules (original)
+++ fgfs-base/trunk/debian/rules Tue Oct 19 16:11:25 2010
@@ -24,44 +24,54 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	dh_clean
+	dh_clean -i
 
 install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh_clean -i -k
+	dh_installdirs -i -A usr/share/games/FlightGear
 
-	cp -a $(DATA)/AI $(DATA)/Aircraft $(DATA)/Airports $(DATA)/Astro \
+	cp -a $(DATA)/AI $(DATA)/Airports $(DATA)/Astro \
 	      $(DATA)/ATC $(DATA)/Effects $(DATA)/Fonts \
 	      $(DATA)/Huds $(DATA)/Input $(DATA)/Lighting \
-	      $(DATA)/Models $(DATA)/Nasal $(DATA)/Navaids \
-	      $(DATA)/Protocol $(DATA)/Scenery \
-	      $(DATA)/Shaders $(DATA)/Sounds \
+	      $(DATA)/Nasal $(DATA)/Navaids $(DATA)/Protocol \
+	      $(DATA)/Scenery $(DATA)/Shaders $(DATA)/Sounds \
 	      $(DATA)/Textures $(DATA)/Textures.high \
 	      $(DATA)/Traffic $(DATA)/Translations $(DATA)/gui \
 	      $(DATA)/*.dtd $(DATA)/*.xml $(DATA)/version \
 	   debian/fgfs-base/usr/share/games/FlightGear
+	cp -a $(DATA)/Aircraft \
+	   debian/fgfs-aircraft-base/usr/share/games/FlightGear
+	cp -a $(DATA)/Models \
+	   debian/fgfs-models-base/usr/share/games/FlightGear
 	cp -a $(DATA)/Docs debian/fgfs-base/usr/share/games/FlightGear
+
+	# put shared aircraft parts into fgfs-base rather than fgfs-aircraft-base
+	dh_installdirs --package=fgfs-base usr/share/games/FlightGear/Aircraft
+	mv debian/fgfs-aircraft-base/usr/share/games/FlightGear/Aircraft/Generic \
+	   debian/fgfs-aircraft-base/usr/share/games/FlightGear/Aircraft/Instruments \
+	   debian/fgfs-aircraft-base/usr/share/games/FlightGear/Aircraft/Instruments-3d \
+	   debian/fgfs-base/usr/share/games/FlightGear/Aircraft
+
 	# fix some insane permissions
 	find debian/fgfs-base/usr/share/games/FlightGear -type f -exec chmod 644 {} \;
-	# remove some crud upstream left in
-	-find debian/fgfs-base/usr/share/games/FlightGear -name .xvpics -exec rm -rf {} \;
-	-find debian/fgfs-base/usr/share/games/FlightGear -name ".#*" -exec rm -f {} \;
+	find debian/fgfs-aircraft-base/usr/share/games/FlightGear -type f -exec chmod 644 {} \;
+	find debian/fgfs-models-base/usr/share/games/FlightGear -type f -exec chmod 644 {} \;
 
 # Build architecture-independent files here.
 binary-indep: install
 	dh_testdir
 	dh_testroot
-	dh_installdocs $(DATA)/AUTHORS $(DATA)/NEWS $(DATA)/README $(DATA)/Thanks
-	dh_installchangelogs $(DATA)/ChangeLog
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installdocs -i -A $(DATA)/AUTHORS $(DATA)/NEWS $(DATA)/README $(DATA)/Thanks
+	dh_installchangelogs -i -A $(DATA)/ChangeLog
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install




More information about the pkg-fgfs-crew mailing list