This is an automated email from the git hooks/post-receive script. josch pushed a commit to branch master in repository vcmi.
commit cdd744d8e109c5e20e8bd9e794cb86b5de69ba94 Author: josch <j.scha...@email.de> Date: Wed Apr 29 11:36:36 2015 +0200 release 0.98+dfsg-1 --- debian/changelog | 13 + debian/patches/20141103-disable-privacy-breach | 504 --------------------- .../20141117-add-FL_CPP11-preprocessor-define | 16 - .../patches/20141117-add-kfreebsd-and-hurd-support | 129 ------ .../20150204-let-vcmibuilder-be-case-insensitive | 32 -- debian/patches/disable-privacy-breach | 14 + debian/patches/series | 5 +- 7 files changed, 28 insertions(+), 685 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf8f279..0c30da5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +vcmi (0.98+dfsg-1) unstable; urgency=medium + + * new upstream release 0.98 + * remove patches that have been integrated upstream: + - 20141103-disable-privacy-breach + - 20141117-add-FL_CPP11-preprocessor-define + - 20141117-add-kfreebsd-and-hurd-support + - 20150204-let-vcmibuilder-be-case-insensitive + * add new patch disable-privacy-breach to disable automatic checking online + for mods on startup by default + + -- Johannes Schauer <jo...@debian.org> Wed, 29 Apr 2015 11:36:43 +0200 + vcmi (0.97+dfsg-4) unstable; urgency=medium * change my email in Uploaders field to jo...@debian.org diff --git a/debian/patches/20141103-disable-privacy-breach b/debian/patches/20141103-disable-privacy-breach deleted file mode 100644 index 463834c..0000000 --- a/debian/patches/20141103-disable-privacy-breach +++ /dev/null @@ -1,504 +0,0 @@ -From: Johannes Schauer <j.scha...@email.de> -Subject: Launcher: do not automatically check remote repositories - - - add a button to the launcher which allows manual downloading - - add a configuration option autoCheckRepositories to launcher settings - - add ui elements to settings dialog to change autoCheckRepositories - -This feature disables the automatic online check on every startup of the -vcmilauncher. - -Origin: upstream, commit:b962e11bd7a6aef5043014c2e46f753239fffc9a -Date: Mon Nov 3 16:47:37 2014 +0100 - -diff --git a/config/schemas/settings.json b/config/schemas/settings.json -index ae753d1..5b78fab 100644 ---- a/config/schemas/settings.json -+++ b/config/schemas/settings.json -@@ -242,7 +242,7 @@ - "type" : "object", - "default": {}, - "additionalProperties" : false, -- "required" : [ "repositoryURL", "enableInstalledMods" ], -+ "required" : [ "repositoryURL", "enableInstalledMods", "autoCheckRepositories" ], - "properties" : { - "repositoryURL" : { - "type" : "array", -@@ -256,6 +256,10 @@ - "enableInstalledMods" : { - "type" : "boolean", - "default" : true -+ }, -+ "autoCheckRepositories" : { -+ "type" : "boolean", -+ "default" : false - } - } - } -diff --git a/launcher/modManager/cmodlistview_moc.cpp b/launcher/modManager/cmodlistview_moc.cpp -index 5b53f2e..a6f3b22 100644 ---- a/launcher/modManager/cmodlistview_moc.cpp -+++ b/launcher/modManager/cmodlistview_moc.cpp -@@ -70,7 +70,10 @@ CModListView::CModListView(QWidget *parent) : - ui->progressWidget->setVisible(false); - dlManager = nullptr; - disableModInfo(); -- loadRepositories(); -+ if (settings["launcher"]["autoCheckRepositories"].Bool()) -+ { -+ loadRepositories(); -+ } - } - - void CModListView::loadRepositories() -@@ -99,7 +102,10 @@ void CModListView::showEvent(QShowEvent * event) - if (repositoriesChanged) - { - repositoriesChanged = false; -- loadRepositories(); -+ if (settings["launcher"]["autoCheckRepositories"].Bool()) -+ { -+ loadRepositories(); -+ } - } - } - -@@ -620,6 +626,11 @@ void CModListView::installMods(QStringList archives) - checkManagerErrors(); - } - -+void CModListView::on_refreshButton_clicked() -+{ -+ loadRepositories(); -+} -+ - void CModListView::on_pushButton_clicked() - { - delete dlManager; -diff --git a/launcher/modManager/cmodlistview_moc.h b/launcher/modManager/cmodlistview_moc.h -index 6c90214..4c63804 100644 ---- a/launcher/modManager/cmodlistview_moc.h -+++ b/launcher/modManager/cmodlistview_moc.h -@@ -91,6 +91,8 @@ private slots: - - void on_pushButton_clicked(); - -+ void on_refreshButton_clicked(); -+ - void on_allModsView_activated(const QModelIndex &index); - - void on_tabWidget_currentChanged(int index); -diff --git a/launcher/modManager/cmodlistview_moc.ui b/launcher/modManager/cmodlistview_moc.ui -index dd99712..38d2ae3 100644 ---- a/launcher/modManager/cmodlistview_moc.ui -+++ b/launcher/modManager/cmodlistview_moc.ui -@@ -34,7 +34,7 @@ - <property name="spacing"> - <number>6</number> - </property> -- <item row="0" column="0"> -+ <item row="0" column="1"> - <widget class="QLineEdit" name="lineEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> -@@ -62,7 +62,7 @@ - </property> - </widget> - </item> -- <item row="0" column="1"> -+ <item row="0" column="2"> - <widget class="QComboBox" name="comboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> -@@ -111,7 +111,20 @@ - </item> - </widget> - </item> -- <item row="1" column="0" colspan="2"> -+ <item row="0" column="3"> -+ <widget class="QPushButton" name="refreshButton"> -+ <property name="sizePolicy"> -+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> -+ <horstretch>0</horstretch> -+ <verstretch>0</verstretch> -+ </sizepolicy> -+ </property> -+ <property name="text"> -+ <string>Download && refresh repositories</string> -+ </property> -+ </widget> -+ </item> -+ <item row="5" column="1" colspan="3"> - <widget class="QTreeView" name="allModsView"> - <property name="selectionMode"> - <enum>QAbstractItemView::SingleSelection</enum> -diff --git a/launcher/settingsView/csettingsview_moc.cpp b/launcher/settingsView/csettingsview_moc.cpp -index 9f19a70..6c17222 100644 ---- a/launcher/settingsView/csettingsview_moc.cpp -+++ b/launcher/settingsView/csettingsview_moc.cpp -@@ -39,6 +39,7 @@ void CSettingsView::loadSettings() - - ui->spinBoxNetworkPort->setValue(settings["server"]["port"].Float()); - -+ ui->comboBoxAutoCheck->setCurrentIndex(settings["launcher"]["autoCheckRepositories"].Bool()); - // all calls to plainText will trigger textChanged() signal overwriting config. Create backup before editing widget - JsonNode urls = settings["launcher"]["repositoryURL"]; - -@@ -85,6 +86,12 @@ void CSettingsView::on_comboBoxFullScreen_currentIndexChanged(int index) - node->Bool() = index; - } - -+void CSettingsView::on_comboBoxAutoCheck_currentIndexChanged(int index) -+{ -+ Settings node = settings.write["launcher"]["autoCheckRepositories"]; -+ node->Bool() = index; -+} -+ - void CSettingsView::on_comboBoxPlayerAI_currentIndexChanged(const QString &arg1) - { - Settings node = settings.write["server"]["playerAI"]; -diff --git a/launcher/settingsView/csettingsview_moc.h b/launcher/settingsView/csettingsview_moc.h -index af4f657..4936392 100644 ---- a/launcher/settingsView/csettingsview_moc.h -+++ b/launcher/settingsView/csettingsview_moc.h -@@ -39,6 +39,8 @@ private slots: - - void on_changeGameDataDir_clicked(); - -+ void on_comboBoxAutoCheck_currentIndexChanged(int index); -+ - private: - Ui::CSettingsView *ui; - }; -diff --git a/launcher/settingsView/csettingsview_moc.ui b/launcher/settingsView/csettingsview_moc.ui -index 7b085d9..98d4315 100644 ---- a/launcher/settingsView/csettingsview_moc.ui -+++ b/launcher/settingsView/csettingsview_moc.ui -@@ -26,7 +26,20 @@ - <property name="bottomMargin"> - <number>0</number> - </property> -- <item row="5" column="3" colspan="4"> -+ <item row="9" column="1" colspan="4"> -+ <widget class="QLabel" name="LauncherSettings"> -+ <property name="font"> -+ <font> -+ <weight>75</weight> -+ <bold>true</bold> -+ </font> -+ </property> -+ <property name="text"> -+ <string>Launcher Settings</string> -+ </property> -+ </widget> -+ </item> -+ <item row="5" column="6" colspan="4"> - <widget class="QLabel" name="labelGeneral"> - <property name="font"> - <font> -@@ -39,14 +52,14 @@ - </property> - </widget> - </item> -- <item row="2" column="3"> -+ <item row="2" column="6"> - <widget class="QLabel" name="labelUserDataDir"> - <property name="text"> - <string>User data directory</string> - </property> - </widget> - </item> -- <item row="6" column="4" colspan="3"> -+ <item row="6" column="7" colspan="3"> - <widget class="QSpinBox" name="spinBoxNetworkPort"> - <property name="minimum"> - <number>1024</number> -@@ -59,7 +72,7 @@ - </property> - </widget> - </item> -- <item row="1" column="5"> -+ <item row="1" column="8"> - <widget class="QPushButton" name="changeGameDataDir"> - <property name="enabled"> - <bool>false</bool> -@@ -69,7 +82,7 @@ - </property> - </widget> - </item> -- <item row="2" column="1"> -+ <item row="2" column="4"> - <widget class="QComboBox" name="comboBoxFullScreen"> - <property name="currentIndex"> - <number>0</number> -@@ -86,7 +99,7 @@ - </item> - </widget> - </item> -- <item row="5" column="0" colspan="2"> -+ <item row="5" column="1" colspan="4"> - <widget class="QLabel" name="labelAISettings"> - <property name="font"> - <font> -@@ -99,21 +112,21 @@ - </property> - </widget> - </item> -- <item row="1" column="6"> -+ <item row="1" column="9"> - <widget class="QPushButton" name="openGameDataDir"> - <property name="text"> - <string>Open</string> - </property> - </widget> - </item> -- <item row="1" column="3"> -+ <item row="1" column="6"> - <widget class="QLabel" name="labelGameDir"> - <property name="text"> - <string>Extra data directory</string> - </property> - </widget> - </item> -- <item row="1" column="1"> -+ <item row="1" column="4"> - <widget class="QComboBox" name="comboBoxResolution"> - <item> - <property name="text"> -@@ -172,14 +185,14 @@ - </item> - </widget> - </item> -- <item row="2" column="0"> -+ <item row="2" column="1"> - <widget class="QLabel" name="labelFullScreen"> - <property name="text"> - <string>Fullscreen</string> - </property> - </widget> - </item> -- <item row="11" column="0" colspan="7"> -+ <item row="13" column="1" colspan="9"> - <widget class="QPlainTextEdit" name="plainTextEditRepos"> - <property name="lineWrapMode"> - <enum>QPlainTextEdit::NoWrap</enum> -@@ -189,14 +202,14 @@ - </property> - </widget> - </item> -- <item row="2" column="6"> -+ <item row="2" column="9"> - <widget class="QPushButton" name="openUserDataDir"> - <property name="text"> - <string>Open</string> - </property> - </widget> - </item> -- <item row="1" column="4"> -+ <item row="1" column="7"> - <widget class="QLineEdit" name="lineEditGameDir"> - <property name="minimumSize"> - <size> -@@ -209,7 +222,7 @@ - </property> - </widget> - </item> -- <item row="7" column="1"> -+ <item row="7" column="4"> - <widget class="QComboBox" name="comboBoxNeutralAI"> - <item> - <property name="text"> -@@ -223,35 +236,35 @@ - </item> - </widget> - </item> -- <item row="3" column="6"> -+ <item row="3" column="9"> - <widget class="QPushButton" name="openTempDir"> - <property name="text"> - <string>Open</string> - </property> - </widget> - </item> -- <item row="1" column="0"> -+ <item row="1" column="1"> - <widget class="QLabel" name="labelResolution"> - <property name="text"> - <string>Resolution</string> - </property> - </widget> - </item> -- <item row="7" column="0"> -+ <item row="7" column="1"> - <widget class="QLabel" name="labelNeutralAI"> - <property name="text"> - <string>Neutral AI</string> - </property> - </widget> - </item> -- <item row="7" column="3"> -+ <item row="7" column="6"> - <widget class="QLabel" name="labelEncoding"> - <property name="text"> - <string>Heroes III character set</string> - </property> - </widget> - </item> -- <item row="6" column="1"> -+ <item row="6" column="4"> - <widget class="QComboBox" name="comboBoxPlayerAI"> - <item> - <property name="text"> -@@ -260,14 +273,14 @@ - </item> - </widget> - </item> -- <item row="6" column="0"> -+ <item row="6" column="1"> - <widget class="QLabel" name="labelPlayerAI"> - <property name="text"> - <string>Player AI</string> - </property> - </widget> - </item> -- <item row="7" column="4" colspan="3"> -+ <item row="7" column="7" colspan="3"> - <widget class="QComboBox" name="comboBoxEncoding"> - <item> - <property name="text"> -@@ -296,14 +309,14 @@ - </item> - </widget> - </item> -- <item row="6" column="3"> -+ <item row="6" column="6"> - <widget class="QLabel" name="labelNetworkPort"> - <property name="text"> - <string>Network port</string> - </property> - </widget> - </item> -- <item row="0" column="0" colspan="2"> -+ <item row="0" column="1" colspan="4"> - <widget class="QLabel" name="labelVideo"> - <property name="font"> - <font> -@@ -316,7 +329,7 @@ - </property> - </widget> - </item> -- <item row="9" column="0" colspan="2"> -+ <item row="11" column="1" colspan="4"> - <widget class="QLabel" name="labelRepositories"> - <property name="font"> - <font> -@@ -329,14 +342,14 @@ - </property> - </widget> - </item> -- <item row="3" column="3"> -+ <item row="3" column="6"> - <widget class="QLabel" name="labelTempDir"> - <property name="text"> - <string>Log files directory</string> - </property> - </widget> - </item> -- <item row="2" column="4" colspan="2"> -+ <item row="2" column="7" colspan="2"> - <widget class="QLineEdit" name="lineEditUserDataDir"> - <property name="enabled"> - <bool>false</bool> -@@ -355,7 +368,7 @@ - </property> - </widget> - </item> -- <item row="3" column="4" colspan="2"> -+ <item row="3" column="7" colspan="2"> - <widget class="QLineEdit" name="lineEditTempDir"> - <property name="enabled"> - <bool>false</bool> -@@ -374,14 +387,14 @@ - </property> - </widget> - </item> -- <item row="3" column="0"> -+ <item row="3" column="1"> - <widget class="QLabel" name="labelShowIntro"> - <property name="text"> - <string>Show intro</string> - </property> - </widget> - </item> -- <item row="3" column="1"> -+ <item row="3" column="4"> - <widget class="QComboBox" name="comboBoxShowIntro"> - <property name="currentIndex"> - <number>1</number> -@@ -398,7 +411,7 @@ - </item> - </widget> - </item> -- <item row="4" column="0" colspan="2"> -+ <item row="4" column="1" colspan="4"> - <spacer name="spacerSections"> - <property name="orientation"> - <enum>Qt::Vertical</enum> -@@ -414,7 +427,7 @@ - </property> - </spacer> - </item> -- <item row="8" column="0" colspan="2"> -+ <item row="8" column="1" colspan="4"> - <spacer name="spacerRepos"> - <property name="orientation"> - <enum>Qt::Vertical</enum> -@@ -430,7 +443,7 @@ - </property> - </spacer> - </item> -- <item row="0" column="3" colspan="4"> -+ <item row="0" column="6" colspan="4"> - <widget class="QLabel" name="labelDataDirs"> - <property name="font"> - <font> -@@ -443,7 +456,7 @@ - </property> - </widget> - </item> -- <item row="1" column="2" rowspan="3"> -+ <item row="1" column="5" rowspan="3"> - <spacer name="spacerColumns"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> -@@ -459,6 +472,30 @@ - </property> - </spacer> - </item> -+ <item row="10" column="6"> -+ <widget class="QComboBox" name="comboBoxAutoCheck"> -+ <property name="currentIndex"> -+ <number>1</number> -+ </property> -+ <item> -+ <property name="text"> -+ <string>Off</string> -+ </property> -+ </item> -+ <item> -+ <property name="text"> -+ <string>On</string> -+ </property> -+ </item> -+ </widget> -+ </item> -+ <item row="10" column="1" colspan="4"> -+ <widget class="QLabel" name="labelAutoCheck"> -+ <property name="text"> -+ <string>Check repositories on startup</string> -+ </property> -+ </widget> -+ </item> - </layout> - </widget> - <resources/> diff --git a/debian/patches/20141117-add-FL_CPP11-preprocessor-define b/debian/patches/20141117-add-FL_CPP11-preprocessor-define deleted file mode 100644 index f79d0da..0000000 --- a/debian/patches/20141117-add-FL_CPP11-preprocessor-define +++ /dev/null @@ -1,16 +0,0 @@ -Author: josch <j.scha...@email.de> -Subject: add FL_CPP11 preprocessor define independent of which fuzzylite is used -Forwarded: https://github.com/vcmi/vcmi/pull/57 - ---- a/AI/CMakeLists.txt -+++ b/AI/CMakeLists.txt -@@ -1,6 +1,9 @@ - project(AI) - cmake_minimum_required(VERSION 2.6) - -+add_definitions(-DFL_CPP11) -+set(FL_CPP11 ON CACHE BOOL "") -+ - find_path(FUZZYLITE_INCLUDE_PATH NAMES fl/fuzzylite.h) - find_library(FUZZYLITE_LIB NAMES fuzzylite PATH_SUFFIXES dynamic) - mark_as_advanced(FUZZYLITE_INCLUDE_PATH FUZZYLITE_LIB) diff --git a/debian/patches/20141117-add-kfreebsd-and-hurd-support b/debian/patches/20141117-add-kfreebsd-and-hurd-support deleted file mode 100644 index 784a405..0000000 --- a/debian/patches/20141117-add-kfreebsd-and-hurd-support +++ /dev/null @@ -1,129 +0,0 @@ -Author: josch <j.scha...@email.de> -Subject: add kFreeBSD and HURD support -Forwarded: https://github.com/vcmi/vcmi/pull/58 - -diff --git a/Global.h b/Global.h -index a7f4a61..c5d1096 100644 ---- a/Global.h -+++ b/Global.h -@@ -53,10 +53,18 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size."); - # error "Windows CE isn't supported" - #elif defined(__linux__) || defined(__gnu_linux__) || defined(linux) || defined(__linux) - # define VCMI_UNIX --# define VCMI_LINUX -+# define VCMI_XDG - # ifdef __ANDROID__ - # define VCMI_ANDROID - # endif -+#elif defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+# define VCMI_UNIX -+# define VCMI_XDG -+# define VCMI_FREEBSD -+#elif defined(__GNU__) || defined(__gnu_hurd__) || (defined(__MACH__) && !defined(__APPLE)) -+# define VCMI_UNIX -+# define VCMI_XDG -+# define VCMI_HURD - #elif defined(__APPLE__) && defined(__MACH__) - # define VCMI_UNIX - # define VCMI_APPLE -diff --git a/lib/CThreadHelper.cpp b/lib/CThreadHelper.cpp -index cbbeeb2..2027390 100644 ---- a/lib/CThreadHelper.cpp -+++ b/lib/CThreadHelper.cpp -@@ -3,7 +3,7 @@ - - #ifdef VCMI_WINDOWS - #include <windows.h> --#elif !defined(VCMI_APPLE) -+#elif !defined(VCMI_APPLE) && !defined(VCMI_FREEBSD) && !defined(VCMI_HURD) - #include <sys/prctl.h> - #endif - /* -diff --git a/lib/VCMIDirs.cpp b/lib/VCMIDirs.cpp -index be83e9a..679b68f 100644 ---- a/lib/VCMIDirs.cpp -+++ b/lib/VCMIDirs.cpp -@@ -449,8 +449,8 @@ bfs::path VCMIDirsOSX::libraryPath() const { return "."; } - bfs::path VCMIDirsOSX::binaryPath() const { return "."; } - - std::string VCMIDirsOSX::libraryName(const std::string& basename) const { return "lib" + basename + ".dylib"; } --#elif defined(VCMI_LINUX) --class VCMIDirsLinux : public IVCMIDirsUNIX -+#elif defined(VCMI_XDG) -+class VCMIDirsXDG : public IVCMIDirsUNIX - { - public: - boost::filesystem::path userDataPath() const override; -@@ -465,7 +465,7 @@ public: - std::string libraryName(const std::string& basename) const override; - }; - --bfs::path VCMIDirsLinux::userDataPath() const -+bfs::path VCMIDirsXDG::userDataPath() const - { - // $XDG_DATA_HOME, default: $HOME/.local/share - const char* homeDir; -@@ -476,7 +476,7 @@ bfs::path VCMIDirsLinux::userDataPath() const - else - return "."; - } --bfs::path VCMIDirsLinux::userCachePath() const -+bfs::path VCMIDirsXDG::userCachePath() const - { - // $XDG_CACHE_HOME, default: $HOME/.cache - const char* tempResult; -@@ -487,7 +487,7 @@ bfs::path VCMIDirsLinux::userCachePath() const - else - return "."; - } --bfs::path VCMIDirsLinux::userConfigPath() const -+bfs::path VCMIDirsXDG::userConfigPath() const - { - // $XDG_CONFIG_HOME, default: $HOME/.config - const char* tempResult; -@@ -499,7 +499,7 @@ bfs::path VCMIDirsLinux::userConfigPath() const - return "."; - } - --std::vector<bfs::path> VCMIDirsLinux::dataPaths() const -+std::vector<bfs::path> VCMIDirsXDG::dataPaths() const - { - // $XDG_DATA_DIRS, default: /usr/local/share/:/usr/share/ - -@@ -528,12 +528,12 @@ std::vector<bfs::path> VCMIDirsLinux::dataPaths() const - return ret; - } - --bfs::path VCMIDirsLinux::libraryPath() const { return M_LIB_DIR; } --bfs::path VCMIDirsLinux::binaryPath() const { return M_BIN_DIR; } -+bfs::path VCMIDirsXDG::libraryPath() const { return M_LIB_DIR; } -+bfs::path VCMIDirsXDG::binaryPath() const { return M_BIN_DIR; } - --std::string VCMIDirsLinux::libraryName(const std::string& basename) const { return "lib" + basename + ".so"; } -+std::string VCMIDirsXDG::libraryName(const std::string& basename) const { return "lib" + basename + ".so"; } - #ifdef VCMI_ANDROID --class VCMIDirsAndroid : public VCMIDirsLinux -+class VCMIDirsAndroid : public VCMIDirsXDG - { - public: - boost::filesystem::path userDataPath() const override; -@@ -553,7 +553,7 @@ std::vector<bfs::path> VCMIDirsAndroid::dataPaths() const - return std::vector<bfs::path>(1, userDataPath()); - } - #endif // VCMI_ANDROID --#endif // VCMI_APPLE, VCMI_LINUX -+#endif // VCMI_APPLE, VCMI_XDG - #endif // VCMI_WINDOWS, VCMI_UNIX - - // Getters for interfaces are separated for clarity. -@@ -565,8 +565,8 @@ namespace VCMIDirs - static VCMIDirsWIN32 singleton; - #elif defined(VCMI_ANDROID) - static VCMIDirsAndroid singleton; -- #elif defined(VCMI_LINUX) -- static VCMIDirsLinux singleton; -+ #elif defined(VCMI_XDG) -+ static VCMIDirsXDG singleton; - #elif defined(VCMI_APPLE) - static VCMIDirsOSX singleton; - #endif diff --git a/debian/patches/20150204-let-vcmibuilder-be-case-insensitive b/debian/patches/20150204-let-vcmibuilder-be-case-insensitive deleted file mode 100644 index 6e947e9..0000000 --- a/debian/patches/20150204-let-vcmibuilder-be-case-insensitive +++ /dev/null @@ -1,32 +0,0 @@ -Author: josch <j.scha...@email.de> -Subject: let data, maps and mp3 directory be truly case insensitive -Forwarded: https://github.com/vcmi/vcmi/pull/63 - -diff --git a/vcmibuilder b/vcmibuilder -index 59ac71e..36de603 100755 ---- a/vcmibuilder -+++ b/vcmibuilder -@@ -209,17 +209,13 @@ fi - - if [[ -n "$data_dir" ]] - then -- cp -r "$data_dir"/Data "$dest_dir" -- cp -r "$data_dir"/Maps "$dest_dir" -- - # this folder is named differently from time to time -- # vcmi can handle any case but script can't -- if [ -d "$data_dir"/MP3 ] -- then -- cp -r "$data_dir"/MP3 "$dest_dir" -- else -- cp -r "$data_dir"/Mp3 "$dest_dir" -- fi -+ # bash also has `shopt -s nocaseglob` but we don't want this to -+ # accidentally influence other parts of this script -+ # since the directory names are short, we use this pattern matching -+ cp -r "$data_dir"/[Dd][Aa][Tt][Aa] "$dest_dir" -+ cp -r "$data_dir"/[Mm][Aa][Pp][Ss] "$dest_dir" -+ cp -r "$data_dir"/[Mm][Pp]3 "$dest_dir" - fi - - if [[ -n "$download" ]] diff --git a/debian/patches/disable-privacy-breach b/debian/patches/disable-privacy-breach new file mode 100644 index 0000000..995c654 --- /dev/null +++ b/debian/patches/disable-privacy-breach @@ -0,0 +1,14 @@ +From: Johannes Schauer <jo...@debian.org> +Subject: do not check remote repositories on startup by default + +--- a/config/schemas/settings.json ++++ b/config/schemas/settings.json +@@ -259,7 +259,7 @@ + }, + "autoCheckRepositories" : { + "type" : "boolean", +- "default" : true ++ "default" : false + } + } + } diff --git a/debian/patches/series b/debian/patches/series index f5bf5b3..31acd96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -20141103-disable-privacy-breach -20141117-add-FL_CPP11-preprocessor-define -20141117-add-kfreebsd-and-hurd-support -20150204-let-vcmibuilder-be-case-insensitive +disable-privacy-breach -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits