nspluginwrapper

Merge lp:~jazzva/nspluginwrapper/ubuntu.1.2.2-0ubuntu2 into lp:nspluginwrapper

  1. ubuntu.1.2.2-0ubuntu2
  2. Merge into ubuntu
Proposed by Saša Bodiroža
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jazzva/nspluginwrapper/ubuntu.1.2.2-0ubuntu2
Merge into: lp:nspluginwrapper
Diff against target: None lines
To merge this branch: bzr merge lp:~jazzva/nspluginwrapper/ubuntu.1.2.2-0ubuntu2
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+4685@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Saša Bodiroža (jazzva) wrote :

Contains the fix for the bug #321814

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-01-02 10:21:22 +0000
+++ debian/changelog 2009-03-19 20:51:41 +0000
@@ -1,3 +1,12 @@
1nspluginwrapper (1.2.2-0ubuntu2) jaunty; urgency=low
2
3 * Remove Iceweasel dir from debian/patches/000_debian_make_symlinks.diff
4 * Update patch debian/patches/002_install_to_NSPLUGINDIR.diff to not install
5 wrappers in default paths if NSPLUGIN_DIR is specified (LP: #321814)
6 * Refresh patches
7
8 -- Sasa Bodiroza <jazzva@gmail.com> Thu, 19 Mar 2009 21:42:35 +0100
9
1nspluginwrapper (1.2.2-0ubuntu1) jaunty; urgency=low10nspluginwrapper (1.2.2-0ubuntu1) jaunty; urgency=low
211
3 * New upstream release 1.2.212 * New upstream release 1.2.2
413
=== modified file 'debian/patches/000_debian_make_symlinks.diff'
--- debian/patches/000_debian_make_symlinks.diff 2008-12-27 02:24:23 +0000
+++ debian/patches/000_debian_make_symlinks.diff 2009-03-07 17:43:52 +0000
@@ -7,11 +7,11 @@
77
8 -- Rob Andrews <rob@choralone.org> Fri, 29 Jun 2007 21:59:49 +01008 -- Rob Andrews <rob@choralone.org> Fri, 29 Jun 2007 21:59:49 +0100
99
10Index: ubuntu.1.2.0-0ubuntu1/src/npw-config.c10Index: ubuntu.1.2.2-0ubuntu1/src/npw-config.c
11===================================================================11===================================================================
12--- ubuntu.1.2.0-0ubuntu1.orig/src/npw-config.c 2008-12-27 03:11:39.000000000 +010012--- ubuntu.1.2.2-0ubuntu1.orig/src/npw-config.c 2009-01-03 16:26:07.000000000 +0100
13+++ ubuntu.1.2.0-0ubuntu1/src/npw-config.c 2008-12-27 03:22:58.000000000 +010013+++ ubuntu.1.2.2-0ubuntu1/src/npw-config.c 2009-03-07 18:38:14.000000000 +0100
14@@ -44,6 +44,17 @@14@@ -44,6 +44,16 @@
15 static bool g_allow_native = false;15 static bool g_allow_native = false;
16 static const char NPW_CONFIG[] = "nspluginwrapper";16 static const char NPW_CONFIG[] = "nspluginwrapper";
17 17
@@ -21,7 +21,6 @@
21+static const char *debian_link_dirs[] = {21+static const char *debian_link_dirs[] = {
22+ LIBDIR "/mozilla/plugins",22+ LIBDIR "/mozilla/plugins",
23+ LIBDIR "/firefox/plugins",23+ LIBDIR "/firefox/plugins",
24+ LIBDIR "/iceweasel/plugins",
25+ NULL, /* if this isn't here, it reads into whatever data is in memory after24+ NULL, /* if this isn't here, it reads into whatever data is in memory after
26+ possibly differing in behaviour to the same code in functions */25+ possibly differing in behaviour to the same code in functions */
27+};26+};
@@ -29,7 +28,7 @@
29 static void error(const char *format, ...)28 static void error(const char *format, ...)
30 {29 {
31 va_list args;30 va_list args;
32@@ -161,7 +172,7 @@31@@ -161,7 +171,7 @@
33 }32 }
34 else if (access("/etc/debian_version", F_OK) == 0) {33 else if (access("/etc/debian_version", F_OK) == 0) {
35 static const char *debian_dirs[] = {34 static const char *debian_dirs[] = {
@@ -38,7 +37,7 @@
38 };37 };
39 dirs = debian_dirs;38 dirs = debian_dirs;
40 }39 }
41@@ -812,6 +823,49 @@40@@ -812,6 +822,49 @@
42 printf(" into %s\n", d_plugin_path);41 printf(" into %s\n", d_plugin_path);
43 42
44 free(plugin_data);43 free(plugin_data);
@@ -88,7 +87,7 @@
88 return 0;87 return 0;
89 }88 }
90 89
91@@ -871,6 +925,48 @@90@@ -871,6 +924,48 @@
92 if (unlink(plugin_path) < 0)91 if (unlink(plugin_path) < 0)
93 return 1;92 return 1;
94 93
@@ -137,7 +136,7 @@
137 return 0;136 return 0;
138 }137 }
139 138
140@@ -1033,6 +1129,12 @@139@@ -1033,6 +1128,12 @@
141 return 0;140 return 0;
142 }141 }
143 142
@@ -150,7 +149,7 @@
150 static int process_list(int argvc, char *argv[])149 static int process_list(int argvc, char *argv[])
151 {150 {
152 const char **plugin_dirs = get_mozilla_plugin_dirs();151 const char **plugin_dirs = get_mozilla_plugin_dirs();
153@@ -1152,6 +1254,7 @@152@@ -1152,6 +1253,7 @@
154 { 'a', "auto", process_auto, 0 },153 { 'a', "auto", process_auto, 0 },
155 { 'n', "native", process_native, 0 },154 { 'n', "native", process_native, 0 },
156 { 'l', "list", process_list, 1 },155 { 'l', "list", process_list, 1 },
157156
=== modified file 'debian/patches/001_remove_bashisms.diff'
--- debian/patches/001_remove_bashisms.diff 2008-12-27 02:24:23 +0000
+++ debian/patches/001_remove_bashisms.diff 2009-03-07 17:43:52 +0000
@@ -3,10 +3,10 @@
33
4 -- Rob Andrews <rob@choralone.org> Thu, 28 Jun 2007 18:08:54 +01004 -- Rob Andrews <rob@choralone.org> Thu, 28 Jun 2007 18:08:54 +0100
55
6Index: ubuntu.1.2.0-0ubuntu1/utils/mkruntime.sh6Index: ubuntu.1.2.2-0ubuntu1/utils/mkruntime.sh
7===================================================================7===================================================================
8--- ubuntu.1.2.0-0ubuntu1.orig/utils/mkruntime.sh 2008-12-27 03:11:07.000000000 +01008--- ubuntu.1.2.2-0ubuntu1.orig/utils/mkruntime.sh 2009-01-02 11:19:18.000000000 +0100
9+++ ubuntu.1.2.0-0ubuntu1/utils/mkruntime.sh 2008-12-27 03:23:05.000000000 +01009+++ ubuntu.1.2.2-0ubuntu1/utils/mkruntime.sh 2009-03-07 18:38:19.000000000 +0100
10@@ -12,15 +12,15 @@10@@ -12,15 +12,15 @@
11 # - Check acroread5, something is missing while loading a PDF11 # - Check acroread5, something is missing while loading a PDF
12 # - Enough for Flash Player & PluginSDK npsimple.so12 # - Enough for Flash Player & PluginSDK npsimple.so
1313
=== modified file 'debian/patches/002_install_to_NSPLUGINDIR.diff'
--- debian/patches/002_install_to_NSPLUGINDIR.diff 2008-12-27 02:24:23 +0000
+++ debian/patches/002_install_to_NSPLUGINDIR.diff 2009-03-19 20:47:09 +0000
@@ -5,11 +5,11 @@
55
6 -- Rob Andrews <rob@choralone.org> Sat, 14 Jul 2007 18:45:00 +01006 -- Rob Andrews <rob@choralone.org> Sat, 14 Jul 2007 18:45:00 +0100
77
8Index: ubuntu.1.2.0-0ubuntu1/src/npw-config.c8Index: ubuntu.1.2.2-0ubuntu2/src/npw-config.c
9===================================================================9===================================================================
10--- ubuntu.1.2.0-0ubuntu1.orig/src/npw-config.c 2008-12-27 03:22:58.000000000 +010010--- ubuntu.1.2.2-0ubuntu2.orig/src/npw-config.c 2009-03-19 21:33:48.000000000 +0100
11+++ ubuntu.1.2.0-0ubuntu1/src/npw-config.c 2008-12-27 03:23:13.000000000 +010011+++ ubuntu.1.2.2-0ubuntu2/src/npw-config.c 2009-03-19 21:34:02.000000000 +0100
12@@ -125,6 +125,10 @@12@@ -124,6 +124,10 @@
13 static const char default_dir[] = LIBDIR "/mozilla/plugins";13 static const char default_dir[] = LIBDIR "/mozilla/plugins";
14 static const char *dir = NULL;14 static const char *dir = NULL;
15 15
@@ -20,3 +20,13 @@
20 if (dir == NULL) {20 if (dir == NULL) {
21 const char **dirs = NULL;21 const char **dirs = NULL;
22 22
23@@ -826,7 +830,8 @@
24 /* Install symlinks on Debian systems */
25 if (has_system_wide_wrapper_plugin(plugin_path, true)
26 && (access("/etc/debian_version", F_OK) == 0)
27- && (g_dosymlink == true))
28+ && (g_dosymlink == true)
29+ && (getenv("NSPLUGIN_DIR") == NULL))
30 {
31 static const char *ldir = NULL;
32 const char **ldirs = NULL;
2333
=== modified file 'debian/patches/003_update_help_info.diff'
--- debian/patches/003_update_help_info.diff 2008-12-27 02:24:23 +0000
+++ debian/patches/003_update_help_info.diff 2009-03-07 17:43:52 +0000
@@ -2,11 +2,11 @@
22
3 -- Rob Andrews <rob@choralone.org> Sun, 02 Sep 2007 11:58:27 +01003 -- Rob Andrews <rob@choralone.org> Sun, 02 Sep 2007 11:58:27 +0100
44
5Index: ubuntu.1.2.0-0ubuntu1/src/npw-config.c5Index: ubuntu.1.2.2-0ubuntu1/src/npw-config.c
6===================================================================6===================================================================
7--- ubuntu.1.2.0-0ubuntu1.orig/src/npw-config.c 2008-12-27 03:23:13.000000000 +01007--- ubuntu.1.2.2-0ubuntu1.orig/src/npw-config.c 2009-03-07 18:38:23.000000000 +0100
8+++ ubuntu.1.2.0-0ubuntu1/src/npw-config.c 2008-12-27 03:23:22.000000000 +01008+++ ubuntu.1.2.2-0ubuntu1/src/npw-config.c 2009-03-07 18:38:28.000000000 +0100
9@@ -1103,7 +1103,7 @@9@@ -1102,7 +1102,7 @@
10 printf(" -a --auto flag: set automatic mode for plugins discovery\n");10 printf(" -a --auto flag: set automatic mode for plugins discovery\n");
11 printf(" -n --native flag: allow native plugin(s) to be wrapped\n");11 printf(" -n --native flag: allow native plugin(s) to be wrapped\n");
12 printf(" -l --list list plugins currently installed\n");12 printf(" -l --list list plugins currently installed\n");
1313
=== modified file 'debian/patches/004_fix_threading.diff'
--- debian/patches/004_fix_threading.diff 2008-12-27 02:24:23 +0000
+++ debian/patches/004_fix_threading.diff 2009-03-07 17:43:52 +0000
@@ -2,10 +2,10 @@
22
3 -- Rob Andrews <rob@choralone.org> Sat, 26 Jan 2008 03:01:31 +00003 -- Rob Andrews <rob@choralone.org> Sat, 26 Jan 2008 03:01:31 +0000
44
5Index: ubuntu.1.2.0-0ubuntu1/Makefile5Index: ubuntu.1.2.2-0ubuntu1/Makefile
6===================================================================6===================================================================
7--- ubuntu.1.2.0-0ubuntu1.orig/Makefile 2008-12-27 03:11:39.000000000 +01007--- ubuntu.1.2.2-0ubuntu1.orig/Makefile 2009-01-02 11:19:18.000000000 +0100
8+++ ubuntu.1.2.0-0ubuntu1/Makefile 2008-12-27 03:23:31.000000000 +01008+++ ubuntu.1.2.2-0ubuntu1/Makefile 2009-03-07 18:38:33.000000000 +0100
9@@ -120,7 +120,7 @@9@@ -120,7 +120,7 @@
10 npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.010 npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
11 npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.011 npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0

Subscribers

People subscribed via source and target branches

to all changes: