tag 480824 + patch thanks On Mon, May 12, 2008 at 04:02:32PM +0800, [EMAIL PROTECTED] wrote: > I'm busy recently and have not enough time to dig into this issue, > please, feel free to NMU. > Thanks.
Here is the patch to implement the change. Please upload a new package with the patch applied ASAP, if you have enought time for this. Without action from your part within the next week, I'll upload a NMU. Thanks, Mike
diff -u pcmanx-gtk2-0.3.7/debian/patches/00list pcmanx-gtk2-0.3.7/debian/patches/00list --- pcmanx-gtk2-0.3.7/debian/patches/00list +++ pcmanx-gtk2-0.3.7/debian/patches/00list @@ -4,0 +5 @@ +iceape-dev.dpatch diff -u pcmanx-gtk2-0.3.7/debian/mozilla-plugin-pcmanx.install pcmanx-gtk2-0.3.7/debian/mozilla-plugin-pcmanx.install --- pcmanx-gtk2-0.3.7/debian/mozilla-plugin-pcmanx.install +++ pcmanx-gtk2-0.3.7/debian/mozilla-plugin-pcmanx.install @@ -1,2 +1,2 @@ -usr/lib/xulrunner/plugins usr/lib/pcmanx-gtk2 -usr/lib/xulrunner/components usr/lib/pcmanx-gtk2 +usr/lib/iceape/plugins usr/lib/pcmanx-gtk2 +usr/lib/iceape/components usr/lib/pcmanx-gtk2 diff -u pcmanx-gtk2-0.3.7/debian/rules pcmanx-gtk2-0.3.7/debian/rules --- pcmanx-gtk2-0.3.7/debian/rules +++ pcmanx-gtk2-0.3.7/debian/rules @@ -61,7 +61,7 @@ # Add here commands to install the package into debian/pcmanx-gtk2. $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp install -m 644 debian/pcmanx.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/ - rm $(CURDIR)/debian/tmp/usr/lib/xulrunner/components/pcmanx.png + rm $(CURDIR)/debian/tmp/usr/lib/iceape/components/pcmanx.png binary-indep: build install diff -u pcmanx-gtk2-0.3.7/debian/control pcmanx-gtk2-0.3.7/debian/control --- pcmanx-gtk2-0.3.7/debian/control +++ pcmanx-gtk2-0.3.7/debian/control @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Emfox Zhou <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), libxft-dev, libgtk2.0-dev, libxul-dev, libx11-dev, libxt-dev, sharutils, dpatch (>= 2.0) +Build-Depends: debhelper (>= 4.0.0), libxft-dev, libgtk2.0-dev, iceape-dev (>= 1.1.9-5), libx11-dev, libxt-dev, sharutils, dpatch (>= 2.0) Standards-Version: 3.7.3 Homepage: http://pcmanx.csie.net/ only in patch2: unchanged: --- pcmanx-gtk2-0.3.7.orig/debian/patches/iceape-dev.dpatch +++ pcmanx-gtk2-0.3.7/debian/patches/iceape-dev.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## iceape-dev.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow to build against iceape-dev + [EMAIL PROTECTED]@ + +--- pcmanx-gtk2-0.3.7.orig/configure.ac ++++ pcmanx-gtk2-0.3.7/configure.ac +@@ -404,7 +404,7 @@ + + # Check Firefox-plugin + if test "x$enable_mozilla" = "xno"; then +- gecko_provider=firefox-plugin ++ gecko_provider=iceape + PKG_CHECK_MODULES(MOZILLA, $gecko_provider-plugin, + enable_mozilla=yes, enable_mozilla=no) + fi +--- pcmanx-gtk2-0.3.7.orig/configure ++++ pcmanx-gtk2-0.3.7/configure +@@ -26885,7 +26885,7 @@ + + # Check Firefox-plugin + if test "x$enable_mozilla" = "xno"; then +- gecko_provider=firefox-plugin ++ gecko_provider=iceape + + pkg_failed=no + { echo "$as_me:$LINENO: checking for MOZILLA" >&5
