[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.1-2-74-gcc212da

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 1bf410acbecdf4f732dadae58d7b3d2db8bcdb2c
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Mon Jul 12 16:17:20 2010 -0300

    Remove patch that is no longer needed

diff --git a/debian/changelog b/debian/changelog
index cb48eb1..e059ebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ webkit (1.2.2-1) UNRELEASED; urgency=low
   [ Gustavo Noronha Silva ]
   * New upstream release
   - adds a new symbol, fixed symbols file to include it
+  * debian/patches/01-fix-bashism-in-build.patch:
+  - removed, no longer needed
 
  -- Gustavo Noronha Silva <kov at debian.org>  Mon, 12 Jul 2010 15:23:17 -0300
 
diff --git a/debian/patches/01-fix-bashism-in-build.patch b/debian/patches/01-fix-bashism-in-build.patch
deleted file mode 100644
index c1c5d33..0000000
--- a/debian/patches/01-fix-bashism-in-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 68bcc1c..2a63213 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -9214,7 +9214,9 @@ libWebCoreJS_depfiles := $(patsubst \
- webinspectordir = ${datadir}/webkit-1.0/webinspector
- dist_webinspector_DATA = \
- 	$(WebCore)/English.lproj/localizedStrings.js \
--	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
-+	$(shell ls $(WebCore)/inspector/front-end/*.js) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.html) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.css)
- 
- webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
- dist_webinspectorimages_DATA = \
-diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
-index 416f00c..fb45261 100644
---- a/WebCore/GNUmakefile.am
-+++ b/WebCore/GNUmakefile.am
-@@ -3768,7 +3768,9 @@ webcore_dist += \
- webinspectordir = ${datadir}/webkit-1.0/webinspector
- dist_webinspector_DATA = \
- 	$(WebCore)/English.lproj/localizedStrings.js \
--	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
-+	$(shell ls $(WebCore)/inspector/front-end/*.js) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.html) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.css)
- 
- webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
- dist_webinspectorimages_DATA = \
diff --git a/debian/patches/series b/debian/patches/series
index 85f95e8..471c51e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-fix-bashism-in-build.patch
 02-pool-fixup-and-sparc-support.patch
 
 # security patches

-- 
WebKit Debian packaging