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

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit ec48e36abd584d55ad8d53735e66ffcd213c82ef
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Mon May 17 11:34:15 2010 -0300

    Fixes bashism in build system.

diff --git a/debian/changelog b/debian/changelog
index 21f14ca..e51a089 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+webkit (1.2.1-2) unstable; urgency=low
+
+  * debian/patches/01-fix-bashism-in-build.diff:
+  - remove bashism from the code that handles Web Inspector files,
+    that end up not being installed. (Closes: #581893)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon, 17 May 2010 11:33:48 -0300
+
 webkit (1.2.1-1) unstable; urgency=low
 
   [Michael Gilbert]
diff --git a/debian/patches/01-fix-bashism-in-build.diff b/debian/patches/01-fix-bashism-in-build.diff
new file mode 100644
index 0000000..c1c5d33
--- /dev/null
+++ b/debian/patches/01-fix-bashism-in-build.diff
@@ -0,0 +1,30 @@
+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 e69de29..1ed8c9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix-bashism-in-build.diff

-- 
WebKit Debian packaging