[pkg-wine-party] [SCM] Debian Wine Gecko packaging branch, wine-gecko-1.4, updated. debian/1.1.0+dfsg-1-17-gdfea557

[Stephen Kitt]

The following commit has been merged in the wine-gecko-1.4 branch:
commit dfea557698ad37c78ccb4eacc969927383fa234b
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun May 27 09:01:26 2012 +0200

    Import the actual upload which made it to the archive.

diff --git a/debian/changelog b/debian/changelog
index 7ed017d..c688842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 wine-gecko-1.4 (1.4+dfsg-1) unstable; urgency=low
 
-  * New upstream version, as required by Wine versions 1.3.33 to 1.4
-    (closes: #673926).
+  * New upstream version, as required by Wine versions 1.3.33 to 1.4.
   * Build-depend on wine or wine-unstable, now required to package wine-
     gecko.
   * Update patches:
@@ -16,7 +15,7 @@ wine-gecko-1.4 (1.4+dfsg-1) unstable; urgency=low
     requires a 64-bit host platform to link the final DLL; a 32-bit
     platform doesn't allow enough addressing space.)
 
- -- Stephen Kitt <steve at sk2.org>  Tue, 22 May 2012 06:47:02 +0200
+ -- Stephen Kitt <steve at sk2.org>  Sun, 20 May 2012 01:08:18 +0200
 
 wine-gecko-1.1.0 (1.1.0+dfsg-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 64b4ca0..501dec8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,10 @@
 
 VERSION=-1.4
 
-#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-#NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-#MAKEFLAGS += -j$(NUMJOBS)
-#endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS += -j$(NUMJOBS)
+endif
 
 # This provides propvarutil.h until mingw-w64 ships it
 export CPPFLAGS=-I$(CURDIR)/debian/include

-- 
Debian Wine Gecko packaging