Prism

Merge lp:~micahg/prism/prism-1.0b2-karmic into lp:prism

  1. prism-1.0b2-karmic
  2. Merge into prism
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp:~micahg/prism/prism-1.0b2-karmic
Merge into: lp:prism
Diff against target: 241 lines
8 files modified
debian/changelog (+16/-2)
debian/control (+3/-2)
debian/patches/fix_prism_makefile_sh.patch (+13/-0)
debian/patches/installer_shouldnt_copy_xulrunner.patch (+5/-32)
debian/patches/series (+2/-1)
debian/patches/use_xul_1.9.1_only.patch (+30/-0)
debian/patches/use_xul_1.9_only.patch (+0/-30)
debian/rules (+3/-5)
To merge this branch: bzr merge lp:~micahg/prism/prism-1.0b2-karmic
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+13915@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Merge for prism - karmic

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-08-13 18:01:01 +0000
3+++ debian/changelog 2009-10-25 13:50:23 +0000
4@@ -1,4 +1,4 @@
5-prism (1.0b2+svn20090813r49078-0ubuntu1) UNRELEASED; urgency=low
6+prism (1.0~b2+svn20090813r49078-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Sasa Bodiroza <jazzva@gmail.com> ]
9 * Remove debian/patches/remove_common_dir_from_prism_Makefile_in_DIRS.patch,
10@@ -9,7 +9,21 @@
11 * new upstream codebase; update patches
12 - debian/patches/use_xul_1.9_only.patch
13
14- -- Fabien Tassin <fta@ubuntu.com> Mon, 04 May 2009 17:49:15 +0200
15+ [ Micah Gersten ]
16+ * Closes LP: #246822 - Update Prism to at least 1.0b1
17+ * Closes LP: #456650 - prism depends on xulrunner-1.9.1-dom-inspector which doesn't exist
18+ * Closes LP: #456999 - prism 0.8 version in karmic is hardcoded to xul-1.9
19+ - update debian/control
20+ * add libasound2 as build-dep
21+ * add depends on ${shlibs:Depends}, ${misc:Depends}
22+ - update debian/rules
23+ - update debian/patches/installer_shouldnt_copy_xulrunner.patch
24+ - update debian/series
25+ - add debian/patches/fix_prism_makefile_sh.patch
26+ - add debian/patches/use_xul_1.9.1_only.patch
27+ - drop debian/patches/use_xul_1.9_only.patch
28+
29+ -- Micah Gersten <launchpad@micahscomputing.com> Sun, 25 Oct 2009 01:16:02 -0500
30
31 prism (0.9.9+svn20090429r25045-0ubuntu1) UNRELEASED; urgency=low
32
33
34=== modified file 'debian/control'
35--- debian/control 2008-09-27 17:29:34 +0000
36+++ debian/control 2009-10-25 13:50:23 +0000
37@@ -17,14 +17,15 @@
38 zip,
39 sharutils,
40 imagemagick,
41+ libasound2-dev,
42 mozilla-devscripts (>= 0.11~),
43- xulrunner-1.9-dev (>= 1.9+nobinonly-0ubuntu3~)
44+ xulrunner-1.9.1-dev
45 Standards-Version: 3.7.3
46
47 Package: prism
48 Section: net
49 Architecture: any
50-Depends: xulrunner-1.9 (>= 1.9~b1), xulrunner-1.9-dom-inspector, unzip
51+Depends: xulrunner-1.9.1, unzip, ${shlibs:Depends}, ${misc:Depends}
52 Description: Split web applications out of the browser and run them directly on the desktop
53 Prism, previously called WebRunner, is a simple XULRunner based browser that
54 hosts web applications without the normal web browser user interface. It is
55
56=== added file 'debian/patches/fix_prism_makefile_sh.patch'
57--- debian/patches/fix_prism_makefile_sh.patch 1970-01-01 00:00:00 +0000
58+++ debian/patches/fix_prism_makefile_sh.patch 2009-10-25 13:50:23 +0000
59@@ -0,0 +1,13 @@
60+--- prism-1.0~b2+svn20090813r49078/prism/makefiles.sh 2009-10-23 02:50:59.000000000 -0500
61++++ prism-1.0~b2+svn20090813r49078/prism/makefiles.sh 2009-10-23 17:28:47.803259937 -0500
62+@@ -33,9 +33,10 @@
63+ # and other provisions required by the GPL or the LGPL. If you do not delete
64+ # the provisions above, a recipient may use your version of this file under
65+ # the terms of any one of the MPL, the GPL or the LGPL.
66+ #
67+ # ***** END LICENSE BLOCK *****
68+
69+ add_makefiles "
70+ prism/installer/Makefile
71++prism/Makefile
72+ "
73
74=== modified file 'debian/patches/installer_shouldnt_copy_xulrunner.patch'
75--- debian/patches/installer_shouldnt_copy_xulrunner.patch 2009-03-30 14:57:19 +0000
76+++ debian/patches/installer_shouldnt_copy_xulrunner.patch 2009-10-25 13:50:23 +0000
77@@ -1,38 +1,11 @@
78 ---
79- config/rules.mk | 5 +++++
80 prism/client/Makefile.in | 2 ++
81- 2 files changed, 7 insertions(+)
82+ 1 file changed, 2 insertions(+)
83
84-Index: prism-0.9.1+svn20090309r23002/config/rules.mk
85-===================================================================
86---- prism-0.9.1+svn20090309r23002.orig/config/rules.mk
87-+++ prism-0.9.1+svn20090309r23002/config/rules.mk
88-@@ -57,16 +57,21 @@
89- REPORT_BUILD = @echo $(notdir $<)
90-
91- ifeq ($(OS_ARCH),OS2)
92- EXEC =
93- else
94- EXEC = exec
95- endif
96-
97-+# Don't copy xulrunner files at install time, when using system xulrunner
98-+ifdef LIBXUL_SDK
99-+ SKIP_COPY_XULRUNNER=1
100-+endif
101-+
102- # ELOG prints out failed command when building silently (gmake -s).
103- ifneq (,$(findstring -s,$(MAKEFLAGS)))
104- ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
105- else
106- ELOG :=
107- endif
108-
109- ifeq ($(MOZ_OS2_TOOLS),VACPP)
110-Index: prism-0.9.1+svn20090309r23002/prism/client/Makefile.in
111-===================================================================
112---- prism-0.9.1+svn20090309r23002.orig/prism/client/Makefile.in
113-+++ prism-0.9.1+svn20090309r23002/prism/client/Makefile.in
114+Index: prism-1.0~b2+svn20090813r49078/prism/client/Makefile.in
115+===================================================================
116+--- prism-1.0~b2+svn20090813r49078.orig/prism/client/Makefile.in
117++++ prism-1.0~b2+svn20090813r49078/prism/client/Makefile.in
118 @@ -112,13 +112,15 @@
119 cp $(srcdir)/winbuild/UAC.dll $(DIST)/bin
120 makensis $(DIST)/bin/regprot.nsi
121
122=== modified file 'debian/patches/series'
123--- debian/patches/series 2009-05-05 12:37:26 +0000
124+++ debian/patches/series 2009-10-25 13:50:23 +0000
125@@ -1,5 +1,6 @@
126 dont_build_our_own_stub_with_the_sdk.patch
127 fix_installer.patch
128+fix_prism_makefile_sh.patch
129 installer_shouldnt_copy_xulrunner.patch
130 fix_desktop_launcher.patch
131-use_xul_1.9_only.patch
132+use_xul_1.9.1_only.patch
133
134=== added file 'debian/patches/use_xul_1.9.1_only.patch'
135--- debian/patches/use_xul_1.9.1_only.patch 1970-01-01 00:00:00 +0000
136+++ debian/patches/use_xul_1.9.1_only.patch 2009-10-25 13:50:23 +0000
137@@ -0,0 +1,30 @@
138+#
139+# Ubuntu: none
140+# Upstream: none
141+# Description: set MaxVersion to 1.9.0.* as 1.9.1 is no longer usable
142+# since https://bugzilla.mozilla.org/show_bug.cgi?id=462774 landed
143+#
144+---
145+ prism/client/application.ini | 4 ++--
146+ 1 file changed, 2 insertions(+), 2 deletions(-)
147+
148+Index: prism-0.9.1+svn20081126r20278/prism/client/application.ini
149+===================================================================
150+--- prism-0.9.1+svn20081126r20278.orig/prism/client/application.ini
151++++ prism-0.9.1+svn20081126r20278/prism/client/application.ini
152+@@ -1,13 +1,13 @@
153+ #filter substitution
154+ [App]
155+ Name=@APP_NAME@
156+ Version=@APP_VERSION@
157+ BuildID=@GRE_BUILDID@
158+ ID=prism@developer.mozilla.org
159+
160+ [Gecko]
161+-MinVersion=1.8.1.0
162+-MaxVersion=1.9.2.*
163++MinVersion=1.9.1
164++MaxVersion=1.9.1.*
165+
166+ [XRE]
167+ EnableExtensionManager=1
168
169=== removed file 'debian/patches/use_xul_1.9_only.patch'
170--- debian/patches/use_xul_1.9_only.patch 2009-08-13 18:01:01 +0000
171+++ debian/patches/use_xul_1.9_only.patch 1970-01-01 00:00:00 +0000
172@@ -1,30 +0,0 @@
173-#
174-# Ubuntu: none
175-# Upstream: none
176-# Description: set MaxVersion to 1.9.0.* as 1.9.1 is no longer usable
177-# since https://bugzilla.mozilla.org/show_bug.cgi?id=462774 landed
178-#
179----
180- prism/client/application.ini | 4 ++--
181- 1 file changed, 2 insertions(+), 2 deletions(-)
182-
183-Index: prism-0.9.1+svn20081126r20278/prism/client/application.ini
184-===================================================================
185---- prism-0.9.1+svn20081126r20278.orig/prism/client/application.ini
186-+++ prism-0.9.1+svn20081126r20278/prism/client/application.ini
187-@@ -1,13 +1,13 @@
188- #filter substitution
189- [App]
190- Name=@APP_NAME@
191- Version=@APP_VERSION@
192- BuildID=@GRE_BUILDID@
193- ID=prism@developer.mozilla.org
194-
195- [Gecko]
196--MinVersion=1.8.1.0
197--MaxVersion=1.9.2.*
198-+MinVersion=1.9
199-+MaxVersion=1.9.0.*
200-
201- [XRE]
202- EnableExtensionManager=1
203
204=== modified file 'debian/rules'
205--- debian/rules 2009-05-05 13:28:10 +0000
206+++ debian/rules 2009-10-25 13:50:23 +0000
207@@ -6,15 +6,13 @@
208 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
209 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
210
211-DEBIAN_XUL_VER := $(shell xulrunner-1.9 --gre-version)
212+DEBIAN_XUL_VER := $(shell xulrunner-1.9.1 --gre-version)
213 DEBIAN_XUL_DEV := /usr/lib/xulrunner-devel-$(DEBIAN_XUL_VER)
214 DEBIAN_PRISM_VER = $(shell grep ^MOZ_APP_VERSION= prism/confvars.sh | cut -d= -f2)
215 DEBIAN_PRISM_DIR = usr/lib/prism-$(DEBIAN_PRISM_VER)
216
217 DEB_AUTO_UPDATE_AUTOCONF = 2.13
218
219-MOZ_EXTENSION_PKG := prism
220-MOZ_XPI_FILE := refractor.xpi
221 MOZ_XPI_BUILD_COMMAND := $(NULL)
222
223 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
224@@ -26,6 +24,7 @@
225 DEB_CONFIGURE_USER_FLAGS = \
226 --with-libxul-sdk=$(DEBIAN_XUL_DEV) \
227 --enable-application=prism \
228+ --with-system-libxul \
229 --with-system-nspr \
230 --with-system-nss \
231 --disable-debug \
232@@ -47,8 +46,7 @@
233
234 ALL_WEBAPPS = $(shell echo $(WEBAPPS) | sed -e 's/\([^@]*\)@[^ ]*\( *\)/\1\2/g')
235
236-refractor.xpi:: build/prism
237- zip -d dist/xpi-stage/refractor.xpi prism/\*
238+build/prism::
239 cp -f dist/xpi-stage/refractor.xpi .
240
241 binary-install/prism::

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: