From 030553401a8adb42b28a1646fbc5a9ec525548ad Mon Sep 17 00:00:00 2001 From: jeremias bosch Date: Tue, 9 Aug 2011 12:30:56 -0700 Subject: [PATCH] Bug 673116: Fix file ownership in deb package on MeeGo. r=romaxa --- mobile/installer/Makefile.in | 17 ++++++++++++++++- mobile/installer/debian/fennec.aegis.in | 7 +++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 mobile/installer/debian/fennec.aegis.in diff --git a/mobile/installer/Makefile.in b/mobile/installer/Makefile.in index 4799ce47b2cc..8cb00d167286 100644 --- a/mobile/installer/Makefile.in +++ b/mobile/installer/Makefile.in @@ -179,6 +179,10 @@ PP_DEB_FILES = debian/control \ debian/fennec.postinst \ $(NULL) +ifdef MOZ_ENABLE_CONTENTMANAGER +PP_DEB_FILES += debian/fennec.aegis \ + $(NULL) +endif $(PP_DEB_FILES): @$(EXIT_ON_ERROR) \ @@ -214,7 +218,18 @@ else $(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/ cp $(DIST)/branding/$(MOZ_APP_NAME)_40x40.png $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/$(MOZ_APP_NAME).png endif - dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb + fakeroot dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; fakeroot dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; fakeroot dh_builddeb; + +# a defined CONTENTMANAGER implicitly means MOZ_PLATFORM_MAEMO is equals 6 +# in case you use CONTENTMANGER you need to sign your package to gain tracker access. +ifdef MOZ_ENABLE_CONTENTMANAGER + if test -e "/usr/bin/aegis-deb-add"; then \ + fakeroot aegis-deb-add -control $(DEBDESTDIR)/DEBIAN/control .. debian/fennec.aegis=_aegis; \ + else \ + echo aegis-builder not found, security signing failed!; \ + fi +endif + echo $(DEB_PKG_NAME) > $(DIST)/deb_name.txt installer: deb diff --git a/mobile/installer/debian/fennec.aegis.in b/mobile/installer/debian/fennec.aegis.in new file mode 100644 index 000000000000..e98f5640dc19 --- /dev/null +++ b/mobile/installer/debian/fennec.aegis.in @@ -0,0 +1,7 @@ + + + + + + +