[pkg-fgfs-crew] flightgear 3.4.1

Rebecca N. Palmer rebecca_palmer at zoho.com
Sun Apr 5 21:18:46 UTC 2015


Here's my attempt at 3.4.1 (/debian diffs starting from current Alioth): 
please note I have *not* had time to test it yet.
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 302afeb..886db76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
-flightgear (3.4.0-0~exp2) UNRELEASED; urgency=high
+flightgear (3.4.1-1) UNRELEASED; urgency=high
 
+  [ Markus Wanner ]
   * Drop the deprecated JPEG_FACTORY option for cmake.
-  * Rebase on 3.0.0-5, effectively adding patch 6a30e70.patch.
-  * Set ENABLE_QT=ON and add a B-D on qtbase5-dev to build the
-    flightgear launcher. Change flightgear.desktop to use that
-    launcher, rather than starting fgfs with default settings.
   * Tighten B-D on sqlite3 and htsengine. Versions before the given
     ones are known to not work.
 
+  [ Rebecca N. Palmer ]
+  * New upstream release.
+  * Update simgear and flightgear-data required versions.
+  * Remove /tmp/*.xml from allowed Nasal paths.  Closes: #780867.
+
  -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Mar 2015 11:52:01 +0100
 
 flightgear (3.4.0-0~exp1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 54ce716..33b1300 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
  libjpeg-dev,
  libpng12-dev | libpng3-dev | libpng-dev,
  libopenscenegraph-dev (>= 3.2.0~),
- libsimgear-dev (>= 3.4.0~), libsimgear-dev (<= 3.4.99),
+ libsimgear-dev (>= 3.4.1~), libsimgear-dev (<= 3.4.99),
  libsqlite3-dev (>= 3.7.14~),
  libudev-dev [linux-any],
  libusbhid-dev [kfreebsd-any],
@@ -23,8 +23,7 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
  libspeex-dev,
  libspeexdsp-dev,
  flite1-dev,
- libhtsengine-dev (>= 1.07~),
- qtbase5-dev
+ libhtsengine-dev (>= 1.07~)
 Standards-Version: 3.9.6
 Homepage: http://www.flightgear.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear.git
@@ -32,7 +31,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear.git
 
 Package: flightgear
 Architecture: any
-Depends: flightgear-data-all (>= 3.4.0~), ${shlibs:Depends},
+Depends: flightgear-data-all (>= 3.4.1~), ${shlibs:Depends},
  ${misc:Depends}
 Description: Flight Gear Flight Simulator
  FlightGear Flight Simulator (often shortened to FlightGear or FGFS)
diff --git a/debian/flightgear.desktop b/debian/flightgear.desktop
index e2a5d1a..6b0862f 100644
--- a/debian/flightgear.desktop
+++ b/debian/flightgear.desktop
@@ -3,7 +3,7 @@ Type=Application
 Version=1.4
 Name=FlightGear
 GenericName=Flight Simulator
-Exec=fgfs --launcher
+Exec=fgfs
 Terminal=false
 Categories=Game;Simulation
 Comment=open-source flight simulator
diff --git a/debian/patches/6a30e7.patch b/debian/patches/6a30e7.patch
deleted file mode 100644
index 2ed968a..0000000
--- a/debian/patches/6a30e7.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-Description: Restrict file access for Nasal scripts.
- Stop using property listener for fgValidatePath
- .   
- This was insecure: while removelistener() won't remove it, there are
- other ways to remove a listener from Nasal
-Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-Last-Update: 13-03-2015
-Origin: http://sourceforge.net/p/flightgear/flightgear/ci/6a30e7086ea2f1a060dd77dab6e7e8a15b43e82d
-
---- a/src/Main/util.cxx
-+++ b/src/Main/util.cxx
-@@ -33,6 +33,7 @@
- #include <simgear/math/SGLimits.hxx>
- #include <simgear/math/SGMisc.hxx>
- 
-+#include <GUI/MessageBox.hxx>
- #include "fg_io.hxx"
- #include "fg_props.hxx"
- #include "globals.hxx"
-@@ -71,32 +72,142 @@
-     return current;
- }
- 
--// Write out path to validation node and read it back in. A Nasal
--// listener is supposed to replace the path with a validated version
--// or an empty string otherwise.
--const char *fgValidatePath (const char *str, bool write)
-+static string_list read_allowed_paths;
-+static string_list write_allowed_paths;
-+
-+// Allowed paths here are absolute, and may contain _one_ *,
-+// which matches any string
-+// FG_SCENERY is deliberately not allowed, as it would make
-+// /sim/terrasync/scenery-dir a security hole
-+void fgInitAllowedPaths()
- {
--    SGPropertyNode_ptr r, w;
--    r = fgGetNode("/sim/paths/validate/read", true);
--    r->setAttribute(SGPropertyNode::READ, true);
--    r->setAttribute(SGPropertyNode::WRITE, true);
--
--    w = fgGetNode("/sim/paths/validate/write", true);
--    w->setAttribute(SGPropertyNode::READ, true);
--    w->setAttribute(SGPropertyNode::WRITE, true);
--
--    SGPropertyNode *prop = write ? w : r;
--    prop->setStringValue(str);
--    const char *result = prop->getStringValue();
--    return result[0] ? result : 0;
-+    read_allowed_paths.clear();
-+    write_allowed_paths.clear();
-+    read_allowed_paths.push_back(globals->get_fg_root() + "/*");
-+    read_allowed_paths.push_back(globals->get_fg_home() + "/*");
-+    string_list const aircraft_paths = globals->get_aircraft_paths();
-+    for( string_list::const_iterator it = aircraft_paths.begin();
-+                                     it != aircraft_paths.end();
-+                                   ++it )
-+    {
-+        read_allowed_paths.push_back(*it + "/*");
-+    }
-+
-+    for( string_list::const_iterator it = read_allowed_paths.begin();
-+                                     it != read_allowed_paths.end();
-+                                   ++it )
-+    { // if we get the initialization order wrong, better to have an
-+      // obvious error than a can-read-everything security hole...
-+        if (!(it->compare("/*"))){
-+            flightgear::fatalMessageBox("Nasal initialization error",
-+                                    "Empty string in FG_ROOT, FG_HOME or FG_AIRCRAFT",
-+                                    "or fgInitAllowedPaths() called too early");
-+            exit(-1);
-+        }
-+    }
-+    write_allowed_paths.push_back("/tmp/*.xml");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/*.sav");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/*.log");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/cache/*");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/Export/*");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/state/*.xml");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/aircraft-data/*.xml");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/Wildfire/*.xml");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/runtime-jetways/*.xml");
-+    write_allowed_paths.push_back(globals->get_fg_home() + "/Input/Joysticks/*.xml");
-+    
-+    if(!fgValidatePath(globals->get_fg_home() + "/../no.log",true).empty() ||
-+        !fgValidatePath(globals->get_fg_home() + "/no.lot",true).empty() ||
-+        fgValidatePath((globals->get_fg_home() + "/nolog").c_str(),true) ||
-+        !fgValidatePath(globals->get_fg_home() + "no.log",true).empty() ||
-+        !fgValidatePath("..\\" + globals->get_fg_home() + "/no.log",false).empty() ||
-+        fgValidatePath("/tmp/no.xml",false) ||
-+        fgValidatePath(globals->get_fg_home() + "/./ff/../Export\\yes..gg",true).empty() ||
-+        !fgValidatePath((globals->get_fg_home() + "/aircraft-data/yes..xml").c_str(),true) ||
-+        fgValidatePath(globals->get_fg_root() + "/./\\yes.bmp",false).empty()) {
-+            flightgear::fatalMessageBox("Nasal initialization error",
-+                                    "fgInitAllowedPaths() does not work",
-+                                    "");
-+            exit(-1);
-+    }
- }
- 
--//------------------------------------------------------------------------------
--std::string fgValidatePath(const std::string& path, bool write)
-+// Normalize a path
-+// Unlike SGPath::realpath, does not require that the file already exists,
-+// but does require that it be below the starting point
-+static std::string fgNormalizePath (const std::string& path)
- {
--  const char* validate_path = fgValidatePath(path.c_str(), write);
--  return std::string(validate_path ? validate_path : "");
--}
-+    string_list path_parts;
-+    char c;
-+    std::string normed_path = "", this_part = "";
-+    
-+    for (int pos = 0; ; pos++) {
-+        c = path[pos];
-+        if (c == '\\') { c = '/'; }
-+        if ((c == '/') || (c == 0)) {
-+            if ((this_part == "/..") || (this_part == "..")) {
-+                if (path_parts.empty()) { return ""; }
-+                path_parts.pop_back();
-+            } else if ((this_part != "/.") && (this_part != "/")) {
-+                path_parts.push_back(this_part);
-+            }
-+            this_part = "";
-+        }
-+        if (c == 0) { break; }
-+        this_part = this_part + c;
-+    }
-+    for( string_list::const_iterator it = path_parts.begin();
-+                                     it != path_parts.end();
-+                                   ++it )
-+    {
-+        normed_path.append(*it);
-+    }
-+    return normed_path;
-+ }
-+
- 
-+// Check whether Nasal is allowed to access a path
-+std::string fgValidatePath (const std::string& path, bool write)
-+{
-+    const string_list& allowed_paths(write ? write_allowed_paths : read_allowed_paths);
-+    int star_pos;
-+    
-+    // Normalize the path (prevents ../../.. trickery)
-+    std::string normed_path = fgNormalizePath(path);
-+
-+    // Check against each allowed pattern
-+    for( string_list::const_iterator it = allowed_paths.begin();
-+                                     it != allowed_paths.end();
-+                                   ++it )
-+    {
-+        star_pos = it->find('*');
-+        if (star_pos == std::string::npos) {
-+            if (!(it->compare(normed_path))) {
-+                return normed_path;
-+            }
-+        } else {
-+            if ((it->size()-1 <= normed_path.size()) /* long enough to be a potential match */
-+                && !(it->substr(0,star_pos)
-+                    .compare(normed_path.substr(0,star_pos))) /* before-star parts match */
-+                && !(it->substr(star_pos+1,it->size()-star_pos-1)
-+                    .compare(normed_path.substr(star_pos+1+normed_path.size()-it->size(),
-+                      it->size()-star_pos-1))) /* after-star parts match */) {
-+                return normed_path;
-+            }
-+        }
-+    }
-+    // no match found
-+    return "";
-+}
-+// s.c_str() becomes invalid when s is destroyed, so need a static s
-+std::string validate_path_temp;
-+const char* fgValidatePath(const char* path, bool write)
-+{
-+  validate_path_temp = fgValidatePath(std::string(path), write);
-+  if(validate_path_temp.empty()){
-+      return 0;
-+  }
-+  return validate_path_temp.c_str();
-+}
- // end of util.cxx
- 
---- a/src/Main/util.hxx
-+++ b/src/Main/util.hxx
-@@ -36,7 +36,7 @@
- double fgGetLowPass (double current, double target, double timeratio);
- 
- /**
-- * Validation listener interface for io.nas, used by fgcommands.
-+ * File access control, used by Nasal and fgcommands.
-  * @param path Path to be validated
-  * @param write True for write operations and false for read operations.
-  * @return The validated path on success or 0 if access denied.
-@@ -44,4 +44,9 @@
- const char *fgValidatePath (const char *path, bool write);
- std::string fgValidatePath(const std::string& path, bool write);
- 
-+/**
-+ * Set allowed paths for fgValidatePath
-+ */
-+void fgInitAllowedPaths();
-+
- #endif // __UTIL_HXX
---- a/src/Scripting/NasalSys.cxx
-+++ b/src/Scripting/NasalSys.cxx
-@@ -800,6 +800,9 @@
-       .member("singleShot", &TimerObj::isSingleShot, &TimerObj::setSingleShot)
-       .member("isRunning", &TimerObj::isRunning);
- 
-+    // Set allowed paths for Nasal I/O
-+    fgInitAllowedPaths();
-+    
-     // Now load the various source files in the Nasal directory
-     simgear::Dir nasalDir(SGPath(globals->get_fg_root(), "Nasal"));
-     loadScriptDirectory(nasalDir);
diff --git a/debian/patches/780867.patch b/debian/patches/780867.patch
new file mode 100644
index 0000000..b077f8e
--- /dev/null
+++ b/debian/patches/780867.patch
@@ -0,0 +1,20 @@
+Description: Remove /tmp/*.xml from allowed paths list
+
+Upstream commit 51bfdc21e0b4528797697d32664eacb15d297449
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/780867
+
+diff --git a/src/Main/util.cxx b/src/Main/util.cxx
+index c3bcdfe..a3ea1b9 100644
+--- a/src/Main/util.cxx
++++ b/src/Main/util.cxx
+@@ -140,7 +140,6 @@ void fgInitAllowedPaths()
+             exit(-1);
+         }
+     }
+-    write_allowed_paths.push_back("/tmp/*.xml");
+     write_allowed_paths.push_back(fg_home + "/*.sav");
+     write_allowed_paths.push_back(fg_home + "/*.log");
+     write_allowed_paths.push_back(fg_home + "/cache/*");
+
diff --git a/debian/patches/series b/debian/patches/series
index 9208392..541a359 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-6a30e7.patch
+780867.patch
diff --git a/debian/rules b/debian/rules
index 9e974fc..1f6684e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ CMAKE_FLAGS = \
 	-DENABLE_FGADMIN=OFF \
 	-DENABLE_LARCSIM=ON \
 	-DENABLE_UIUC_MODEL=ON \
-	-DENABLE_QT=ON \
 	-DSP_FDMS=ON \
 	-DSYSTEM_SQLITE=ON
 
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 902f410..c800467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+flightgear-data (3.4.1-1) UNRELEASED; urgency=high
+
+  [ Rebecca N. Palmer ]
+  * New upstream release.  Closes: #780716.
+  * Remove /tmp/*.xml from allowed Nasal paths.
+
+ -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 22:59:19 +0100
+
 flightgear-data (3.4.0+dfsg-0~exp1) experimental; urgency=medium
 
   [ Florent Rougon ]
diff --git a/debian/control b/debian/control
index 8e7d25d..832fcca 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Depends: tzdata,
  ${misc:Depends}
 Replaces: fgfs-base (<< 2.10.0), fgfs-scenery-base (<< 2.10.0),
  fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 3.4.0~),
+Breaks: flightgear (<< 3.4.1~),
  fgfs-base (<< 2.10.0~), fgfs-scenery-base (<< 2.10.0~),
  fgfs-aircraft-base (<< 2.10.0~)
 Description: FlightGear Flight Simulator -- base files
@@ -36,7 +36,7 @@ Description: FlightGear Flight Simulator -- base files
 Package: flightgear-data-ai
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: flightgear (<< 3.4.0~), fgfs-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.4.1~), fgfs-base (<< 2.10.0~)
 Description: FlightGear Flight Simulator -- standard AI data
  FlightGear is a free and highly sophisticated flight simulator.
  .
@@ -47,7 +47,7 @@ Package: flightgear-data-aircrafts
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: fgfs-base (<< 2.0.0), fgfs-aircraft-base (<< 2.10.0~)
-Breaks: flightgear (<< 3.4.0~), fgfs-aircraft-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.4.1~), fgfs-aircraft-base (<< 2.10.0~)
 Description: FlightGear Flight Simulator -- standard aircraft
  FlightGear is a free and highly sophisticated flight simulator.
  .
@@ -58,7 +58,7 @@ Package: flightgear-data-models
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: fgfs-base (<< 2.0.0), fgfs-models-base (<< 2.10.0)
-Breaks: flightgear (<< 3.4.0~), fgfs-models-base (<< 2.10.0~)
+Breaks: flightgear (<< 3.4.1~), fgfs-models-base (<< 2.10.0~)
 Description: FlightGear Flight Simulator -- standard models
  FlightGear is a free and highly sophisticated flight simulator.
  .
@@ -68,10 +68,10 @@ Description: FlightGear Flight Simulator -- standard models
 Package: flightgear-data-all
 Architecture: all
 Depends:
- flightgear-data-base (>= 3.4.0~),
- flightgear-data-ai (>= 3.4.0~),
- flightgear-data-aircrafts (>= 3.4.0~),
- flightgear-data-models (>= 3.4.0~),
+ flightgear-data-base (>= 3.4.1~),
+ flightgear-data-ai (>= 3.4.1~),
+ flightgear-data-aircrafts (>= 3.4.1~),
+ flightgear-data-models (>= 3.4.1~),
  ${misc:Depends}
 Description: FlightGear Flight Simulator - virtual package
  FlightGear is a free and highly sophisticated flight simulator.
diff --git a/debian/patches/780867.patch b/debian/patches/780867.patch
new file mode 100644
index 0000000..e847a26
--- /dev/null
+++ b/debian/patches/780867.patch
@@ -0,0 +1,16 @@
+Description: Remove /tmp/*.xml from allowed paths list
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/780867
+Forwarded: not-needed
+
+--- a/Nasal/IOrules
++++ b/Nasal/IOrules
+@@ -29,7 +29,6 @@ READ ALLOW $FG_ROOT/*
+ READ ALLOW $FG_HOME/*
+ READ ALLOW $FG_AIRCRAFT/*
+ 
+-WRITE ALLOW /tmp/*.xml
+ WRITE ALLOW $FG_HOME/*.sav
+ WRITE ALLOW $FG_HOME/*.log
+ WRITE ALLOW $FG_HOME/cache/*
diff --git a/debian/patches/series b/debian/patches/series
index b6b3e18..1b91f4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-system-jslibs.diff
+780867.patch
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index c8c03ce..339d6bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
+simgear (3.4.1-1) UNRELEASED; urgency=medium
+
+  [ Markus Wanner ]
+  * Drop the deprecated JPEG_FACTORY cmake option and correctly
+    provide SIMGEAR_SHARED (w/o the CMAKE_ prefix).
+
+  [ Rebecca N. Palmer ]
+  * New upstream release.
+  * To avoid a soname change, revert upstream efbca94 and
+    disable the soname=version mechanism.
+
+ -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 20:11:41 +0100
+
 simgear (3.4.0-0~exp1) UNRELEASED; urgency=medium
 
   * New upstream release 3.4.0.
   * Update debian/watch.
-  * Drop the deprecated JPEG_FACTORY cmake option and correctly
-    provide SIMGEAR_SHARED (w/o the CMAKE_ prefix).
 
  -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 20:11:41 +0100
 
diff --git a/debian/patches/dont_change_soname.patch b/debian/patches/dont_change_soname.patch
new file mode 100644
index 0000000..7afdb3c
--- /dev/null
+++ b/debian/patches/dont_change_soname.patch
@@ -0,0 +1,83 @@
+Description: Revert soname change
+
+Revert upstream commit efbca9427485c4aa4a38591bfe44c1571cfd82f4 and
+force the soname to stay at 3.4.0.
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+Forwarded: not-needed
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d197b43..5c95864 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ string(STRIP ${versionFile} SIMGEAR_VERSION)
+ set(FIND_LIBRARY_USE_LIB64_PATHS ON)
+ 
+ # use simgear version also as the SO version (if building SOs)
+-SET(SIMGEAR_SOVERSION ${SIMGEAR_VERSION})
++SET(SIMGEAR_SOVERSION 3.4.0)
+ 
+ # Warning when build is not an out-of-source build.
+ string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" InSourceBuild)
+diff --git a/simgear/package/Catalog.cxx b/simgear/package/Catalog.cxx
+index b1a31b5..9c36d2a 100644
+--- a/simgear/package/Catalog.cxx
++++ b/simgear/package/Catalog.cxx
+@@ -36,6 +36,8 @@ namespace simgear {
+ 
+ namespace pkg {
+ 
++CatalogList static_catalogs;
++
+ //////////////////////////////////////////////////////////////////////////////
+ 
+ class Catalog::Downloader : public HTTP::Request
+@@ -110,14 +112,22 @@ private:
+ 
+ //////////////////////////////////////////////////////////////////////////////
+ 
++CatalogList Catalog::allCatalogs()
++{
++    return static_catalogs;
++}
++
+ Catalog::Catalog(Root *aRoot) :
+     m_root(aRoot),
+     m_retrievedTime(0)
+ {
++    static_catalogs.push_back(this);
+ }
+ 
+ Catalog::~Catalog()
+ {
++    CatalogList::iterator it = std::find(static_catalogs.begin(), static_catalogs.end(), this);
++    static_catalogs.erase(it);
+ }
+ 
+ CatalogRef Catalog::createFromUrl(Root* aRoot, const std::string& aUrl)
+diff --git a/simgear/package/Catalog.hxx b/simgear/package/Catalog.hxx
+index d3d685e..bae9c04 100644
+--- a/simgear/package/Catalog.hxx
++++ b/simgear/package/Catalog.hxx
+@@ -60,6 +60,8 @@ public:
+ 
+     static CatalogRef createFromPath(Root* aRoot, const SGPath& aPath);
+ 
++    static CatalogList allCatalogs();
++    
+     Root* root() const
+         { return m_root;};
+ 
+diff --git a/simgear/package/pkgutil.cxx b/simgear/package/pkgutil.cxx
+index 71fb2c6..9794c16 100644
+--- a/simgear/package/pkgutil.cxx
++++ b/simgear/package/pkgutil.cxx
+@@ -122,7 +122,7 @@ int main(int argc, char** argv)
+     root->setDelegate(&dlg);
+ 
+     cout << "Package root is:" << Dir::current().path() << endl;
+-    cout << "have " << root->catalogs().size() << " catalog(s)" << endl;
++    cout << "have " << pkg::Catalog::allCatalogs().size() << " catalog(s)" << endl;
+ 
+     root->setHTTPClient(http);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 99ba430..03805f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ md5_endianness.patch
 naref_endianness.patch
 kfreebsd.patch
 use_debian_utfcpp.patch
+dont_change_soname.patch
diff --git a/debian/rules b/debian/rules
index 73d347e..9f88b40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ CMAKE_FLAGS = \
 %:
 	dh $@ --buildsystem=cmake --builddirectory=build --parallel
 
-override_dh_auto_clean:
+tempdisabled_override_dh_auto_clean:
 #	Generate a couple of files automatically, based on the given
 #	upsteram version.
 	cat $(CURDIR)/debian/control.in \
@@ -61,8 +61,8 @@ override_dh_auto_configure:
 	cd build && cmake .. $(CMAKE_FLAGS)
 
 override_dh_strip:
-	dh_strip -plibsimgearcore$(UVER) --dbg-package=libsimgearcore$(UVER)-dbg
-	dh_strip -plibsimgearscene$(UVER) --dbg-package=libsimgearscene$(UVER)-dbg
+	dh_strip -plibsimgearcore3.4.0 --dbg-package=libsimgearcore3.4.0-dbg
+	dh_strip -plibsimgearscene3.4.0 --dbg-package=libsimgearscene3.4.0-dbg
 
 get-orig-source:
 	uscan --download-current-version --verbose --rename


More information about the pkg-fgfs-crew mailing list