[SCM] hydrogen/master: Drop patch 0001: Applied upstream.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Mar 18 01:00:01 UTC 2011


The following commit has been merged in the master branch:
commit db3d94d2e5dd2ca8bc8ce3a5401ae8a8e5801f03
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 17 21:46:54 2011 +0100

    Drop patch 0001: Applied upstream.

diff --git a/debian/patches/0001_silence_Scons_config_warning.patch b/debian/patches/0001_silence_Scons_config_warning.patch
deleted file mode 100644
index 6048c94..0000000
--- a/debian/patches/0001_silence_Scons_config_warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Silence Scons config warning
-Forwarded: yes
-Last-Update: 2010-03-20
---- a/Sconstruct
-+++ b/Sconstruct
-@@ -318,7 +318,7 @@
-         rv = "-DJACK_NO_BBT_OFFSET"
-     xenv.MergeFlags(rv)
- 
--opts = Options('scache.conf')
-+opts = Variables('scache.conf')
- 
- #platform independent settings
- opts.Add('debug', 'Set to 1 to build with debug informations', 0)
diff --git a/debian/patches/series b/debian/patches/series
index 91a463d..0a0279e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001_silence_Scons_config_warning.patch
 #02_gcc41.patch
 #03_gcc43.patch
 #07_gcc44.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list