------------------------------------------------------------ revno: 79 author: Jonathan Marsden <[email protected]>, Dmitrijs Ledkovs <[email protected]> committer: Dmitrijs Ledkovs <[email protected]> branch nick: trunk timestamp: Sun 2010-11-14 00:43:39 +0000 message: [ Jonathan Marsden ] * Removed debian/patch/* since the one patch was included upstream. * Bumped Standards-Version to 3.9.1 (no changes required). * debian/README.Debian: Corrected spelling and reworded for clarity. * debian/control: Add Jonathan Marsden back into Uploaders. [ Dmitrijs Ledkovs ] * Merged bzr packaging history with lp:xiphos * Added local options dpkg-source to unapply patches and fail on upstream source changes (ignoring false positives). * Added bzr-builddeb hook to generate source-format before build. If you are not using bzr-builddeb, you must run "./debian/rules clean" before building. removed: debian/patches/svn3900.patch debian/patches/svn3901.patch added: .bzr-builddeb/ .bzr-builddeb/default.conf debian/source/local-options modified: debian/README.source 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
=== added directory '.bzr-builddeb' === added file '.bzr-builddeb/default.conf' --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000 +++ .bzr-builddeb/default.conf 2010-11-14 00:43:39 +0000 @@ -0,0 +1,2 @@ +[HOOKS] +pre-build = ./debian/rules source-format === modified file 'debian/README.source' --- debian/README.source 2009-08-24 23:37:09 +0000 +++ debian/README.source 2010-11-14 00:43:39 +0000 @@ -1,3 +1,10 @@ +This package is maintained to generate either 1.0 or 3.0 source formats at build +time. bzr-builddeb will take care of everything. Otherwise run + +$ ./debian/rules clean + +before building to generate correct ./debian/source/format. + This package uses quilt to manage all modifications to the upstream source. Changes are stored in the source package as diffs in debian/patches and applied during the build. @@ -5,4 +12,6 @@ This package uses quilt in a standard way. For futher details see /usr/share/doc/quilt/README.source - -- Dmitrijs Ledkovs <[email protected]>, Tue, 25 Aug 2009 02:16:38 +0300 +The source tree is maintained with NO PATCHES APPLIED. + + -- Dmitrijs Ledkovs <[email protected]>, Sat, 13 Nov 2010 23:28:54 +0000 === modified file 'debian/changelog' --- debian/changelog 2010-11-14 00:38:52 +0000 +++ debian/changelog 2010-11-14 00:43:39 +0000 @@ -1,8 +1,21 @@ xiphos (3.1.4-1) UNRELEASED; urgency=low + [ Jonathan Marsden ] * New upstream release 3.1.4 - - -- Dmitrijs Ledkovs <[email protected]> Sun, 14 Nov 2010 00:38:16 +0000 + * Removed debian/patch/* since the one patch was included upstream. + * Bumped Standards-Version to 3.9.1 (no changes required). + * debian/README.Debian: Corrected spelling and reworded for clarity. + * debian/control: Add Jonathan Marsden back into Uploaders. + + [ Dmitrijs Ledkovs ] + * Merged bzr packaging history with lp:xiphos + * Added local options dpkg-source to unapply patches and fail on + upstream source changes (ignoring false positives). + * Added bzr-builddeb hook to generate source-format before build. If you + are not using bzr-builddeb, you must run "./debian/rules clean" before + building. + + -- Dmitrijs Ledkovs <[email protected]> Sat, 13 Nov 2010 23:52:18 +0000 xiphos (3.1.3-3) unstable; urgency=low === modified file 'debian/control' --- debian/control 2010-11-14 00:38:52 +0000 +++ debian/control 2010-11-14 00:43:39 +0000 @@ -16,8 +16,8 @@ Section: gnome Priority: optional Maintainer: CrossWire Packages <[email protected]> -Uploaders: Dmitrijs Ledkovs <[email protected]> -Standards-Version: 3.8.4 +Uploaders: Dmitrijs Ledkovs <[email protected]>, Jonathan Marsden <[email protected]> +Standards-Version: 3.9.1 Vcs-Bzr: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main Vcs-Browser: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main/files Homepage: http://xiphos.org === modified file 'debian/patches/series' --- debian/patches/series 2010-05-27 17:57:06 +0000 +++ debian/patches/series 2010-11-14 00:43:39 +0000 @@ -1,2 +1,1 @@ -svn3900.patch -svn3901.patch + === removed file 'debian/patches/svn3900.patch' --- debian/patches/svn3900.patch 2010-05-27 17:57:06 +0000 +++ debian/patches/svn3900.patch 1970-01-01 00:00:00 +0000 @@ -1,140 +0,0 @@ ------------------------------------------------------------- -revno: 2868 -committer: Dmitrijs Ledkovs <[email protected]> -branch nick: trunk -timestamp: Mon 2010-05-24 20:57:21 +0100 -message: - Multi-thread support is broken on hppa arch, this fixes FTBFS on hppa. Thanks to debian hppa porter Adam D. Barratt. -diff: -=== added file 'waffles/nothreads.py' ---- a/waffles/nothreads.py 1970-01-01 00:00:00 +0000 -+++ b/waffles/nothreads.py 2010-05-24 19:57:21 +0000 -@@ -0,0 +1,114 @@ -+#!/usr/bin/env python -+# encoding: utf-8 -+# Thomas Nagy, 2005-2008 (ita) -+ -+import sys, random, time, traceback, os -+import Build, Utils, Logs, Options -+from Logs import debug, error -+from Constants import * -+ -+class TaskConsumer(object): -+ consumers = 1 -+ -+def process(tsk): -+ m = tsk.master -+ if m.stop: -+ m.out.put(tsk) -+ return -+ -+ try: -+ tsk.generator.bld.printout(tsk.display()) -+ if tsk.__class__.stat: ret = tsk.__class__.stat(tsk) -+ # actual call to task's run() function -+ else: ret = tsk.call_run() -+ except Exception, e: -+ tsk.err_msg = Utils.ex_stack() -+ tsk.hasrun = EXCEPTION -+ -+ # TODO cleanup -+ m.error_handler(tsk) -+ m.out.put(tsk) -+ return -+ -+ if ret: -+ tsk.err_code = ret -+ tsk.hasrun = CRASHED -+ else: -+ try: -+ tsk.post_run() -+ except Utils.WafError: -+ pass -+ except Exception: -+ tsk.err_msg = Utils.ex_stack() -+ tsk.hasrun = EXCEPTION -+ else: -+ tsk.hasrun = SUCCESS -+ if tsk.hasrun != SUCCESS: -+ m.error_handler(tsk) -+ -+ m.out.put(tsk) -+ -+def start(self): -+ -+ while not self.stop: -+ -+ self.refill_task_list() -+ -+ # consider the next task -+ tsk = self.get_next() -+ if not tsk: -+ if self.count: -+ # tasks may add new ones after they are run -+ continue -+ else: -+ # no tasks to run, no tasks running, time to exit -+ break -+ -+ if tsk.hasrun: -+ # if the task is marked as "run", just skip it -+ self.processed += 1 -+ self.manager.add_finished(tsk) -+ continue -+ -+ try: -+ st = tsk.runnable_status() -+ except Exception, e: -+ self.processed += 1 -+ if self.stop and not Options.options.keep: -+ tsk.hasrun = SKIPPED -+ self.manager.add_finished(tsk) -+ continue -+ self.error_handler(tsk) -+ self.manager.add_finished(tsk) -+ tsk.hasrun = EXCEPTION -+ tsk.err_msg = Utils.ex_stack() -+ continue -+ -+ if st == ASK_LATER: -+ self.postpone(tsk) -+ elif st == SKIP_ME: -+ self.processed += 1 -+ tsk.hasrun = SKIPPED -+ self.manager.add_finished(tsk) -+ else: -+ # run me: put the task in ready queue -+ tsk.position = (self.processed, self.total) -+ self.count += 1 -+ self.processed += 1 -+ tsk.master = self -+ -+ process(tsk) -+ -+ # self.count represents the tasks that have been made available to the consumer threads -+ # collect all the tasks after an error else the message may be incomplete -+ while self.error and self.count: -+ self.get_out() -+ -+ #print loop -+ assert (self.count == 0 or self.stop) -+ -+ -+# enable nothreads if -j1 is used from the makefile -+if os.environ.get('JOBS') == '1' or sys.platform == 'linux2-hppa': -+ import Runner -+ Runner.Parallel.start = start - -=== modified file 'wscript' ---- a/wscript 2010-05-12 21:29:24 +0000 -+++ b/wscript 2010-05-24 19:57:21 +0000 -@@ -166,7 +166,8 @@ - - if env['IS_WIN32']: - env['ROOTDIR'] = ROOTDIR_WIN32 -- -+ -+ conf.check_tool('nothreads', tooldir=_tooldir) - conf.check_tool('g++ gcc') - # cross compiler - if env['IS_CROSS_WIN32']: === removed file 'debian/patches/svn3901.patch' --- debian/patches/svn3901.patch 2010-05-27 17:57:06 +0000 +++ debian/patches/svn3901.patch 1970-01-01 00:00:00 +0000 @@ -1,70 +0,0 @@ ------------------------------------------------------------- -revno: 2764 -committer: Dmitrijs Ledkovs <[email protected]> -branch nick: 3.1.3-xulrunner-hotfix -timestamp: Thu 2010-05-27 18:18:02 +0100 -message: - * fix #2997121 xulrunner failure to jump to anchor. -diff: -=== modified file 'ChangeLog' ---- a/ChangeLog 2010-03-22 14:10:04 +0000 -+++ b/ChangeLog 2010-05-27 17:18:02 +0000 -@@ -1,3 +1,7 @@ -+2010-05-27 karl <[email protected]> -+ -+ * fix #2997121 xulrunner failure to jump to anchor. -+ - 2010-03-22 karl <[email protected]> - - * 3.1.3 release. - -=== modified file 'src/gnome2/utilities.c' ---- a/src/gnome2/utilities.c 2010-03-19 17:01:57 +0000 -+++ b/src/gnome2/utilities.c 2010-05-27 17:18:02 +0000 -@@ -1202,6 +1202,33 @@ - gtk_html_set_editable(html, FALSE); - #endif - -+#ifdef USE_GTKMOZEMBED -+ // EVIL EVIL EVIL EVIL. -+ // crazy nonsense with xulrunner 1.9.2.3, failure to jump to anchor. -+ // force the issue by stuffing a javascript snippet inside <head></head>. -+ // there are forms of evil so dark that they should not be contemplated. -+ if (anchor || settings.special_anchor) { -+ gchar *buf; -+ -+ // first, scribble out everything up to the closing </head>. -+ buf = strstr(text, "</head>"); // yes, lowercase. -+ assert(buf != NULL); // don't be so stupid as not to include <head></head>. -+ offset = buf - text; -+ gecko_html_write(html, text, offset); -+ len -= offset; -+ -+ // now write the javascript snippet. -+ buf = g_strdup_printf( -+ "<script type=\"text/javascript\" language=\"javascript\">" -+ " window.onload = function () { window.location.hash = \"%s\"; }" -+ " </script>", (settings.special_anchor -+ ? settings.special_anchor -+ : anchor)); -+ gecko_html_write(html, buf, strlen(buf)); -+ g_free(buf); -+ } -+#endif /* USE_GTKMOZEMBED */ -+ - // html widgets are uptight about being handed - // huge quantities of text -- producer/consumer problem, - // and we mustn't overload the receiver. 10k chunks. - -=== modified file 'src/main/export_passage.cc' ---- a/src/main/export_passage.cc 2010-03-14 02:28:10 +0000 -+++ b/src/main/export_passage.cc 2010-05-27 17:18:02 +0000 -@@ -37,7 +37,7 @@ - #include "main/sword.h" - - --#define HTML_START "<HTML><HEAD><META HTTP-EQUIV=\"content-type\" CONTENT=\"text/html; CHARSET=utf-8\"><STYLE TYPE=\"text/css\"><!-- A { text-decoration:none } %s --></STYLE></HEAD><BODY>" -+#define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"><style type=\"text/css\"><!-- A { text-decoration:none } %s --></style></head><body>" - - enum { - TARGET_HTML, === modified file 'debian/rules' --- debian/rules 2010-11-14 00:38:52 +0000 +++ debian/rules 2010-11-14 00:43:39 +0000 @@ -19,7 +19,7 @@ endif %: - dh $(with) --parallel $@ + dh $@ $(with) override_dh_auto_configure: ./waf configure --nocache --prefix=/usr override_dh_auto_build: @@ -38,10 +38,12 @@ | sed -n "/xulrunner-1.9.*-dev\t./s/\(xulrunner-1.9.*\)-dev\t.*/\1/p")/" \ debian/xiphos.substvars endif -override_dh_clean: +override_dh_clean: source-format dh_clean rm -rf .waf* rm -rf waffles/*.pyc + +source-format: ifeq ($(ppa),) echo "3.0 (quilt)" > debian/source/format else @@ -56,3 +58,5 @@ else dh_builddeb -- -Zlzma endif + +.PHONY: source-format === added file 'debian/source/local-options' --- debian/source/local-options 1970-01-01 00:00:00 +0000 +++ debian/source/local-options 2010-11-14 00:43:39 +0000 @@ -0,0 +1,3 @@ +unapply-patches +abort-on-upstream-changes +extend-diff-ignore=.bzr-builddeb|src/examples
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
