[pkg-fgfs-crew] flightgear 3.4 packaging
Rebecca N. Palmer
rebecca_palmer at zoho.com
Fri Feb 6 17:04:54 UTC 2015
Sorry for forgetting about this, and as usual it's tight: 3.4 release is
due 17 Feb, Ubuntu freeze is 19 Feb.
The attached /debian diffs are starting from current experimental-branch
Alioth; summary:
-update required versions
-drop upstreamed patches
-flightgear: add previously forgotten dependencies
-flightgear-data: mark -ai, -aircrafts optional
-flightgear-data: move non-traffic AI data to -base (this is small, and
allows using e.g. the carrier without -ai)
Note that I have _not_ checked d/copyright.
As usual, simgear is the one that most urgently needs uploading (to
clear NEW, and as the most likely to have arch-specific issues), but I'd
at least push them all to Alioth.
The above does _not_ include the proposed more extensive flightgear-data
reorganization
https://lists.alioth.debian.org/pipermail/pkg-fgfs-crew/2014-July/date.html
: I'm not sure if we have time for that now (it would mean going through
NEW, and having two versions of preferences.xml to turn off regional
textures when not installed), and the above downgrading
of -ai, -aircraft is enough to get much of the size benefit (all -data =
1068MB, without -ai/-aircrafts = 715MB, also without regional textures
would be ~500MB).
Upstream have declared #760081 and #760082 wontfix; given that they were
never actual bugs, I'd close them outright in the BTS.
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index fad67a6..fad1a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fgrun (3.4.0~git-1) UNRELEASED; urgency=medium
+
+ * New upstream pre-release.
+ * Drop export-env.diff applied upstream.
+ * Update simgear required version.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Thu, 05 Feb 2015 22:38:07 +0000
+
fgrun (3.2.0-1~exp1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 929db10..351f888 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian FlightGear Crew <pkg-fgfs-crew at lists.alioth.debian.org>
Uploaders: Christopher Baines <cbaines8 at gmail.com>,
Markus Wanner <markus at bluegap.ch>
Build-Depends: debhelper (>= 9), cmake, libfltk1.3-dev, fluid,
- libsimgear-dev (>= 2.10.0), libboost-dev,
+ libsimgear-dev (>= 3.4.0~), libboost-dev,
zlib1g-dev (>= 1:1.2.3.4.dfsg-3)
Standards-Version: 3.9.6
Homepage: http://fgrun.sourceforge.net/
diff --git a/debian/patches/export-env.diff b/debian/patches/export-env.diff
deleted file mode 100644
index 606477a..0000000
--- a/debian/patches/export-env.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Correct export of environment variables
-Author: Ludovic Brenta <ludovic at ludovic-brenta.org>,
- Rebecca Palmer <rebecca_palmer at zoho.com>
-Forwarded: http://sourceforge.net/p/flightgear/mailman/message/32689448/
---- a/src/run_posix.cxx
-+++ b/src/run_posix.cxx
-@@ -128,9 +128,20 @@
- buf[0] = 0;
- prefs.get( Fl_Preferences::Name("env-var-%d", i),
- buf, "", buflen-1 );
-- char* s = strdup( buf );
-- putenv( s );
-- free( s );
-+ char *equals = strchr(buf, '=');
-+ if (equals == NULL) {
-+ /* environment variable name without a value; the value
-+ follows */
-+ unsetenv(buf);
-+ }
-+ else { /* value exists */
-+ /* replace '=' with a new terminator; the value
-+ follows */
-+ *equals = '\0';
-+ setenv(/* name: */ buf,
-+ /* value: */ equals + 1,
-+ /* overwrite: */ 1);
-+ }
- }
- vector<string> argv;
- argv.push_back( arg0 );
diff --git a/debian/patches/series b/debian/patches/series
index 7857413..ae3b628 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ add-debian-defaults.diff
fix-scenery-dir-bug.diff
kfreebsd.patch
fix-cmake-dl
-export-env.diff
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 64e4cea..e1f59d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-simgear (3.2.0-1~exp2) UNRELEASED; urgency=medium
+simgear (3.4.0~git-1) UNRELEASED; urgency=medium
+ [ Markus Wanner ]
* Add back naref_endianness.patch to fix FTBFS on arm64.
- -- Markus Wanner <markus at bluegap.ch> Thu, 30 Oct 2014 13:19:13 +0100
+ [ Rebecca N. Palmer ]
+ * New upstream pre-release.
+ * Update required libopenscenegraph-dev version.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Thu, 05 Feb 2015 21:45:20 +0000
simgear (3.2.0-1~exp1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 34300b7..4fd96cc 100644
--- a/debian/control
+++ b/debian/control
@@ -11,13 +11,13 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev, libxext-dev, libxi-dev,
libglu1-mesa-dev | libglu-dev,
freeglut3-dev | libglut3-dev,
libjpeg-dev,
- libopenscenegraph-dev (>> 3.0.0)
+ libopenscenegraph-dev (>= 3.2.0~)
Standards-Version: 3.9.6
Homepage: http://www.simgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
Vcs-Git: git://anonscm.debian.org/collab-maint/simgear.git
-Package: libsimgearcore3.2.0
+Package: libsimgearcore3.4.0
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -30,12 +30,12 @@ Description: Simulator Construction Gear -- core library
.
This package contains the core library.
-Package: libsimgearcore3.2.0-dbg
+Package: libsimgearcore3.4.0-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore3.2.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0 (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for libsimgearcore
SimGear is a collection of libraries useful for constructing
@@ -44,11 +44,11 @@ Description: debugging symbols for libsimgearcore
.
This package contains the debug symbols for the core library.
-Package: libsimgearscene3.2.0
+Package: libsimgearscene3.4.0
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore3.2.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Conflicts: simgear0
Description: Simulator Construction Gear -- scene library
@@ -58,12 +58,12 @@ Description: Simulator Construction Gear -- scene library
.
This package contains the scene library.
-Package: libsimgearscene3.2.0-dbg
+Package: libsimgearscene3.4.0-dbg
Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore3.2.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0 (= ${binary:Version}),
${misc:Depends}
Conflicts: simgear0
Description: debugging symbols for libsimgearscene
@@ -76,8 +76,8 @@ Description: debugging symbols for libsimgearscene
Package: libsimgear-dev
Architecture: any
Section: libdevel
-Depends: libsimgearcore3.2.0 (= ${binary:Version}),
- libsimgearscene3.2.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0 (= ${binary:Version}),
+ libsimgearscene3.4.0 (= ${binary:Version}),
libopenscenegraph-dev, libc6-dev, ${misc:Depends}
Replaces: simgear-dev (<< 2.10.0~)
Breaks: simgear-dev (<< 2.10.0~)
diff --git a/debian/control.in b/debian/control.in
index 46a0338..b4f05a4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev, libxext-dev, libxi-dev,
libglu1-mesa-dev | libglu-dev,
freeglut3-dev | libglut3-dev,
libjpeg-dev,
- libopenscenegraph-dev (>> 3.0.0)
+ libopenscenegraph-dev (>= 3.2.0~)
Standards-Version: 3.9.6
Homepage: http://www.simgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
diff --git a/debian/libsimgearcore3.2.0.install b/debian/libsimgearcore3.2.0.install
deleted file mode 100644
index 93272c0..0000000
--- a/debian/libsimgearcore3.2.0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libSimGearCore.so.*
diff --git a/debian/libsimgearcore3.2.0.shlibs b/debian/libsimgearcore3.2.0.shlibs
deleted file mode 100644
index 268798e..0000000
--- a/debian/libsimgearcore3.2.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearCore 3.2.0 libsimgearcore3.2.0 (>= 3.2.0~)
diff --git a/debian/libsimgearcore3.4.0.install b/debian/libsimgearcore3.4.0.install
new file mode 100644
index 0000000..93272c0
--- /dev/null
+++ b/debian/libsimgearcore3.4.0.install
@@ -0,0 +1 @@
+usr/lib/*/libSimGearCore.so.*
diff --git a/debian/libsimgearcore3.4.0.shlibs b/debian/libsimgearcore3.4.0.shlibs
new file mode 100644
index 0000000..9872061
--- /dev/null
+++ b/debian/libsimgearcore3.4.0.shlibs
@@ -0,0 +1 @@
+libSimGearCore 3.4.0 libsimgearcore3.4.0 (>= 3.4.0~)
diff --git a/debian/libsimgearscene3.2.0.install b/debian/libsimgearscene3.2.0.install
deleted file mode 100644
index 14ff3cb..0000000
--- a/debian/libsimgearscene3.2.0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libSimGearScene.so.*
diff --git a/debian/libsimgearscene3.2.0.shlibs b/debian/libsimgearscene3.2.0.shlibs
deleted file mode 100644
index e80ab49..0000000
--- a/debian/libsimgearscene3.2.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearScene 3.2.0 libsimgearscene3.2.0 (>= 3.2.0~)
diff --git a/debian/libsimgearscene3.4.0.install b/debian/libsimgearscene3.4.0.install
new file mode 100644
index 0000000..14ff3cb
--- /dev/null
+++ b/debian/libsimgearscene3.4.0.install
@@ -0,0 +1 @@
+usr/lib/*/libSimGearScene.so.*
diff --git a/debian/libsimgearscene3.4.0.shlibs b/debian/libsimgearscene3.4.0.shlibs
new file mode 100644
index 0000000..82df2a5
--- /dev/null
+++ b/debian/libsimgearscene3.4.0.shlibs
@@ -0,0 +1 @@
+libSimGearScene 3.4.0 libsimgearscene3.4.0 (>= 3.4.0~)
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 0e3180a..8aef1b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flightgear (3.4.0~git-1) UNRELEASED; urgency=medium
+
+ * New upstream pre-release. Closes: LP: #1414379.
+ * Drop patch.
+ * Update simgear, flightgear-data, openscenegraph required versions.
+ * Add flite1-dev and libhtsengine-dev dependencies.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Thu, 05 Feb 2015 21:50:40 +0000
+
flightgear (3.2.0-1~exp1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 135b139..5545d63 100644
--- a/debian/control
+++ b/debian/control
@@ -13,15 +13,17 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
freeglut3-dev | libglut3-dev,
libjpeg-dev,
libpng12-dev | libpng3-dev | libpng-dev,
- libopenscenegraph-dev (>> 3.0.0),
- libsimgear-dev (>= 3.2.0), libsimgear-dev (<= 3.2.99),
+ libopenscenegraph-dev (>= 3.2.0~),
+ libsimgear-dev (>= 3.4.0~), libsimgear-dev (<= 3.4.99),
libsqlite3-dev,
libudev-dev [linux-any],
libusbhid-dev [kfreebsd-any],
libdbus-1-dev,
libgsm1-dev,
libspeex-dev,
- libspeexdsp-dev
+ libspeexdsp-dev,
+ flite1-dev,
+ libhtsengine-dev
Standards-Version: 3.9.6
Homepage: http://www.flightgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear.git
@@ -29,7 +31,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear.git
Package: flightgear
Architecture: any
-Depends: flightgear-data-all (>= 3.2.0~), ${shlibs:Depends},
+Depends: flightgear-data-all (>= 3.4.0~), ${shlibs:Depends},
${misc:Depends}
Description: Flight Gear Flight Simulator
FlightGear Flight Simulator (often shortened to FlightGear or FGFS)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2f29fe5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling-fixes.diff
diff --git a/debian/patches/spelling-fixes.diff b/debian/patches/spelling-fixes.diff
deleted file mode 100644
index 04ad2c1..0000000
--- a/debian/patches/spelling-fixes.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Fix a couple spelling errors
-Forwarded: yes
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2014-07-19
-
---- a/3rdparty/sqlite3/sqlite3.c
-+++ b/3rdparty/sqlite3/sqlite3.c
-@@ -76174,7 +76174,7 @@
- ** Note that with flags==EXPRDUP_REDUCE, this routines works on full-size
- ** (unreduced) Expr objects as they or originally constructed by the parser.
- ** During expression analysis, extra information is computed and moved into
--** later parts of teh Expr object and that extra information might get chopped
-+** later parts of the Expr object and that extra information might get chopped
- ** off if the expression is reduced. Note also that it does not work to
- ** make a EXPRDUP_REDUCE copy of a reduced expression. It is only legal
- ** to reduce a pristine expression tree from the parser. The implementation
---- a/src/FDM/JSBSim/models/FGAuxiliary.cpp
-+++ b/src/FDM/JSBSim/models/FGAuxiliary.cpp
-@@ -306,7 +306,7 @@
-
- //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- //
--// A positive crosswind is blowing towards the right (from teh perspective of the
-+// A positive crosswind is blowing towards the right (from the perspective of the
- // pilot). A negative crosswind is blowing towards the -Y direction (left).
- // psi is the direction the wind is blowing *towards*.
-
---- a/src/Navaids/FlightPlan.cxx
-+++ b/src/Navaids/FlightPlan.cxx
-@@ -1211,7 +1211,7 @@
- Leg* leg = _legs[(aIndex >= 0) ? aIndex : lastLeg];
- double absolutePathDistance = leg->_distanceAlongPath + aOffsetNm;
- if (absolutePathDistance < 0.0) {
-- return _legs[0]->waypoint()->position(); // begining of route
-+ return _legs[0]->waypoint()->position(); // beginning of route
- }
-
- if (absolutePathDistance > _totalDistance) {
---- a/src/Network/HTTPClient.cxx
-+++ b/src/Network/HTTPClient.cxx
-@@ -84,7 +84,7 @@
-
- virtual void startInstall(pkg::Install* aInstall)
- {
-- SG_LOG(SG_IO, SG_INFO, "begining install of:" << aInstall->package()->id()
-+ SG_LOG(SG_IO, SG_INFO, "beginning install of:" << aInstall->package()->id()
- << " to local path:" << aInstall->path());
-
- }
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index b5286c9..039e17b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+flightgear-data (3.4.0~git-1) UNRELEASED; urgency=medium
+
+ * New upstream pre-release. Closes: #776913, #760077, #760698, #760083.
+ * Drop patches applied upstream.
+ * Require matching versions.
+ * Move non-traffic AI data (carrier etc.) to -base;
+ add required Breaks+Replaces and update descriptions.
+ * Make -ai and -aircrafts optional.
+ * Bump Standards-Version to 3.9.6; no changes needed.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Thu, 05 Feb 2015 22:32:55 +0000
+
flightgear-data (3.0.0-2) unstable; urgency=medium
[ Rebecca N. Palmer ]
diff --git a/debian/control b/debian/control
index 817ed1d..bd58c8e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian FlightGear Crew <pkg-fgfs-crew at lists.alioth.debian.org>
Uploaders: Ove Kaaven <ovek at arcticnet.no>,
Markus Wanner <markus at bluegap.ch>
Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.flightgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear-data.git
Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear-data.git
@@ -14,16 +14,16 @@ Package: flightgear-data-base
Architecture: all
Depends: tzdata, fonts-liberation, ${misc:Depends}
Replaces: fgfs-base (<< 2.10.0), fgfs-scenery-base (<< 2.10.0),
- fgfs-aircraft-base (<< 2.10.0~)
+ fgfs-aircraft-base (<< 2.10.0~), flightgear-data-ai (<< 3.4.0~)
Breaks: flightgear (<< 3.0.0~),
fgfs-base (<< 2.10.0~), fgfs-scenery-base (<< 2.10.0~),
- fgfs-aircraft-base (<< 2.10.0~)
+ fgfs-aircraft-base (<< 2.10.0~), flightgear-data-ai (<< 3.4.0~)
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
- Gear.
+ This package contains ground textures, sounds, airport data,
+ and the minimum scenery (San Francisco) and aircraft (Cessna 172P)
+ you need to start Flight Gear.
.
This package does not contain the flight simulator itself.
If you want to fly, install the flightgear package.
@@ -32,11 +32,11 @@ Package: flightgear-data-ai
Architecture: all
Depends: ${misc:Depends}
Breaks: flightgear (<< 3.0.0~), fgfs-base (<< 2.10.0~)
-Description: FlightGear Flight Simulator -- standard AI data
+Description: FlightGear Flight Simulator -- AI traffic
FlightGear is a free and highly sophisticated flight simulator.
.
- This package contains AI data, including AI aircrafts, flight plans,
- traffic data and scenarios.
+ This package contains AI aircraft models and flight plans,
+ needed for the AI traffic feature.
Package: flightgear-data-aircrafts
Architecture: all
@@ -63,11 +63,11 @@ Description: FlightGear Flight Simulator -- standard models
Package: flightgear-data-all
Architecture: all
Depends:
- flightgear-data-base (>= 3.0.0~),
- flightgear-data-ai (>= 3.0.0~),
- flightgear-data-aircrafts (>= 3.0.0~),
- flightgear-data-models (>= 3.0.0~),
+ flightgear-data-base (= ${binary:Version}),
+ flightgear-data-models (= ${binary:Version}),
${misc:Depends}
+Recommends: flightgear-data-ai (= ${binary:Version}),
+ flightgear-data-aircrafts (= ${binary:Version})
Description: FlightGear Flight Simulator - virtual package
FlightGear is a free and highly sophisticated flight simulator.
.
diff --git a/debian/patches/766251.patch b/debian/patches/766251.patch
deleted file mode 100644
index 2357b7b..0000000
--- a/debian/patches/766251.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix type mismatch crash in SGExpression
-Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-Forwarded: not-needed
-Bug-Debian: https://bugs.debian.org/766251
---- a/Effects/model-combined-transparent.eff
-+++ b/Effects/model-combined-transparent.eff
-@@ -12,7 +12,7 @@
- <and>
- <equal>
- <property>/sim/rendering/shaders/model</property>
-- <value type="int">0</value>
-+ <value type="float">0</value>
- </equal>
- <or>
- <less-equal>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6bbe4c9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-766251.patch
-translation-update-pt.diff
diff --git a/debian/patches/translation-update-pt.diff b/debian/patches/translation-update-pt.diff
deleted file mode 100644
index aa312bc..0000000
--- a/debian/patches/translation-update-pt.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Update portuguese translation
-Origin: https://gitorious.org/fg/fgdata/commit/1da6f87557f655047391161d529faea4930eacde
-Forwarded: not-needed
---- a/Translations/pt/sys.xml
-+++ b/Translations/pt/sys.xml
-@@ -25,15 +25,15 @@
- <init>inicializando</init> <!-- English: "initializing" -->
- <loading-aircraft-list>carregando lista de aeronaves</loading-aircraft-list> <!-- English: "loading aircraft list" -->
- <loading-aircraft>carregando aeronaves</loading-aircraft> <!-- English: "loading aircraft" -->
-- <loading-nav-dat>carregando dados de navagação</loading-nav-dat> <!-- English: "loading navigation data" -->
-- <init-scenery>inicializando cenários</init-scenery> <!-- English: "initializing scenery" -->
-+ <loading-nav-dat>carregando dados de navagacao</loading-nav-dat> <!-- English: "loading navigation data" -->
-+ <init-scenery>inicializando cenarios</init-scenery> <!-- English: "initializing scenery" -->
- <creating-subsystems>criando subsistemas</creating-subsystems> <!-- English: "creating subsystems" -->
- <init-subsystems>inicializando subsistemas</init-subsystems> <!-- English: "initializing subsystems" -->
- <binding-subsystems>ligando subsistemas</binding-subsystems> <!-- English: "binding subsystems" -->
- <finishing-subsystems>finalizando subsistemas</finishing-subsystems> <!-- English: "finalizing subsystems" -->
-- <init-graphics>inicializando o motor gráfico</init-graphics> <!-- English: "initializing graphics engine" -->
-- <loading-scenery>carregando cenários</loading-scenery> <!-- English: "loading scenery" -->
-- <finalize-position>finalizando posição</finalize-position> <!-- English: "finalizing position" -->
-+ <init-graphics>inicializando o motor grafico</init-graphics> <!-- English: "initializing graphics engine" -->
-+ <loading-scenery>carregando cenarios</loading-scenery> <!-- English: "loading scenery" -->
-+ <finalize-position>finalizando posicao</finalize-position> <!-- English: "finalizing position" -->
- </splash>
-
- </PropertyList>
diff --git a/debian/rules b/debian/rules
index 0be03d6..ed29b67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,57 +12,29 @@ override_dh_auto_install:
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 \
- $(CURDIR)/Airports \
- $(CURDIR)/Astro \
- $(CURDIR)/ATC \
- $(CURDIR)/Docs \
- $(CURDIR)/Effects \
- $(CURDIR)/Environment \
- $(CURDIR)/Fonts \
- $(CURDIR)/gui \
- $(CURDIR)/HLA \
- $(CURDIR)/Huds \
- $(CURDIR)/Input \
- $(CURDIR)/Lighting \
- $(CURDIR)/Materials \
- $(CURDIR)/MP \
- $(CURDIR)/Nasal \
- $(CURDIR)/Navaids \
- $(CURDIR)/Protocol \
- $(CURDIR)/Scenery \
- $(CURDIR)/Shaders \
- $(CURDIR)/Sounds \
- $(CURDIR)/Textures \
- $(CURDIR)/Textures.high \
- $(CURDIR)/Translations \
- $(CURDIR)/*.xml \
- $(CURDIR)/version \
- debian/flightgear-data-base/usr/share/games/flightgear/
-
-# Note: we do not copy Timezones, but depend on tzdata and provide the
-# required symlinks. In a similar vein, we remove the needless copy of
-# LiberationFonts.
+# Everything not listed elsewhere goes in flightgear-data-base
+ dh_install --package=flightgear-data-base --sourcedir=. -Xdebian * usr/share/games/flightgear
+
+# Remove embedded copies: we use symlinks instead
rm -r $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Fonts/LiberationFonts
+ rm -r $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Timezone
# Contents of flightgear-data-ai
- cp -av \
- $(CURDIR)/AI \
- debian/flightgear-data-ai/usr/share/games/flightgear
+ dh_installdirs --package=flightgear-data-ai usr/share/games/flightgear/AI
+ mv -v $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/AI/Aircraft \
+ $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/AI/Traffic \
+ debian/flightgear-data-ai/usr/share/games/flightgear/AI
# Contents of flightgear-data-aircrafts
- cp -av \
- $(CURDIR)/Aircraft \
+ mv -v $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft \
debian/flightgear-data-aircrafts/usr/share/games/flightgear
# Contents of flightgear-data-models
- cp -av \
- $(CURDIR)/Models \
+ mv -v $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Models \
debian/flightgear-data-models/usr/share/games/flightgear
# Put shared aircraft parts as well as the default aircraft into
-# flightgear-data-base rather than flightgear-aircraft-data
+# flightgear-data-base rather than flightgear-data-aircrafts
dh_installdirs --package=flightgear-data-base usr/share/games/flightgear/Aircraft
mv -v $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Generic \
$(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Instruments \
@@ -79,15 +51,16 @@ override_dh_auto_install:
# Fix some insane permissions
find $(CURDIR)/debian/flightgear-data-*/usr/share/games/flightgear \
-type f -exec chmod 644 {} \;
- chmod a+x $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Textures.high/Trees/convert.pl
+ chmod a+x $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Textures/Trees/convert.pl
-# Drop some silly Windows PE32 executable files
+# Drop Windows-only files
find $(CURDIR)/debian -type f -iname "*.mdl" -delete
+ find $(CURDIR)/debian -type f -iname "runfgfs.bat" -delete
# Drop empty directories
find $(CURDIR)/debian -type d -empty -delete
-# Drop a couple of extra license files which are not needed due to
+# Drop some extra license files which are not needed due to
# debian/copyright.
rm -f $(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/Cub/copying.txt \
$(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/bo105/COPYING \
More information about the pkg-fgfs-crew
mailing list