[pkg-wine-party] [SCM] Debian Wine packaging branch, lenny, updated. wine-1.0.1-1-6-g387418f

[Ove Kaaven]

The following commit has been merged in the lenny branch:
commit 5b0e6ccd24bc59c0e05c779fa8eb206ca7d5f765
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Thu Jan 1 08:09:38 2009 +0100

    Removed fontforge from Build-Depends
    (upstream ships pre-built fonts in the tarball, to work around fontforge bugs).

diff --git a/debian/control b/debian/control
index 661acf7..3ade920 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 5), flex | flex-old, bison,
  libaudio-dev | nas-dev, libesd0-dev, libsane-dev, libusb-dev,
  libcapi20-dev (>= 1:3.3.0.20041024-2) [i386 amd64 powerpc sparc],
  libhal-dev, libdbus-1-dev | dbus-1-dev, libgphoto2-2-dev, liblcms1-dev, libldap2-dev,
- libssl-dev, libxml2-dev, libxslt1-dev, unixodbc-dev, fontforge, prelink [i386 amd64],
+ libssl-dev, libxml2-dev, libxslt1-dev, unixodbc-dev, prelink [i386 amd64],
  dctrl-tools | grep-dctrl, lzma, sharutils,
  gcc-multilib [amd64 kfreebsd-amd64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64],
  ia32-libs (>= 1.19) [amd64 kfreebsd-amd64],
diff --git a/debian/rules b/debian/rules
index 7eef4a1..65fe6b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -281,8 +281,8 @@ ifeq (,$(AMD64_COPY))
 	dh_install -s --list-missing
 
 	# patch marlett.ttf due to fontforge bug #458234
-	mensis -script debian/marlett.mensis debian/libwine/usr/share/wine/fonts/marlett.ttf
-	rm -f debian/libwine/usr/share/wine/fonts/marlett.ttf~
+	#mensis -script debian/marlett.mensis debian/libwine/usr/share/wine/fonts/marlett.ttf
+	#rm -f debian/libwine/usr/share/wine/fonts/marlett.ttf~
 
 	# split up libwine
 ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)

-- 
Debian Wine packaging