[SCM] hydrogen/master: Extend patch 2001 to contain no builtin default feed URL.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d696a8c6c660789bec881b2aa29223e89cf40a8d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Sep 19 21:56:35 2017 +0200

    Extend patch 2001 to contain no builtin default feed URL.

diff --git a/debian/patches/2001_avoid_live_non-free_drumkits.patch b/debian/patches/2001_avoid_live_non-free_drumkits.patch
index 7c6bfb7..828ded1 100644
--- a/debian/patches/2001_avoid_live_non-free_drumkits.patch
+++ b/debian/patches/2001_avoid_live_non-free_drumkits.patch
@@ -19,3 +19,26 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	</serverList>
  	<patternCategories>
  		<categories>not_categorized</categories>
+--- a/src/core/src/preferences.cpp
++++ b/src/core/src/preferences.cpp
+@@ -171,7 +171,6 @@
+ 	m_countOffset = 0;  // beatcounter
+ 	m_startOffset = 0;  // beatcounter
+ 
+-	sServerList.push_back( QString("http://www.hydrogen-music.org/feeds/drumkit_list.php") );
+ 	m_patternCategories.push_back( QString("not_categorized") );
+ 
+ 	//___ audio engine properties ___
+--- a/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp
++++ b/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp
+@@ -92,10 +92,6 @@
+ 		Read serverList from config and put servers into the comboBox
+ 	*/
+ 
+-	if( pref->sServerList.size() == 0 ) {
+-		pref->sServerList.push_back( "http://www.hydrogen-music.org/feeds/drumkit_list.php" );
+-	}
+-
+ 	repositoryCombo->clear();
+ 
+ 	std::list<QString>::const_iterator cur_Server;

-- 
hydrogen packaging