------------------------------------------------------------ revno: 87 tags: 3.1.4-3 fixes bug(s): http://bugs.debian.org/631049 https://launchpad.net/bugs/756201 committer: Dmitrijs Ledkovs <[email protected]> branch nick: trunk timestamp: Sat 2011-06-25 15:17:06 +0100 message: * Drop xulrunner, use gtkhtml instead. (Closes: #631049) (LP: #756201) * Drop quilt dependency (daily ppa converts 3.0 quilt format to 3.0 native) * Bump policy to 3.9.2, no changes required. removed: debian/patches/daily.series debian/patches/xul-2.0.patch added: debian/source/format modified: .bzrignore debian/changelog debian/control debian/patches/series debian/rules
-- lp:xiphos/debian https://code.launchpad.net/~pkgcrosswire/xiphos/main Your team Crosswire Packaging Team is subscribed to branch lp:xiphos/debian. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/xiphos/main/+edit-subscription
=== modified file '.bzrignore' --- .bzrignore 2010-11-29 23:00:16 +0000 +++ .bzrignore 2011-06-25 14:17:06 +0000 @@ -1,3 +1,3 @@ -debian/source/format src/examples/ipc-interface.xml src/examples/marshal.list +.waf-* === modified file 'debian/changelog' --- debian/changelog 2011-02-20 23:40:27 +0000 +++ debian/changelog 2011-06-25 14:17:06 +0000 @@ -1,3 +1,12 @@ +xiphos (3.1.4-3) unstable; urgency=low + + [ Dmitrijs Ledkovs <[email protected]> ] + * Drop xulrunner, use gtkhtml instead. (Closes: #631049) (LP: #756201) + * Drop quilt dependency (daily ppa converts 3.0 quilt format to 3.0 native) + * Bump policy to 3.9.2, no changes required. + + -- Dmitrijs Ledkovs <[email protected]> Sat, 25 Jun 2011 00:18:28 +0100 + xiphos (3.1.4-2) unstable; urgency=low [ Dmitrijs Ledkovs <[email protected] ] === modified file 'debian/control' --- debian/control 2011-02-20 23:40:27 +0000 +++ debian/control 2011-06-25 14:17:06 +0000 @@ -1,6 +1,5 @@ Source: xiphos -Build-Depends: quilt (>= 0.46.7~), - debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 7.0.50~), libsword-dev (>=1.5.11), rarian-compat, libgtkhtml3.14-dev, @@ -11,13 +10,12 @@ libgsf-1-dev, libglade2-dev, libdbus-glib-1-dev, - libxml2-dev, - xulrunner-dev (>= 1.9.1.3-2) | xulrunner-1.9.1-dev | xulrunner-1.9-dev, + libxml2-dev Section: gnome Priority: optional Maintainer: CrossWire Packages <[email protected]> Uploaders: Dmitrijs Ledkovs <[email protected]>, Jonathan Marsden <[email protected]> -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Bzr: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main Vcs-Browser: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main/files Homepage: http://xiphos.org === removed file 'debian/patches/daily.series' --- debian/patches/daily.series 2010-12-02 01:30:11 +0000 +++ debian/patches/daily.series 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ - === modified file 'debian/patches/series' --- debian/patches/series 2010-11-27 16:41:39 +0000 +++ debian/patches/series 2011-06-25 14:17:06 +0000 @@ -1,1 +0,0 @@ -xul-2.0.patch === removed file 'debian/patches/xul-2.0.patch' --- debian/patches/xul-2.0.patch 2010-11-27 16:41:39 +0000 +++ debian/patches/xul-2.0.patch 1970-01-01 00:00:00 +0000 @@ -1,63 +0,0 @@ -=== modified file 'src/gecko/gecko-utils.cpp' ---- a/src/gecko/gecko-utils.cpp 2010-03-29 16:50:00 +0000 -+++ b/src/gecko/gecko-utils.cpp 2010-11-26 12:29:42 +0000 -@@ -233,11 +233,9 @@ - //I have really no clue what this ranges mean but if xulrunner is - //outside of this range we get coredumps =( so here is a bold assumption - //that we will be able to work with any future xulrunner. --#define UPPER_RANGE "1.9.99" --#define LOWER_RANGE "1.9.0" - static const GREVersionRange greVersion = { -- LOWER_RANGE, PR_TRUE, -- UPPER_RANGE, PR_TRUE -+ GECKO_MIN, PR_TRUE, -+ GECKO_MAX, PR_TRUE - }; - char xpcomLocation[PATH_MAX]; - rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation)); - -=== modified file 'wscript' ---- a/wscript 2010-11-08 13:20:13 +0000 -+++ b/wscript 2010-11-27 11:10:13 +0000 -@@ -311,7 +311,7 @@ - - - if conf.check_cfg(modversion='gtkhtml-editor-3.14', -- msg='Is post GNOME3 gtkhtml-editor available?', -+ msg='Checking for GNOME3 gtkhtml-editor', - okmsg='Deffinatly', - errmsg='Probably, not' - ): -@@ -377,6 +377,20 @@ - args='--variable=sdkdir', - okmsg=waffles.misc.myokmsg, - msg="Checking for libxul sdkdir").strip()) -+ conf.define('GECKO_VER', conf.check_cfg(package='libxul-embedding', -+ args='--modversion', -+ okmsg=waffles.misc.myokmsg, -+ msg="Checking for Gecko GREVersion").strip()) -+ if not env['GECKO_VER'][3].isalpha(): -+ conf.define('GECKO_MIN', env['GECKO_VER'][0:5]+'.0') -+ conf.define('GECKO_MAX', env['GECKO_VER'][0:5]+'.99') -+ else: -+ conf.define('GECKO_MIN', env['GECKO_VER'][0:4]+'0') -+ conf.define('GECKO_MAX', env['GECKO_VER'][0:3]+'.0.99') -+ -+ conf.check_message("Gecko", "GREVersionMin", 1, env['GECKO_MIN']) -+ conf.check_message("Gecko", "GREVersionMax", 1, env['GECKO_MAX']) -+ - else: - d = env['MOZILLA_DISTDIR'] - conf.define['CPPPATH_GECKO'] = ['%s/sdk/include' % d, -@@ -389,6 +403,10 @@ - '%s/include/gfx' % d] - conf.define['LIBPATH_GECKO'] = ['%s/sdk/lib' % d] - conf.define['LIB_GECKO'] = ['xpcomglue_s', 'xpcom', 'xul', 'nspr4'] -+ # FIXME: how to detect Gecko-ver on Win similar to pkg-config on unix? -+ conf.define('GECKO_MIN', '1.9.0.0') -+ conf.define('GECKO_MAX', '2.0.0.*') -+ - - env.append_value('ALL_LIBS', 'NSPR') - env.append_value('ALL_LIBS', 'GECKO') - === modified file 'debian/rules' --- debian/rules 2011-02-20 21:52:33 +0000 +++ debian/rules 2011-06-25 14:17:06 +0000 @@ -1,15 +1,10 @@ #!/usr/bin/make -f -#Ubuntu doesn't have dh_xulrunner yet -xul:=$(shell which dh_xulrunner) ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) -daily:=$(shell sed -n "1s/.*2010.*-.*/yes/p" debian/changelog) -# Yes, the next variable name and value are the same -,:=, %: - dh $@ --with quilt$(if $(xul),$(,)xulrunner) + dh $@ override_dh_auto_configure: - ./waf configure --nocache --prefix=/usr + ./waf configure --nocache --prefix=/usr --enable-gtkhtml override_dh_auto_build: ./waf build --nocache override_dh_auto_install: @@ -18,20 +13,9 @@ dh_strip --dbg-package=xiphos-dbg override_dh_auto_clean: ./waf distclean --nocache -override_dh_shlibdeps: - dh_shlibdeps -# dh_xulrunner replacement when not available -ifeq ($(xul),) - sed -i "s/\(shlibs:.*\)/\1, $(shell dpkg-query -W xulrunner-1.9* \ - | sed -n "/xulrunner-1.9.*-dev\t./s/\(xulrunner-1.9.*\)-dev\t.*/\1/p")/" \ - debian/xiphos.substvars -endif override_dh_clean: - echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format - $(if $(daily),cp debian/patches/daily.series debian/patches/series) dh_clean rm -rf .waf* rm -rf waffles/*.pyc - override_dh_builddeb: dh_builddeb $(if $(ppa),-- -Zlzma) === added file 'debian/source/format' --- debian/source/format 1970-01-01 00:00:00 +0000 +++ debian/source/format 2011-06-25 14:17:06 +0000 @@ -0,0 +1,1 @@ +3.0 (quilt)
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
