[SCM] hydrogen/master: Limit patch 2001 to patch config file (not builtin defaults. Thanks to IOhannes m zmölnig.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Sep 19 18:13:07 UTC 2017


The following commit has been merged in the master branch:
commit 9461c5b7d4f7ee93cffc36de6c264c2be9e511ed
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Sep 19 14:07:57 2017 +0200

    Limit patch 2001 to patch config file (not builtin defaults. Thanks to IOhannes m zmölnig.

diff --git a/debian/patches/2001_avoid_live_non-free_drumkits.patch b/debian/patches/2001_avoid_live_non-free_drumkits.patch
index 32c7f1a..7c6bfb7 100644
--- a/debian/patches/2001_avoid_live_non-free_drumkits.patch
+++ b/debian/patches/2001_avoid_live_non-free_drumkits.patch
@@ -19,25 +19,3 @@ 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,7 @@
- 	m_countOffset = 0;  // beatcounter
- 	m_startOffset = 0;  // beatcounter
- 
--	sServerList.push_back( QString("http://www.hydrogen-music.org/feeds/drumkit_list.php") );
-+	sServerList.push_back( QString("http://freepats.zenvoid.org/hydrogen.xml") );
- 	m_patternCategories.push_back( QString("not_categorized") );
- 
- 	//___ audio engine properties ___
---- a/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp
-+++ b/src/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp
-@@ -93,7 +93,7 @@
- 	*/
- 
- 	if( pref->sServerList.size() == 0 ) {
--		pref->sServerList.push_back( "http://www.hydrogen-music.org/feeds/drumkit_list.php" );
-+		pref->sServerList.push_back( "http://freepats.zenvoid.org/hydrogen.xml" );
- 	}
- 
- 	repositoryCombo->clear();

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list