nspluginwrapper

Merge lp://staging/~jazzva/nspluginwrapper/ubuntu.1.2.2-0ubuntu2 into lp://staging/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://staging/~jazzva/nspluginwrapper/ubuntu.1.2.2-0ubuntu2
Merge into: lp://staging/nspluginwrapper
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~jazzva/nspluginwrapper/ubuntu.1.2.2-0ubuntu2
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+4685@code.staging.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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-01-02 10:21:22 +0000
3+++ debian/changelog 2009-03-19 20:51:41 +0000
4@@ -1,3 +1,12 @@
5+nspluginwrapper (1.2.2-0ubuntu2) jaunty; urgency=low
6+
7+ * Remove Iceweasel dir from debian/patches/000_debian_make_symlinks.diff
8+ * Update patch debian/patches/002_install_to_NSPLUGINDIR.diff to not install
9+ wrappers in default paths if NSPLUGIN_DIR is specified (LP: #321814)
10+ * Refresh patches
11+
12+ -- Sasa Bodiroza <jazzva@gmail.com> Thu, 19 Mar 2009 21:42:35 +0100
13+
14 nspluginwrapper (1.2.2-0ubuntu1) jaunty; urgency=low
15
16 * New upstream release 1.2.2
17
18=== modified file 'debian/patches/000_debian_make_symlinks.diff'
19--- debian/patches/000_debian_make_symlinks.diff 2008-12-27 02:24:23 +0000
20+++ debian/patches/000_debian_make_symlinks.diff 2009-03-07 17:43:52 +0000
21@@ -7,11 +7,11 @@
22
23 -- Rob Andrews <rob@choralone.org> Fri, 29 Jun 2007 21:59:49 +0100
24
25-Index: ubuntu.1.2.0-0ubuntu1/src/npw-config.c
26+Index: ubuntu.1.2.2-0ubuntu1/src/npw-config.c
27 ===================================================================
28---- ubuntu.1.2.0-0ubuntu1.orig/src/npw-config.c 2008-12-27 03:11:39.000000000 +0100
29-+++ ubuntu.1.2.0-0ubuntu1/src/npw-config.c 2008-12-27 03:22:58.000000000 +0100
30-@@ -44,6 +44,17 @@
31+--- ubuntu.1.2.2-0ubuntu1.orig/src/npw-config.c 2009-01-03 16:26:07.000000000 +0100
32++++ ubuntu.1.2.2-0ubuntu1/src/npw-config.c 2009-03-07 18:38:14.000000000 +0100
33+@@ -44,6 +44,16 @@
34 static bool g_allow_native = false;
35 static const char NPW_CONFIG[] = "nspluginwrapper";
36
37@@ -21,7 +21,6 @@
38 +static const char *debian_link_dirs[] = {
39 + LIBDIR "/mozilla/plugins",
40 + LIBDIR "/firefox/plugins",
41-+ LIBDIR "/iceweasel/plugins",
42 + NULL, /* if this isn't here, it reads into whatever data is in memory after
43 + possibly differing in behaviour to the same code in functions */
44 +};
45@@ -29,7 +28,7 @@
46 static void error(const char *format, ...)
47 {
48 va_list args;
49-@@ -161,7 +172,7 @@
50+@@ -161,7 +171,7 @@
51 }
52 else if (access("/etc/debian_version", F_OK) == 0) {
53 static const char *debian_dirs[] = {
54@@ -38,7 +37,7 @@
55 };
56 dirs = debian_dirs;
57 }
58-@@ -812,6 +823,49 @@
59+@@ -812,6 +822,49 @@
60 printf(" into %s\n", d_plugin_path);
61
62 free(plugin_data);
63@@ -88,7 +87,7 @@
64 return 0;
65 }
66
67-@@ -871,6 +925,48 @@
68+@@ -871,6 +924,48 @@
69 if (unlink(plugin_path) < 0)
70 return 1;
71
72@@ -137,7 +136,7 @@
73 return 0;
74 }
75
76-@@ -1033,6 +1129,12 @@
77+@@ -1033,6 +1128,12 @@
78 return 0;
79 }
80
81@@ -150,7 +149,7 @@
82 static int process_list(int argvc, char *argv[])
83 {
84 const char **plugin_dirs = get_mozilla_plugin_dirs();
85-@@ -1152,6 +1254,7 @@
86+@@ -1152,6 +1253,7 @@
87 { 'a', "auto", process_auto, 0 },
88 { 'n', "native", process_native, 0 },
89 { 'l', "list", process_list, 1 },
90
91=== modified file 'debian/patches/001_remove_bashisms.diff'
92--- debian/patches/001_remove_bashisms.diff 2008-12-27 02:24:23 +0000
93+++ debian/patches/001_remove_bashisms.diff 2009-03-07 17:43:52 +0000
94@@ -3,10 +3,10 @@
95
96 -- Rob Andrews <rob@choralone.org> Thu, 28 Jun 2007 18:08:54 +0100
97
98-Index: ubuntu.1.2.0-0ubuntu1/utils/mkruntime.sh
99+Index: ubuntu.1.2.2-0ubuntu1/utils/mkruntime.sh
100 ===================================================================
101---- ubuntu.1.2.0-0ubuntu1.orig/utils/mkruntime.sh 2008-12-27 03:11:07.000000000 +0100
102-+++ ubuntu.1.2.0-0ubuntu1/utils/mkruntime.sh 2008-12-27 03:23:05.000000000 +0100
103+--- ubuntu.1.2.2-0ubuntu1.orig/utils/mkruntime.sh 2009-01-02 11:19:18.000000000 +0100
104++++ ubuntu.1.2.2-0ubuntu1/utils/mkruntime.sh 2009-03-07 18:38:19.000000000 +0100
105 @@ -12,15 +12,15 @@
106 # - Check acroread5, something is missing while loading a PDF
107 # - Enough for Flash Player & PluginSDK npsimple.so
108
109=== modified file 'debian/patches/002_install_to_NSPLUGINDIR.diff'
110--- debian/patches/002_install_to_NSPLUGINDIR.diff 2008-12-27 02:24:23 +0000
111+++ debian/patches/002_install_to_NSPLUGINDIR.diff 2009-03-19 20:47:09 +0000
112@@ -5,11 +5,11 @@
113
114 -- Rob Andrews <rob@choralone.org> Sat, 14 Jul 2007 18:45:00 +0100
115
116-Index: ubuntu.1.2.0-0ubuntu1/src/npw-config.c
117+Index: ubuntu.1.2.2-0ubuntu2/src/npw-config.c
118 ===================================================================
119---- ubuntu.1.2.0-0ubuntu1.orig/src/npw-config.c 2008-12-27 03:22:58.000000000 +0100
120-+++ ubuntu.1.2.0-0ubuntu1/src/npw-config.c 2008-12-27 03:23:13.000000000 +0100
121-@@ -125,6 +125,10 @@
122+--- ubuntu.1.2.2-0ubuntu2.orig/src/npw-config.c 2009-03-19 21:33:48.000000000 +0100
123++++ ubuntu.1.2.2-0ubuntu2/src/npw-config.c 2009-03-19 21:34:02.000000000 +0100
124+@@ -124,6 +124,10 @@
125 static const char default_dir[] = LIBDIR "/mozilla/plugins";
126 static const char *dir = NULL;
127
128@@ -20,3 +20,13 @@
129 if (dir == NULL) {
130 const char **dirs = NULL;
131
132+@@ -826,7 +830,8 @@
133+ /* Install symlinks on Debian systems */
134+ if (has_system_wide_wrapper_plugin(plugin_path, true)
135+ && (access("/etc/debian_version", F_OK) == 0)
136+- && (g_dosymlink == true))
137++ && (g_dosymlink == true)
138++ && (getenv("NSPLUGIN_DIR") == NULL))
139+ {
140+ static const char *ldir = NULL;
141+ const char **ldirs = NULL;
142
143=== modified file 'debian/patches/003_update_help_info.diff'
144--- debian/patches/003_update_help_info.diff 2008-12-27 02:24:23 +0000
145+++ debian/patches/003_update_help_info.diff 2009-03-07 17:43:52 +0000
146@@ -2,11 +2,11 @@
147
148 -- Rob Andrews <rob@choralone.org> Sun, 02 Sep 2007 11:58:27 +0100
149
150-Index: ubuntu.1.2.0-0ubuntu1/src/npw-config.c
151+Index: ubuntu.1.2.2-0ubuntu1/src/npw-config.c
152 ===================================================================
153---- ubuntu.1.2.0-0ubuntu1.orig/src/npw-config.c 2008-12-27 03:23:13.000000000 +0100
154-+++ ubuntu.1.2.0-0ubuntu1/src/npw-config.c 2008-12-27 03:23:22.000000000 +0100
155-@@ -1103,7 +1103,7 @@
156+--- ubuntu.1.2.2-0ubuntu1.orig/src/npw-config.c 2009-03-07 18:38:23.000000000 +0100
157++++ ubuntu.1.2.2-0ubuntu1/src/npw-config.c 2009-03-07 18:38:28.000000000 +0100
158+@@ -1102,7 +1102,7 @@
159 printf(" -a --auto flag: set automatic mode for plugins discovery\n");
160 printf(" -n --native flag: allow native plugin(s) to be wrapped\n");
161 printf(" -l --list list plugins currently installed\n");
162
163=== modified file 'debian/patches/004_fix_threading.diff'
164--- debian/patches/004_fix_threading.diff 2008-12-27 02:24:23 +0000
165+++ debian/patches/004_fix_threading.diff 2009-03-07 17:43:52 +0000
166@@ -2,10 +2,10 @@
167
168 -- Rob Andrews <rob@choralone.org> Sat, 26 Jan 2008 03:01:31 +0000
169
170-Index: ubuntu.1.2.0-0ubuntu1/Makefile
171+Index: ubuntu.1.2.2-0ubuntu1/Makefile
172 ===================================================================
173---- ubuntu.1.2.0-0ubuntu1.orig/Makefile 2008-12-27 03:11:39.000000000 +0100
174-+++ ubuntu.1.2.0-0ubuntu1/Makefile 2008-12-27 03:23:31.000000000 +0100
175+--- ubuntu.1.2.2-0ubuntu1.orig/Makefile 2009-01-02 11:19:18.000000000 +0100
176++++ ubuntu.1.2.2-0ubuntu1/Makefile 2009-03-07 18:38:33.000000000 +0100
177 @@ -120,7 +120,7 @@
178 npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
179 npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0

Subscribers

People subscribed via source and target branches

to all changes: