[pkg-fgfs-crew] [flightgear-data] 01/01: Adapt to 3.0.0
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Fri Jan 31 11:42:01 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-data.
commit 09451d33124d772a8ba708c68496a79f3585b0b1
Author: Markus Wanner <markus at bluegap.ch>
Date: Tue Jan 21 23:39:14 2014 +0100
Adapt to 3.0.0
Drop the two terrasync patches, adapt version numbers in dependencies,
list directories to be installed in rules alphabetically (minor swap
of two lines).
---
debian/changelog | 4 +--
debian/control | 16 ++++-----
debian/patches/series | 2 --
debian/patches/terrasync-directory.diff | 50 --------------------------
debian/patches/terrasync-document-refresh.diff | 35 ------------------
debian/rules | 2 +-
6 files changed, 10 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d5a18db..7035326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flightgear-data (2.12.1-1) UNRELEASED; urgency=low
+flightgear-data (3.0.0~git20140121+2c6d4e-1) UNRELEASED; urgency=low
[ Markus Wanner ]
* New upstream release.
@@ -7,8 +7,6 @@ flightgear-data (2.12.1-1) UNRELEASED; urgency=low
[ Rebecca Palmer ]
* Symlink to correct fonts package. Closes: #724584.
- * Allow turning on Terrasync from the GUI.
- * Document Terrasync ground refresh workaround.
-- Markus Wanner <markus at bluegap.ch> Sat, 05 Oct 2013 19:45:56 +0200
diff --git a/debian/control b/debian/control
index 040ffe8..2ac7cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ 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~)
-Breaks: flightgear (<< 2.12.1~),
+Breaks: flightgear (<< 3.0.0~),
fgfs-base (<< 2.10.0~), fgfs-scenery-base (<< 2.10.0~),
fgfs-aircraft-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- base files
@@ -31,7 +31,7 @@ Description: FlightGear Flight Simulator -- base files
Package: flightgear-data-ai
Architecture: all
Depends: ${misc:Depends}
-Breaks: flightgear (<< 2.12.1~), fgfs-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.0.0~), fgfs-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard AI data
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -42,7 +42,7 @@ Package: flightgear-data-aircrafts
Architecture: all
Depends: ${misc:Depends}
Replaces: fgfs-base (<< 2.0.0), fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 2.12.1~), fgfs-aircraft-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.0.0~), fgfs-aircraft-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard aircraft
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -53,7 +53,7 @@ Package: flightgear-data-models
Architecture: all
Depends: ${misc:Depends}
Replaces: fgfs-base (<< 2.0.0), fgfs-models-base (<< 2.10.0)
-Breaks: flightgear (<< 2.12.1~), fgfs-models-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.0.0~), fgfs-models-base (<< 2.10.0~)
Description: FlightGear Flight Simulator -- standard models
FlightGear is a free and highly sophisticated flight simulator.
.
@@ -63,10 +63,10 @@ Description: FlightGear Flight Simulator -- standard models
Package: flightgear-data-all
Architecture: all
Depends:
- flightgear-data-base (>= 2.12.1~),
- flightgear-data-ai (>= 2.12.1~),
- flightgear-data-aircrafts (>= 2.12.1~),
- flightgear-data-models (>= 2.12.1~),
+ flightgear-data-base (>= 3.0.0~),
+ flightgear-data-ai (>= 3.0.0~),
+ flightgear-data-aircrafts (>= 3.0.0~),
+ flightgear-data-models (>= 3.0.0~),
${misc:Depends}
Description: FlightGear Flight Simulator - virtual package
FlightGear is a free and highly sophisticated flight simulator.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 691f47c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-terrasync-directory.diff
-terrasync-document-refresh.diff
diff --git a/debian/patches/terrasync-directory.diff b/debian/patches/terrasync-directory.diff
deleted file mode 100644
index 7700bd5..0000000
--- a/debian/patches/terrasync-directory.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Allow enabling Terrasync while leaving the directory unchanged
-Author: Rebecca Palmer
-Bug-Debian: http://bugs.debian.org/252899
-Forwarded: not-needed
-
-Don't require the Terrasync directory to already be in fg-scenery before
-allowing the user to turn on Terrasync from the GUI dialog.
-
-This requires restarting the sim to automatically add the directory,
-but avoids the need to use the command line.
-
---- flightgear-data-2.12.0.orig/gui/dialogs/terrasync.xml
-+++ flightgear-data-2.12.0/gui/dialogs/terrasync.xml
-@@ -53,7 +53,7 @@
- <halign>left</halign>
- <row>1</row><col>1</col><colspan>3</colspan>
- <property>/sim/terrasync/enabled</property>
-- <label>Enable automatic scenery download/update</label>
-+ <label>Enable automatic scenery download/update (requires restart)</label>
- <live>true</live>
- <binding>
- <command>dialog-apply</command>
-@@ -529,18 +529,22 @@
- var combo = gui.findElementByName(cmdarg(),"scenery-dir");
- var valid = 0;
-
-- for (var i = 0; i < size(fg_scenery); i = i + 1) {
-- var s = fg_scenery[i].getValue();
-- if ((s != fg_data ~ "/Scenery") and (s != fg_data ~ "\\Scenery")) {
-+ for (var i = 0; i <= size(fg_scenery); i = i + 1) {
-+ # Default to not changing the Terrasync directory
-+ var s = getprop("/sim/terrasync/scenery-dir");
-+ if (i > 0) {
-+ s = fg_scenery[i-1].getValue();
-+ }
-+ if ((s != fg_data ~ "/Scenery") and (s != fg_data ~ "\\Scenery") and (s != "")) {
- # Do not allow Terrasync to run in the default directory.
-- combo.getNode("value[" ~ i ~ "]", 1).setValue(fg_scenery[i].getValue());
-+ combo.getNode("value[" ~ i ~ "]", 1).setValue(s);
- valid = 1;
- }
- }
-
- # Add error text if the user only has fg-data/Scenery available and disable controls.
- if (!valid) {
-- var warning = cmdarg().getChildren("group")[1].getChildren("text")[1];
-+ var warning = gui.findElementByName(cmdarg(),"warning_text");
- var txt = "You must configure a separate FG_SCENERY directory for automatic scenery download";
- warning.getNode("label").setValue(txt);
- }
diff --git a/debian/patches/terrasync-document-refresh.diff b/debian/patches/terrasync-document-refresh.diff
deleted file mode 100644
index 880baf4..0000000
--- a/debian/patches/terrasync-document-refresh.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Document Terrasync + "Select airport" workaround
-Author: Rebecca Palmer
-Bug-Debian: http://bugs.debian.org/252899
-Forwarded: not-needed
-
-"Select airport" does not wait for scenery to be downloaded, and hence often
-leaves one stuck "underground". This tells the user how to get out of this.
-
-(Upstream have really fixed this problem for 3.0, but the changes are
-too large to sensibly backport.)
-
---- flightgear-data-2.12.0.orig/gui/dialogs/terrasync.xml
-+++ flightgear-data-2.12.0/gui/dialogs/terrasync.xml
-@@ -148,6 +148,21 @@
- </binding>
- </button>
-
-+ <text>
-+ <row>7</row>
-+ <col>0</col><colspan>4</colspan>
-+ <halign>center</halign>
-+ <wrap>true</wrap>
-+ <label>If you see only water after "Select airport", wait for scenery to download,</label>
-+ </text>
-+ <text>
-+ <row>8</row>
-+ <col>0</col><colspan>4</colspan>
-+ <halign>center</halign>
-+ <wrap>true</wrap>
-+ <label>click "Manual Refresh" above (scenery will appear above you), then "Select airport" again.</label>
-+ </text>
-+
- <!--
- <checkbox>
- <name>internal-svn</name>
diff --git a/debian/rules b/debian/rules
index df74340..5a9e9fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,8 @@ override_dh_auto_install:
$(CURDIR)/Nasal \
$(CURDIR)/Navaids \
$(CURDIR)/Protocol \
- $(CURDIR)/Shaders \
$(CURDIR)/Scenery \
+ $(CURDIR)/Shaders \
$(CURDIR)/Sounds \
$(CURDIR)/Textures \
$(CURDIR)/Textures.high \
--
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