tags 364379 + patch pending thanks I changed the build-dep to libxul-dev and made some minor fixes. The package builds fine in i386 and is lintian clean now.
The interdiff of the NMU is attached.
--
~ Kanru Chen <[EMAIL PROTECTED]>
'v' http://stu.csie.ncnu.edu.tw/~kanru.96/
// \\ GnuPG-Key ID: 365CC7A2
/( )\ Fingerprint: 3278 DFB4 BB28 6E8C 9E1F 1ECB B1B7 5B5F 365C C7A2
^`~'^
diff -u pcmanx-gtk2-0.3.4/debian/control pcmanx-gtk2-0.3.4/debian/control
--- pcmanx-gtk2-0.3.4/debian/control
+++ pcmanx-gtk2-0.3.4/debian/control
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Emfox Zhou <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libxft-dev, libgtk2.0-dev,
mozilla-dev, sharutils, dpatch (>= 2.0)
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libxft-dev, libgtk2.0-dev,
libxul-dev, libxt-dev, sharutils, dpatch (>= 2.0)
+Standards-Version: 3.7.2
Package: pcmanx-gtk2
Architecture: any
@@ -25,7 +25,7 @@
Section: web
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: mozilla-browser | mozilla-firefox
+Recommends: mozilla-browser | firefox
Description: pcmanx plugin for Mozilla based browser
This plugin adds support for telnet:// protocol to your Mozilla
browser. The protocol engine is done by PCManX and the output window
diff -u pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.dirs
pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.dirs
--- pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.dirs
+++ pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.dirs
@@ -3,2 +3,2 @@
-usr/lib/mozilla/plugins
-usr/lib/mozilla/components
+usr/lib/pcmanx-gtk2/plugins
+usr/lib/pcmanx-gtk2/components
diff -u pcmanx-gtk2-0.3.4/debian/changelog pcmanx-gtk2-0.3.4/debian/changelog
--- pcmanx-gtk2-0.3.4/debian/changelog
+++ pcmanx-gtk2-0.3.4/debian/changelog
@@ -1,3 +1,16 @@
+pcmanx-gtk2 (0.3.4-1.1) unstable; urgency=medium
+
+ Set urgency to medium as it fixes a RC bug.
+
+ * Non-maintainer upload.
+ * Remove image file from usr/lib.
+ * Build depends on xulrunner. (Closes: #364379)
+ - Add LDFLAGS="-Wl,--as-needed" to prevent linking to librarys from
+ libxul-dev.
+ * Bump standards version to 3.7.2, no changes needed.
+
+ -- Kanru Chen <[EMAIL PROTECTED]> Sat, 5 Aug 2006 13:24:10 +0800
+
pcmanx-gtk2 (0.3.4-1) unstable; urgency=low
* New upstream release
diff -u pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.links
pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.links
--- pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.links
+++ pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.links
@@ -1,5 +1,5 @@
-usr/lib/mozilla/plugins/pcmanx-plugin.so
usr/lib/mozilla-firefox/plugins/pcmanx-plugin.so
-usr/lib/mozilla/components/pcmanx.html
usr/lib/mozilla-firefox/components/pcmanx.html
-usr/lib/mozilla/components/pcmanx.png
usr/lib/mozilla-firefox/components/pcmanx.png
-usr/lib/mozilla/components/TelnetProtocol.js
usr/lib/mozilla-firefox/components/TelnetProtocol.js
-usr/lib/mozilla/components/pcmanx_interface.xpt
usr/lib/mozilla-firefox/components/pcmanx_interface.xpt
+usr/lib/pcmanx-gtk2/plugins/pcmanx-plugin.so
usr/lib/firefox/plugins/pcmanx-plugin.so
+usr/lib/pcmanx-gtk2/components/pcmanx.html
usr/lib/firefox/components/pcmanx.html
+usr/lib/pcmanx-gtk2/components/pcmanx.png usr/lib/firefox/components/pcmanx.png
+usr/lib/pcmanx-gtk2/components/TelnetProtocol.js
usr/lib/firefox/components/TelnetProtocol.js
+usr/lib/pcmanx-gtk2/components/pcmanx_interface.xpt
usr/lib/firefox/components/pcmanx_interface.xpt
diff -u pcmanx-gtk2-0.3.4/debian/rules pcmanx-gtk2-0.3.4/debian/rules
--- pcmanx-gtk2-0.3.4/debian/rules
+++ pcmanx-gtk2-0.3.4/debian/rules
@@ -15,6 +15,7 @@
include /usr/share/dpatch/dpatch.make
CXXFLAGS = -Wall -g
+LDFLAGS += -Wl,--as-needed
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -O0
@@ -25,7 +26,7 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) \
+ CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info \
--enable-plugin
@@ -59,6 +60,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
binary-indep: build install
@@ -74,7 +76,7 @@
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -V -Xmozilla
+ dh_makeshlibs -V -Xfirefox
dh_installdeb
dh_shlibdeps -L libpcmanx-core0 -l debian/libpcmanx-core0/usr/lib
dh_gencontrol
diff -u pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.install
pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.install
--- pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.install
+++ pcmanx-gtk2-0.3.4/debian/mozilla-plugin-pcmanx.install
@@ -1,2 +1,2 @@
-usr/lib/mozilla/plugins
-usr/lib/mozilla/components
+usr/lib/xulrunner/plugins usr/lib/pcmanx-gtk2
+usr/lib/xulrunner/components usr/lib/pcmanx-gtk2
only in patch2:
unchanged:
--- pcmanx-gtk2-0.3.4.orig/debian/patches/use_xulrunner.dpatch
+++ pcmanx-gtk2-0.3.4/debian/patches/use_xulrunner.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_xulrunner.dpatch by Kanru Chen <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad pcmanx-gtk2-0.3.4~/configure pcmanx-gtk2-0.3.4/configure
+--- pcmanx-gtk2-0.3.4~/configure 2006-08-01 01:19:50.000000000 +0800
++++ pcmanx-gtk2-0.3.4/configure 2006-08-01 01:22:31.000000000 +0800
+@@ -24145,7 +24145,7 @@
+ if test "$plugin" = "yes"; then
+ echo "$as_me:$LINENO: checking for Mozilla support" >&5
+ echo $ECHO_N "checking for Mozilla support... $ECHO_C" >&6
+- gecko_provider=mozilla
++ gecko_provider=xulrunner
+ user_specified_mozilla=no
+
+ if test ! -z "$INPUT_MOZILLA_ROOT"; then
only in patch2:
unchanged:
--- pcmanx-gtk2-0.3.4.orig/debian/patches/00list
+++ pcmanx-gtk2-0.3.4/debian/patches/00list
@@ -0,0 +1,2 @@
+use_xulrunner.dpatch
+remove_image_file_in_usr_lib.dpatch
only in patch2:
unchanged:
--- pcmanx-gtk2-0.3.4.orig/debian/patches/remove_image_file_in_usr_lib.dpatch
+++ pcmanx-gtk2-0.3.4/debian/patches/remove_image_file_in_usr_lib.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_image_file_in_usr_lib.dpatch by Kanru Chen <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad pcmanx-gtk2-0.3.4~/plugin/data/pcmanx.html
pcmanx-gtk2-0.3.4/plugin/data/pcmanx.html
+--- pcmanx-gtk2-0.3.4~/plugin/data/pcmanx.html 2006-03-13 13:48:03.000000000
+0800
++++ pcmanx-gtk2-0.3.4/plugin/data/pcmanx.html 2006-08-01 01:58:13.000000000
+0800
+@@ -2,7 +2,7 @@
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=big5" />
+ <title>PCMan</title>
+-<link rel="shortcut icon" href="pcmanx.png" type="image/png">
++<link rel="shortcut icon" href="file:///usr/share/pixmaps/pcmanx.png"
type="image/png">
+ </head>
+ <script language="javascript">
+ function autoConnect(){
signature.asc
Description: Digital signature
