[SCM] hydrogen/master: Remove 1007_installation_error_fix.patch, no longer needed since it doesn't use scons as buildsystem anymore.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Jan 27 01:51:02 UTC 2012


The following commit has been merged in the master branch:
commit 2071dab1833d1eef5758554717ee31e40ff7a49a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 27 02:50:32 2012 +0100

    Remove 1007_installation_error_fix.patch, no longer needed since it doesn't use scons as buildsystem anymore.

diff --git a/debian/patches/1007_installation_error_fix.patch b/debian/patches/1007_installation_error_fix.patch
deleted file mode 100644
index 6b55936..0000000
--- a/debian/patches/1007_installation_error_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Andres Mejia <amejia at debian.org>
-Description: Prevent build failure with double installation of images.
-
---- a/Sconstruct
-+++ b/Sconstruct
-@@ -303,7 +303,7 @@
- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
- 
- 	#add every img in ./data/img to the install list. 
--	os.path.walk("./data/img/",install_images,env) 
-+	#os.path.walk("./data/img/",install_images,env) 
- 
- 
- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits"))
diff --git a/debian/patches/series b/debian/patches/series
index e588772..557109e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 09_portaudio_v2.patch
 1001_rubberband_path.patch
 1005_name_shouldnt_repeat_genericname.patch
-1007_installation_error_fix.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list