diffstat of debian/ for xulrunner_1.8.1.14-3 xulrunner_1.8.1.14-3.1 changelog | 8 ++++++ control | 75 +++++++++++++++++++------------------------------------------- rules | 29 +++++++++++++++-------- 3 files changed, 50 insertions(+), 62 deletions(-) --- xulrunner-1.8.1.14/debian/control +++ xulrunner-1.8.1.14/debian/control @@ -1,14 +1,21 @@ Source: xulrunner Section: devel Priority: optional -Maintainer: Mike Hommey -Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, dpatch, libx11-dev, libxt-dev, libidl-dev, libgtk2.0-dev, libgnomevfs2-dev, libgnome2-dev, libgnomeui-dev, libcairo2-dev, libpng12-dev, libjpeg62-dev, zlib1g-dev, libbz2-dev, libreadline5-dev | libreadline-dev, libkrb5-dev, python-dev, python-support (>= 0.3), dpkg-dev (>= 1.13.19), binutils (>= 2.17) [mips mipsel], libnspr4-dev, libnss3-dev (>= 3.11.5-2), libhunspell-dev (>= 1.1.5-2) +Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.56) -Standards-Version: 3.7.3.0 +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, dpatch, libx11-dev, + libxt-dev, libidl-dev, libgtk2.0-dev, libgnomevfs2-dev, libgnome2-dev, + libgnomeui-dev, libcairo2-dev, libpng12-dev, libjpeg62-dev, zlib1g-dev, + libbz2-dev, libreadline5-dev | libreadline-dev, libkrb5-dev, python-dev, + python-support (>= 0.3), dpkg-dev (>= 1.13.19), libhunspell-dev (>= 1.1.5-2), + binutils (>= 2.17) [mips mipsel], libnspr4-dev, libnss3-dev (>= 3.11.5-2), + ccache Package: xulrunner Section: devel -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xulrunner-gnome-support Description: XUL + XPCOM application runner @@ -30,7 +37,7 @@ Package: xulrunner-gnome-support Section: devel -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Support for GNOME in xulrunner applications This is an extension to xulrunner that allows XUL applications to use @@ -39,7 +46,7 @@ Package: libmozjs0d Section: libs -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: The Mozilla SpiderMonkey JavaScript library This library provides the embeddable JavaScript/ECMAScript engine from @@ -61,25 +68,9 @@ Mozilla SpiderMonkey JavaScript library. Homepage: http://www.mozilla.org/js/ -Package: libmozjs0d-dbg -Section: libdevel -Priority: extra -Architecture: any -Depends: libmozjs0d (= ${binary:Version}) -Suggests: spidermonkey-bin -Conflicts: spidermonkey-bin (<< ${source:Version}), spidermonkey-bin (>= ${source:Version}.1~) -Description: Development files for the Mozilla SpiderMonkey JavaScript library - This library provides the embeddable JavaScript/ECMAScript engine from - the Mozilla project (used among others by the Mozilla, Epiphany, Firefox - browsers as well as by the iPlanet WebServer). - . - This package provides the debugging symbols for the library and for - the spidermonkey-bin package. -Homepage: http://www.mozilla.org/js/ - Package: spidermonkey-bin Section: interpreters -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: standalone JavaScript/ECMAScript (ECMA-262) interpreter SpiderMonkey is a standalone JavaScript/ECMAScript interpreter. It can either @@ -98,13 +89,13 @@ Package: libxul0d Section: libs -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, libxul-common (>= ${source:Upstream-Version}) Replaces: xulrunner (<< 1.8.0.1-9) Description: Gecko engine library - This library provides an API for XUL applications and Gecko embedders. - The Gecko engine is the core of the mozilla.org applications such as - Firefox, Thunderbird or SeaMonkey. + This library provides an API for XUL applications and Gecko embedders. The + Gecko engine is the core of the mozilla.org applications such as Firefox, + Thunderbird or SeaMonkey. . Gecko features include XPCOM, networking, DOM editing and transaction support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), @@ -119,9 +110,9 @@ Replaces: xulrunner (<< 1.8.0.1-9) Conflicts: libxul0d (<< 1.8.0.4-2) Description: Gecko engine library - common files - This library provides an API for XUL applications and Gecko embedders. - The Gecko engine is the core of the mozilla.org applications such as - Firefox, Thunderbird or SeaMonkey. + This library provides an API for XUL applications and Gecko embedders. The + Gecko engine is the core of the mozilla.org applications such as Firefox, + Thunderbird or SeaMonkey. . Gecko features include XPCOM, networking, DOM editing and transaction support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), @@ -137,7 +128,7 @@ Depends: ${misc:Depends}, libxul0d (>= ${source:Upstream-Version}), libnss3-dev, libnspr4-dev, libmozjs-dev (>= ${source:Version}), xulrunner Conflicts: mozilla-browser (<< 2:1.8) Description: Development files for the Gecko engine library - This library provides an API for XUL applications and Gecko embedders. + This library provides an API for XUL applications and Gecko embedders. The Gecko engine is the core of the mozilla.org applications such as Firefox, Thunderbird or SeaMonkey. . @@ -154,26 +145,6 @@ It also contains the JavaXPCOM interfaces and their sources. Homepage: http://wiki.mozilla.org/XUL:Lib_XUL -Package: libxul0d-dbg -Section: libdevel -Priority: extra -Architecture: any -Depends: libxul0d (= ${binary:Version}) -Suggests: xulrunner, xulrunner-gnome-support -Conflicts: xulrunner (<< ${source:Version}), xulrunner (>= ${source:Version}.1~), xulrunner-gnome-support (<< ${source:Version}), xulrunner-gnome-support (>= ${source:Version}.1~) -Description: Development files for the Gecko engine library - This library provides an API for XUL applications and Gecko embedders. - The Gecko engine is the core of the mozilla.org applications such as - Firefox, Thunderbird or SeaMonkey. - . - Gecko features include XPCOM, networking, DOM editing and transaction - support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), - Web Services (SOAP), accessibility support, IPC services, gtkmozembed, etc. - . - This package provides the debugging symbols for the library, and for the - xulrunner, xulrunner-gnome-support and python-xpcom packages. -Homepage: http://wiki.mozilla.org/XUL:Lib_XUL - Package: libmozillainterfaces-java Section: libdevel Priority: extra @@ -196,7 +167,7 @@ Package: python-xpcom Section: python Priority: extra -Architecture: any +Architecture: i386 amd64 Provides: ${python:Provides} Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Conflicts: epiphany-browser --- xulrunner-1.8.1.14/debian/rules +++ xulrunner-1.8.1.14/debian/rules @@ -46,6 +46,19 @@ DEBUGFLAGS := --enable-debug endif +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 +endif + +CC:=ccache $(CC) +CXX:=ccache $(CXX) + config.status: patch-stamp ./configure debian/mozconfig dh_testdir # Add here commands to configure the package. @@ -53,26 +66,24 @@ MOZCONFIG=debian/mozconfig \ CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,--as-needed" \ + CC="$(CC)" CXX="$(CXX)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --enable-optimize="$(OPTCFLAGS)" \ $(DEBUGFLAGS) build: build-stamp - build-stamp: config.status dh_testdir - # Add here commands to compile the package. - LD_LIBRARY_PATH=$(CURDIR)/dist/lib $(MAKE) PYTHON_SO=$(shell objdump -x /usr/lib/lib$(shell pyversions -d).so | grep SONAME | awk '{print $$2}') $(JAVA_VARS) DEB_NO_JAR=1 + LD_LIBRARY_PATH=$(CURDIR)/dist/lib $(MAKE) -j $(NCPUS) PYTHON_SO=$(shell objdump -x /usr/lib/lib$(shell pyversions -d).so | grep SONAME | awk '{print $$2}') $(JAVA_VARS) DEB_NO_JAR=1 #docbook-to-man debian/xulrunner.sgml > xulrunner.1 touch build-stamp build-jars: build-jars-stamp - build-jars-stamp: build-stamp - $(MAKE) -C extensions/java/xpcom/interfaces $(JAVA_VARS) - $(MAKE) -C extensions/java/xpcom/src jar-libs $(JAVA_VARS) + $(MAKE) -j $(NCPUS) -C extensions/java/xpcom/interfaces $(JAVA_VARS) + $(MAKE) -j $(NCPUS) -C extensions/java/xpcom/src jar-libs $(JAVA_VARS) touch build-jars-stamp @@ -89,7 +100,6 @@ dh_clean install: install-stamp - install-stamp: build-stamp dh_testdir dh_testroot @@ -149,7 +159,6 @@ touch install-stamp install-jars: install-jars-stamp - install-jars-stamp: build-jars-stamp dh_testdir dh_testroot @@ -192,8 +201,8 @@ dh_python -a dh_installman -pspidermonkey-bin $(CURDIR)/debian/smjs.1 dh_link -a - dh_strip -plibxul0d -pxulrunner -pxulrunner-gnome-support -ppython-xpcom --dbg-package=libxul0d-dbg - dh_strip -plibmozjs0d -pspidermonkey-bin --dbg-package=libmozjs0d-dbg + dh_strip -plibxul0d -pxulrunner -pxulrunner-gnome-support -ppython-xpcom + dh_strip -plibmozjs0d -pspidermonkey-bin dh_compress -a dh_fixperms -a dh_makeshlibs -plibxul0d -Xusr/lib/xulrunner/components -V 'libxul0d (>= 1.8.1.4)' --- xulrunner-1.8.1.14/debian/changelog +++ xulrunner-1.8.1.14/debian/changelog @@ -1,3 +1,11 @@ +xulrunner (1.8.1.14-3.1) unstable; urgency=low + + * Upload to my repository as libxul0d is still needed by acroread. + * Added support for ccache and make -j + * Changes Architecture to only i386 and amd64. + + -- Christian Marillat Wed, 11 Jun 2008 15:09:49 +0200 + xulrunner (1.8.1.14-3) unstable; urgency=low * debian/patches/38_mips_xpcom.dpatch: Add -fPIC to flags given to the