[pkg-wine-party] [SCM] Debian Wine Gecko packaging branch, master, updated. debian/1.4+dfsg1-3-20-g7028796

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 7028796ccd9b7d6e10c2b18ef133a71f6610a32b
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Jun 27 23:17:51 2013 +0200

    Refresh patch and release.

diff --git a/debian/changelog b/debian/changelog
index 0ae5ef8..dd3d074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-wine-gecko-1.7 (1.7+dfsg-1) UNRELEASED; urgency=low
+wine-gecko-1.7 (1.7+dfsg-1) unstable; urgency=low
 
   * New upstream version, used for Wine versions up to 1.5.14.
+  * Refresh debian/patches/config.
 
- -- Stephen Kitt <skitt at debian.org>  Thu, 27 Jun 2013 09:36:45 +0200
+ -- Stephen Kitt <skitt at debian.org>  Thu, 27 Jun 2013 23:17:21 +0200
 
 wine-gecko-1.6 (1.6+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/config b/debian/patches/config
index 086fd53..6aacdc9 100644
--- a/debian/patches/config
+++ b/debian/patches/config
@@ -3,29 +3,18 @@ Author: Stephen Kitt <steve at sk2.org>
 Forwarded: not-needed
 Last-Update: 2012-05-16
 
---- wine-gecko.orig/wine/mozconfig-common
-+++ wine-gecko/wine/mozconfig-common
-@@ -7,7 +7,7 @@
- if test -z "$WINE_GECKO_OBJDIR"
- then
-     echo "WARNING: WINE_GECKO_OBJDIR not set"
--    WINE_GECKO_OBJDIR=@TOPSRCDIR@/../wine_gecko
-+    WINE_GECKO_OBJDIR=@TOPSRCDIR@/wine_gecko
- fi
- mk_add_options MOZ_OBJDIR=$WINE_GECKO_OBJDIR
- 
---- wine-gecko.orig/wine/make_package
-+++ wine-gecko/wine/make_package
-@@ -64,7 +64,7 @@
- src_dir=$(pwd)
- version=$(head -n 1 $src_dir/wine/VERSION)
+--- a/wine/make_package
++++ b/wine/make_package
+@@ -69,7 +69,7 @@
  dist_basename=wine_gecko-$version-$target_arch$debug
--build_dir=$src_dir/../$dist_basename
-+build_dir=$src_dir/$dist_basename
  
- if [ "$force_build" = "yes" ]
- then
-@@ -223,6 +223,13 @@
+ if [ "$BUILD_DIR" = "" ]; then
+-    build_dir=$src_dir/../$dist_basename
++    build_dir=$src_dir/$dist_basename
+ else
+     build_dir="$BUILD_DIR"
+ fi
+@@ -262,6 +262,13 @@
      then
          WINE=wine
          WINESERVER=wineserver

-- 
Debian Wine Gecko packaging