Bug 707882 - Xulrunner make deb fail, rm xpidl. r=bsmedberg

--HG--
rename : xulrunner/installer/debian/postinst => xulrunner/installer/debian/postinst.in
rename : xulrunner/installer/debian/prerm => xulrunner/installer/debian/prerm.in
This commit is contained in:
Oleg Romashin 2011-12-07 11:04:53 -08:00
parent a2c81afa5e
commit a97dae0aeb
4 changed files with 20 additions and 5 deletions

View File

@ -65,7 +65,9 @@ endif
include $(topsrcdir)/config/rules.mk
INSTALL_SDK = 1
ifndef MOZ_PLATFORM_MAEMO
GENERATE_CACHE = 1
endif
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
@ -155,6 +157,14 @@ debian/xulrunner.service: $(srcdir)/debian/xulrunner.service.in
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
debian/prerm: $(srcdir)/debian/prerm.in
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
debian/postinst: $(srcdir)/debian/postinst.in
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
package:
$(MAKE) package -C $(DEPTH)
@ -165,8 +175,7 @@ deb: package debian/changelog debian/xulrunner.service debian/xulrunner.links
cp -pRL $(DEPTH)/dist/$(MOZ_BUILD_APP)/* $(DEBDESTDIR)/$(installdir)
$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/dbus-1/services/
cp debian/$(MOZ_BUILD_APP).service $(DEBDESTDIR)/usr/share/dbus-1/services/org.mozilla.$(MOZ_BUILD_APP).service
rm $(DEBDESTDIR)/$(installdir)/xpidl
dh_shlibdeps; fakeroot dh_fixperms; fakeroot dh_installdeb; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb
dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; fakeroot dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; fakeroot dh_builddeb;
endif
DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)

View File

@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: xulrunner
Architecture: any
Depends: libasound2 (>> 1.0.14), libatk1.0-0 (>= 1.12.2), libc6 (>= 2.5.0-1), libcairo2 (>= 1.4.10), libdbus-1-3 (>= 0.94), libdbus-glib-1-2 (>= 0.74), libfontconfig1 (>= 2.4.1), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:3.4.4), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.12.12-1osso3), libgtk2.0-0 (>= 2:2.10.12-0osso15), libhildon1 (>= 1.0.11), libhildonmime0 (>= 1.10.0), liblocation0, libosso-gnomevfs2-0, libosso1 (>= 2.13), libpango1.0-0 (>= 1.16.4), libstdc++6 (>= 3.4.4), libx11-6, libxrender1, libxt6, zlib1g (>= 1:1.2.1)
Depends: ${shlibs:Depends}
Description: Web and JavaScript engine used by the Firefox Web browser
The Mozilla runtime is the modern browser engine, also known as "Gecko," that powers Firefox and can be embedded by other applications
XB-Maemo-Display-Name: Mozilla Runtime

View File

@ -1,4 +1,5 @@
#!/bin/sh
#literal #! /bin/sh
#filter substitution
# postinst script for moz
#
# see: dh_installdeb(1)
@ -31,7 +32,9 @@ case "$1" in
;;
esac
#ifdef MOZ_WIDGET_GTK
gtk-update-icon-cache /usr/share/icons/hicolor
#endif
exit 0

View File

@ -1,4 +1,5 @@
#!/bin/sh
#literal #! /bin/sh
#filter substitution
# prerm script for moz
#
# see: dh_installdeb(1)
@ -18,7 +19,9 @@ case "$1" in
;;
esac
#ifdef MOZ_WIDGET_GTK
gtk-update-icon-cache /usr/share/icons/hicolor
#endif
exit 0