--- nspluginwrapper-0.9.91.5.orig/debian/dirs +++ nspluginwrapper-0.9.91.5/debian/dirs @@ -0,0 +1,6 @@ +usr/bin +usr/sbin +usr/lib/nspluginwrapper/plugins +usr/lib/mozilla/plugins +usr/lib/firefox/plugins +usr/lib/iceweasel/plugins --- nspluginwrapper-0.9.91.5.orig/debian/docs +++ nspluginwrapper-0.9.91.5/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- nspluginwrapper-0.9.91.5.orig/debian/control +++ nspluginwrapper-0.9.91.5/debian/control @@ -0,0 +1,19 @@ +Source: nspluginwrapper +Section: universe/utils +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Rob Andrews +Build-Depends: debhelper (>= 5), quilt, autotools-dev, libc6-dev-i386, libxt-dev, x11proto-core-dev, x11proto-xext-dev, libx11-dev, libatk1.0-dev, libfontconfig1-dev, libgtk2.0-dev, libglib2.0-dev, libpango1.0-dev, ia32-libs, gcc-multilib, g++-multilib +Standards-Version: 3.7.2 +Xs-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-dev/nspluginwrapper/ubuntu + +Package: nspluginwrapper +Architecture: amd64 +Depends: ${shlibs:Depends} +Description: A wrapper to run Netscape plugins on other architectures + nspluginwrapper is an Open Source compatibility plugin for Netscape 4 + (NPAPI) plugins. That is, it enables you to use plugins on platforms + they were not built for. + . + This package is built to run i386 plugins, since there are no known + binary-only plugins built for any other architecture. --- nspluginwrapper-0.9.91.5.orig/debian/rules +++ nspluginwrapper-0.9.91.5/debian/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# debian/rules that uses debhelper. + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# quilty comfort +include /usr/share/quilt/quilt.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# Report all warnings, generate debugging symbols (don't worry, we dh_strip) +CFLAGS = -Wall -g + +# Conditional optimmisation +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: patch configure-stamp +configure-stamp: + dh_testdir + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --with-lib32=lib32 \ + --with-lib64=lib \ + --biarch \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="-Wl,-z,defs" + touch $@ + +build: configure build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch $@ + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + -$(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR=$(CURDIR)/debian/nspluginwrapper install + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman debian/nspluginwrapper.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- nspluginwrapper-0.9.91.5.orig/debian/watch +++ nspluginwrapper-0.9.91.5/debian/watch @@ -0,0 +1,8 @@ +# watch control file for uscan +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# +http://gwenole.beauchesne.info/en/projects/nspluginwrapper .*/nspluginwrapper-(.*)\.tar\.bz2 --- nspluginwrapper-0.9.91.5.orig/debian/changelog +++ nspluginwrapper-0.9.91.5/debian/changelog @@ -0,0 +1,176 @@ +nspluginwrapper (0.9.91.5-2ubuntu1) hardy; urgency=low + + [ Stefan Ebner ] + * Merge from Debian unstable. (LP: #196540) Remaining Ubuntu changes: + * debian/control: + - Modify Maintainer value to match Debian-Maintainer-Field Spec + - Removed ia32-libs-gtk and util-linux from depends + - Changed Xs-Vcs-Bzr field to Xs-Vcs-Bzr: + http://code.launchpad.net/~ubuntu-dev/nspluginwrapper/ubuntu + + [ Christopher James Halse Rogers ] + * New Ubuntu changes: + * debian/shlibs.local: + - Drop. We don't have a ia32-libs-gtk package, and the package builds + fine without it. + + -- Christopher James Halse Rogers Tue, 18 Mar 2008 20:22:14 +1100 + +nspluginwrapper (0.9.91.5-2) unstable; urgency=low + + * linux32 is now provided by util-linux, so remove runtime dep on + linux32 (no longer installable) + * Fix issues on SMP by initialising and using gthreads in glib + - patch is 004_fix_threading.diff (Closes: #458584) + * Enable 003_update_help_info.diff, which for some reason I forgot to + put into the quilt series file + * Add a shlibs.local file for ia32-libs-gtk dep generation - in the + absence of a ia32-libs-gtk-dev package, this fixes the FTBFS + Thanks to Dan Callahan (Closes: #462198) + + -- Rob Andrews Mon, 28 Jan 2008 23:27:29 +0000 + +nspluginwrapper (0.9.91.5-1ubuntu1) gutsy; urgency=low + + [ Scott Kitterman ] + * Merge from Debian unstable. Remaining Ubuntu changes: + * debian/control: + - Changed maintainer field to Ubuntu MOTU Developers + + - Moved old maintainer to XSBC-Original-Maintainer: Rob Andrews + + - Removed ia32-libs-gtk from depends + - Changed Xs-Vcs-Bzr field to Xs-Vcs-Bzr: + http://code.launchpad.net/~ubuntu-core-dev/nspluginwrapper/ubuntu + + [ Philipp Kern ] + * debian/control: + - Removed the linux32 dependency; the corresponding binary is + provided by util-linux on Ubuntu. + + -- Philipp Kern Wed, 10 Oct 2007 22:47:28 +0200 + +nspluginwrapper (0.9.91.5-1) unstable; urgency=low + + * New upstream release + * Remove 003_fix_xembed_grab_keys.diff, as 0.9.91.5 fixes this issue + * Remove manual dependencies on ia32-libs, the build-dep covers this + issue + * Add 003_update_help_info.diff, specify that a plugin is needed when + using -u option, also update manpage accordingly (Closes: #436410) + + -- Rob Andrews Sun, 02 Sep 2007 11:38:43 +0100 + +nspluginwrapper (0.9.91.4-4) unstable; urgency=low + + * Change Priority: extra to "optional" + * Add patch 002_install_to_NSPLUGINDIR.patch from Ubuntu + (thanks Alexander Sack) + * Fix XEmbed issue where plugin was able to grab keystrokes + from other applications when browser had lost focus + - patch is 003_fix_xembed_grab_keys.diff + (Closes: #435912) + + -- Rob Andrews Sun, 19 Aug 2007 20:17:33 +0100 + +nspluginwrapper (0.9.91.4-3ubuntu2) gutsy; urgency=low + + * debian/patches/series: enable previously forgotten + 002_install_to_NSPLUGINDIR.patch. + + -- Alexander Sack Fri, 10 Aug 2007 13:27:39 +0200 + +nspluginwrapper (0.9.91.4-3ubuntu1) gutsy; urgency=low + + * debian/patches: added 002_install_to_NSPLUGINDIR.patch + * debian/patches/series: updated as needed + * debian/control: + - Changed maintainer field to Ubuntu MOTU Developers + + - Moved old maintainer to XSBC-Original-Maintainer: Rob Andrews + + - Removed ia32-libs-gtk from depends + - Added ia32-libs to depends + - Added gcc-multilib to build-deps + - Changed Xs-Vcs-Bzr field to Xs-Vcs-Bzr: + http://code.launchpad.net/~ubuntu-core-dev/nspluginwrapper/ubuntu + + [ Alexander Sack ] + * sponsor upload after merging latest changes to bzr. + + -- John Vivirito Mon, 02 Jul 2007 14:30:50 -0400 + +nspluginwrapper (0.9.91.4-3) unstable; urgency=low + + * Shift to using quilt, as it helps me revision control the Debian + packaging with git + * Really should be depending on gcc-multilib, not required yet but may + break build in future + * Add manual dependency on ia32-libs for the target package, since it is + not automatically determined + * Inherit "remove bashisms" patch from Ubuntu, to remove bashisms (oddly + enough!) - patch by Anders Kaseorg + * Add a -n option to the nspluginwrapper commandline to skip creation and + destruction of symlinks - this behaviour is more predictable when + packaging plugins for Debian and derivatives + + -- Rob Andrews Fri, 29 Jun 2007 22:06:02 +0100 + +nspluginwrapper (0.9.91.4-2ubuntu2) gutsy; urgency=low + + * utils/mkruntime.sh: applied anti-bashism patch by Anders + Kaseorg (LP #121066) + + [ Alexander Sack ] + * checked and sponsored upload + + -- John Vivirito Thu, 28 Jun 2007 08:06:24 -0400 + +nspluginwrapper (0.9.91.4-2ubuntu1) gutsy; urgency=low + + [ Alexander Sack ] + * src/npw-config.c: NSPLUGIN_DIR environment can override default + mozilla_system_dir and can specify custom install dir for created + wrapper library. + * debian/control: use MOTU as maintainer; drop ia32-libs-gtk from Depends + (since gutsy provided by ia32-libs). + + -- Alexander Sack Wed, 20 Jun 2007 14:00:05 +0200 + +nspluginwrapper (0.9.91.4-2) unstable; urgency=low + + * Add build dependency on g++-multilib + (Closes: #423131, thanks Pär Andersson) + + -- Rob Andrews Thu, 10 May 2007 12:17:09 -0400 + +nspluginwrapper (0.9.91.4-1) unstable; urgency=low + + * New upstream release + * Install into /usr/lib/nspluginwrapper/plugins and symlink to + browser-specific plugin paths (Closes: #417288) + * (to compliment the above) Remove symlinks to plugins on removal + Only operates on symlinks in global directorys, includes: + /usr/lib/firefox/plugins + /usr/lib/iceweasel/plugins + /usr/lib/mozilla/plugins + * Remove ia64 from the architecture list - there isn't a compiler available + to build i386 binaries on the architecture + * Explicitly set --with-lib32, as otherwise it assumes it to be /usr/lib + * Explicitly set --with-lib64, as otherwise it assumes it to be /usr/lib64 + * Not autoconf/automake, so don't need config.sub/config.guess + + -- Rob Andrews Wed, 11 Apr 2007 19:14:03 +0100 + +nspluginwrapper (0.9.91.3-1) unstable; urgency=low + + * New upstream release + + -- Rob Andrews Mon, 5 Mar 2007 14:44:48 +0000 + +nspluginwrapper (0.9.91.2-1) unstable; urgency=low + + * Initial release (Closes: #410061) + + -- Rob Andrews Wed, 14 Feb 2007 00:12:53 +0000 + --- nspluginwrapper-0.9.91.5.orig/debian/nspluginwrapper.1 +++ nspluginwrapper-0.9.91.5/debian/nspluginwrapper.1 @@ -0,0 +1,61 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NSPLUGINWRAPPER 1 "September 2, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +nspluginwrapper \- tool to manage nspluginwrapper-wrapped plugins +.SH SYNOPSIS +.B nspluginwrapper +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B nspluginwrapper +command. +.PP +\fBnspluginwrapper\fP is a compatibility layer to allow the usage of non-native +plugins in a web browser supporting the Netscape 4 plugin API (NPAPI). +.SH OPTIONS +A summary of options is included below. +.TP +.B \-h +Display help and exit +.TP +.B \-i \fInpPLUGIN.so\fP +Install wrapper for npPLUGIN.so into the mozilla plugins directory +.TP +.B \-r \fI/path/to/npwrapper.npPLUGIN.so\fP +Remove the wrapper for npPLUGIN.so +.TP +.B \-u \fInpPLUGIN.so\fP +Update the plugin wrapper for npPLUGIN.so +.TP +.B \-a +Set automatic mode for plugins discovery - overrides \-i and \-u to automatically determine plugins installed +.TP +.B \-l +List plugins currently installed +.TP +.B \-n +Do not create or remove any Debian browser-specific symlinks upon installation +or removal of plugin wrappers. +.TP +.B \-v +Show verbose messages +.SH AUTHOR +nspluginwrapper was written by Gwenole Beauchesne . +.PP +This manual page was written by Rob Andrews , +for the Debian project (but may be used by others). --- nspluginwrapper-0.9.91.5.orig/debian/compat +++ nspluginwrapper-0.9.91.5/debian/compat @@ -0,0 +1 @@ +5 --- nspluginwrapper-0.9.91.5.orig/debian/README.Debian +++ nspluginwrapper-0.9.91.5/debian/README.Debian @@ -0,0 +1,37 @@ +nspluginwrapper for Debian +-------------------------- + +nspluginwrapper is an RPC-based mechanism for running non-native plugins +built for the Netscape 4 plugin API (NPAPI) on architectures they were +not built for. For example, this allows you to use the Flash plugin for +the i386 architecture on an amd64 machine running a native 64-bit browser. + +It is known to work with Firefox, Iceweasel, Mozilla, Iceape and Konqueror. + +nspluginwrapper for Debian is built exclusively for the amd64 architecture +because the ia32-libs and ia32-libs-gtk packages are not available on other +architectures, and a gcc with target i386 is not available for ia64. Were +these available for, e.g. the PowerPC platform, it would be possible to +package nspluginwrapper for that platform. However, cross-compilers for the +i386 architecture would need to be made available, and this is highly +unlikely. + +Since Debian does not package any binary-only plugins, no automated +mechanism for automated nspluginwrapperisation is provided. Instead, +download the plugin and unpack it to a location where it will remain and +run: + + nspluginwrapper -i /path/to/npplugin.so + +To remove a plugin, run: + + nspluginwrapper -r ~/.mozilla/plugins/npwrapper.npplugin.so + +Alternately, install any plugins as normal into your .mozilla/plugins/ +directory and run: + + nspluginwrapper -a -u -v + +To automatically install any compatibility stubs without prompting. + + -- Rob Andrews Wed, 11 Apr 2007 19:14:03 +0100 --- nspluginwrapper-0.9.91.5.orig/debian/patches/000_debian_make_symlinks.diff +++ nspluginwrapper-0.9.91.5/debian/patches/000_debian_make_symlinks.diff @@ -0,0 +1,158 @@ +Create the plugin wrapper in a global location and install a symlink into +the browser-specific plugin paths when installing globally. +Also removes the symlinks on uninstallation. + +Commandline option "-n" or "--nosymlink" doesn't perform any operations on +symlinks on installation and removal. + + -- Rob Andrews Fri, 29 Jun 2007 21:59:49 +0100 + +--- nspluginwrapper-0.9.91.4.orig/src/npw-config.c ++++ nspluginwrapper-0.9.91.4/src/npw-config.c +@@ -43,6 +43,17 @@ + static bool g_verbose = false; + static const char NPW_CONFIG[] = "nspluginwrapper"; + ++/* On Debian systems, we install/remove symlinks from these paths. ++ * This information is used twice, so declare globally */ ++static bool g_dosymlink = true; ++static const char *debian_link_dirs[] = { ++ LIBDIR "/mozilla/plugins", ++ LIBDIR "/firefox/plugins", ++ LIBDIR "/iceweasel/plugins", ++ NULL, /* if this isn't here, it reads into whatever data is in memory after ++ possibly differing in behaviour to the same code in functions */ ++}; ++ + static void error(const char *format, ...) + { + va_list args; +@@ -152,7 +163,7 @@ + } + else if (access("/etc/debian_version", F_OK) == 0) { + static const char *debian_dirs[] = { +- "/usr/lib/mozilla/plugins", // XXX how unfortunate ++ LIBDIR "/nspluginwrapper/plugins", + }; + dirs = debian_dirs; + } +@@ -803,6 +814,49 @@ + printf(" into %s\n", d_plugin_path); + + free(plugin_data); ++ ++ /* Install symlinks on Debian systems */ ++ if (is_system_wide_wrapper_plugin(plugin_path) ++ && (access("/etc/debian_version", F_OK) == 0) ++ && (g_dosymlink == true)) ++ { ++ static const char *ldir = NULL; ++ const char **ldirs = NULL; ++ char *lname = NULL; ++ ++ ldirs = debian_link_dirs; ++ ++ while ((ldir = *ldirs++) != NULL) ++ { ++ if (access(ldir, F_OK) == 0) ++ { ++ /* Can write to this directory, make a symlink in it */ ++ if (g_verbose) ++ printf("And create symlink to plugin in %s: ", ldir); ++ ++ if ((lname = malloc(strlen(ldir) + strlen(NPW_WRAPPER_BASE) + strlen(plugin_base) + 3)) != NULL) ++ { ++ sprintf(lname, "%s/%s.%s", ldir, NPW_WRAPPER_BASE, plugin_base); ++ ++ if (symlink(d_plugin_path, lname) == 0) ++ { ++ if (g_verbose) ++ printf("done.\n"); ++ } ++ else ++ { ++ if (g_verbose) ++ printf("failed!\n"); ++ } ++ ++ free(lname); ++ } ++ else ++ if (g_verbose) ++ printf("*gulp* malloc() failed!\n"); ++ } ++ } ++ } + return 0; + } + +@@ -859,6 +913,48 @@ + if (unlink(plugin_path) < 0) + return 1; + ++ /* Remove links to the plugin on Debian systems */ ++ if ((access("/etc/debian_version", F_OK) == 0) && (g_dosymlink == true)) ++ { ++ static const char *ldir = NULL; ++ const char **ldirs = NULL; ++ char *lname = NULL; ++ char *plugin_base = strrchr(plugin_path, '/'); ++ char *lbuf = NULL; ++ ++ if (plugin_base == NULL) ++ return 1; ++ else ++ plugin_base++; ++ ++ ldirs = debian_link_dirs; ++ ++ while ((ldir = *ldirs++) != NULL) ++ { ++ if ((lname = malloc(strlen(ldir) + strlen(plugin_base) + 2)) == NULL) ++ return 1; ++ ++ sprintf(lname, "%s/%s", ldir, plugin_base); ++ lbuf = malloc(strlen(plugin_path) + 1); ++ ++ if (readlink(lname, lbuf, strlen(plugin_path)) > 0) ++ { ++ /* readlink doesn't null terminate */ ++ *(lbuf + strlen(plugin_path)) = 0; ++ ++ if (strcmp(lbuf, plugin_path) == 0) ++ { ++ unlink(lname); ++ if (g_verbose) ++ printf("Deleted symlink '%s' to this plugin.\n", lname); ++ } ++ } ++ ++ free(lname); ++ free(lbuf); ++ } ++ } ++ + return 0; + } + +@@ -986,6 +1082,12 @@ + return 0; + } + ++static int process_nolink(int argc, char *argv[]) ++{ ++ g_dosymlink = false; ++ return 0; ++} ++ + static int process_list(int argvc, char *argv[]) + { + const char **plugin_dirs = get_mozilla_plugin_dirs(); +@@ -1104,6 +1206,7 @@ + { 'v', "verbose", process_verbose, 0 }, + { 'a', "auto", process_auto, 0 }, + { 'l', "list", process_list, 1 }, ++ { 'n', "nosymlinks", process_nolink, 0 }, + { 'u', "update", process_update, 1 }, + { 'i', "install", process_install, 1 }, + { 'r', "remove", process_remove, 1 }, --- nspluginwrapper-0.9.91.5.orig/debian/patches/004_fix_threading.diff +++ nspluginwrapper-0.9.91.5/debian/patches/004_fix_threading.diff @@ -0,0 +1,29 @@ +Patch from svn r480, fixes SMP breakage. + + -- Rob Andrews Sat, 26 Jan 2008 03:01:31 +0000 + +Index: trunk/src/npw-viewer.c +=================================================================== +--- trunk/src/npw-viewer.c (revision 479) ++++ trunk/src/npw-viewer.c (revision 480) +@@ -3006,6 +3006,7 @@ + XtToolkitInitialize(); + x_app_context = XtCreateApplicationContext(); + x_display = XtOpenDisplay(x_app_context, NULL, "npw-viewer", "npw-viewer", NULL, 0, &argc, argv); ++ g_thread_init(NULL); + gtk_init(&argc, &argv); + + // Initialize RPC communication channel +Index: trunk/Makefile +=================================================================== +--- trunk/Makefile (revision 479) ++++ trunk/Makefile (revision 480) +@@ -101,7 +101,7 @@ + npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 + npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 + npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) +-npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt ++npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lX11 -lXt + else + npviewer_CFLAGS += $(GTK_CFLAGS) + npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS) --- nspluginwrapper-0.9.91.5.orig/debian/patches/series +++ nspluginwrapper-0.9.91.5/debian/patches/series @@ -0,0 +1,5 @@ +000_debian_make_symlinks.diff +001_remove_bashisms.diff +002_install_to_NSPLUGINDIR.diff +003_update_help_info.diff +004_fix_threading.diff --- nspluginwrapper-0.9.91.5.orig/debian/patches/001_remove_bashisms.diff +++ nspluginwrapper-0.9.91.5/debian/patches/001_remove_bashisms.diff @@ -0,0 +1,26 @@ +Anti-bashism patch inherited from Ubuntu. +Author: Anders Kaseorg + + -- Rob Andrews Thu, 28 Jun 2007 18:08:54 +0100 + +--- nspluginwrapper-0.9.91.4.orig/utils/mkruntime.sh ++++ nspluginwrapper-0.9.91.4/utils/mkruntime.sh +@@ -12,15 +12,15 @@ + # - Check acroread5, something is missing while loading a PDF + # - Enough for Flash Player & PluginSDK npsimple.so + +-function error() { ++error() { + echo ${1+"$@"} > /dev/stderr + } + +-function status() { ++status() { + echo ${1+"$@"} > /dev/stderr + } + +-function run() { ++run() { + status " " ${1+"$@"} + ${1+"$@"} + } --- nspluginwrapper-0.9.91.5.orig/debian/patches/002_install_to_NSPLUGINDIR.diff +++ nspluginwrapper-0.9.91.5/debian/patches/002_install_to_NSPLUGINDIR.diff @@ -0,0 +1,20 @@ +Allow plugins to be installed to a directory specified by environment +variable NSPLUGIN_DIR. + +Patch from Alexander Sack. + + -- Rob Andrews Sat, 14 Jul 2007 18:45:00 +0100 + +--- nspluginwrapper-0.9.91.4.orig/src/npw-config.c 2007-07-06 08:48:43 +0000 ++++ nspluginwrapper-0.9.91.4/src/npw-config.c 2007-07-06 10:15:01 +0000 +@@ -113,6 +113,10 @@ + static const char default_dir[] = LIBDIR "/mozilla/plugins"; + static const char *dir = NULL; + ++ char *plugin_dir = getenv("NSPLUGIN_DIR"); ++ if(plugin_dir) ++ return plugin_dir; ++ + if (dir == NULL) { + const char **dirs = NULL; + --- nspluginwrapper-0.9.91.5.orig/debian/patches/003_update_help_info.diff +++ nspluginwrapper-0.9.91.5/debian/patches/003_update_help_info.diff @@ -0,0 +1,15 @@ +Fix the abstract for the '-u' option. + + -- Rob Andrews Sun, 02 Sep 2007 11:58:27 +0100 + +--- nspluginwrapper/src/npw-config.c.orig 2007-09-02 11:32:32.000000000 +0100 ++++ nspluginwrapper/src/npw-config.c 2007-09-02 11:32:50.000000000 +0100 +@@ -921,7 +921,7 @@ + printf(" -v --verbose flag: set verbose mode\n"); + printf(" -a --auto flag: set automatic mode for plugins discovery\n"); + printf(" -l --list list plugins currently installed\n"); +- printf(" -u --update update plugin(s) currently installed\n"); ++ printf(" -u --update [FILE(S)] update plugin(s) currently installed\n"); + printf(" -i --install [FILE(S)] install plugin(s)\n"); + printf(" -r --remove [FILE(S)] remove plugin(s)\n"); + printf("\n"); --- nspluginwrapper-0.9.91.5.orig/debian/copyright +++ nspluginwrapper-0.9.91.5/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Rob Andrews on +Wed, 14 Feb 2007 00:12:53 +0000. + +It was downloaded from http://gwenole.beauchesne.info/en/projects/nspluginwrapper + +Upstream Author: Gwenole Beauchesne + +Copyright: 2006 Gwenole Beauchesne + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See /usr/share/common-licenses/GPL-2 on your debian system. + +The Debian packaging is (C) 2007, Rob Andrews and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.