uri=http://www.thefreedictionary.com/%s
icon=
token=fd
+
+[Debian Packages]
+name=Debian Packages
+text=Search Debian Packages
+uri=http://packages.debian.org/%s
+icon=
+token=d
+
+[Debian Bugs]
+name=Debian Bugs
+text=Debian Bugs Search
+uri=http://bugs.debian.org/%s
+icon=
+token=dbs
--- /dev/null
+[settings]
+
+homepage=file:///usr/share/doc/midori/user/midori.html
--- /dev/null
+[settings]
+homepage=file:///usr/share/ubuntu-artwork/home/index.html
- pick {C,LD}FLAGS from dpkg-buildflags.
- add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
- add hardening flags to {C,LD}FLAGS.
+ * debian/rules:
+ - remove waf stuff, midori waf has been updated so it's no longer needed
+ to dynamically patch waf for HPPA.
+ - install $(DISTRO)-config to /etc/xdg/midori to tune the default homepage
+ * debian/{Ubuntu,Debian}-config added, with default homepage setting.
+ * debian/patches:
+ - add-debian-search refreshed.
+ - fix-serial-build dropped thanks to waf upgrade in midori.
+ * debian/control:
+ - drop quilt build-dep, useless now.
- -- Yves-Alexis Perez <corsac@debian.org> Mon, 18 Oct 2010 11:26:48 +0200
+ -- Yves-Alexis Perez <corsac@debian.org> Tue, 02 Nov 2010 22:42:48 +0100
midori (0.2.7-1.1) unstable; urgency=low
Maintainer: Ryan Niebur <ryan@debian.org>
Uploaders: Yves-Alexis Perez <corsac@debian.org>
Build-Depends: debhelper (>= 7.0.50),
- quilt (>= 0.46-7),
lsb-release,
libgtk2.0-dev (>= 2.10),
libglib2.0-dev,
xvfb,
xauth,
xfonts-base,
- hardening-includes
+ hardening-includes,
+ libxss-dev
# Disabled optional dependencies:
Build-Conflicts: gtk-doc-tools,
libgtksourceview2.0-dev (>= 2.0),
-Fix #520381 - add a Debian search to the default search list.
-and #525991 - Adding debian bugs search to pre-installed searches
+diff --git a/data/search b/data/search
+index c793829..2cd3cbc 100644
--- a/data/search
+++ b/data/search
-@@ -19,3 +19,17 @@
+@@ -26,3 +26,17 @@ text=Dictionary, Encyclopedia and Thesaurus
uri=http://www.thefreedictionary.com/%s
icon=
token=fd
+++ /dev/null
-Some users install a web browser to look at HTML documentation when
-they are offline. In this case, it is not nice to have the default
-page be a site that will time out. Instead, we should use a local
-"launch" page, similar to what Konqueror and Iceweasel do already.
-
-Unfortunately there is no generic page of that sort, and I can't be
-bothered writing one. So for now, I will just make the homepage
-Midori's user documentation. This is similar to what Dillo did/does.
-
---- a/midori/midori-websettings.c
-+++ b/midori/midori-websettings.c
-@@ -10,6 +10,7 @@
- */
-
- #include "midori-websettings.h"
-+#include "midori-debian.h"
-
- #include "sokoke.h"
-
-@@ -623,7 +624,7 @@
- "homepage",
- _("Homepage:"),
- _("The homepage"),
-- "http://www.google.com",
-+ DEBIAN_DISTRO_DEFAULT_HOMEPAGE,
- flags));
-
- /**
+++ /dev/null
-fix building in Serial mode (on HPPA)
-
---- a/wscript
-+++ b/wscript
-@@ -490,7 +490,7 @@
- obj.source = 'data/' + APPNAME + '.desktop.in'
- obj.install_path = appdir
- obj.flags = ['-d', '-c']
-- bld.install_files (appdir, 'data/' + APPNAME + '.desktop')
-+ bld.install_files (appdir, blddir + '/default/data/' + APPNAME + '.desktop')
- else:
- folder = os.path.abspath (blddir + '/default/data')
- Utils.check_dir (folder)
-fix-serial-build
-default-homepage
add-debian-searches
endif
%:
- dh --with quilt $@
+ dh $@
-override_dh_quilt_patch:
- ln -sf ../$(CONFIG_FILE) midori/midori-debian.h
- test -e midori/midori-debian.h
- $(CMD)
-
-#WAF=/usr/bin/waf
-BASE_WAF=./waf
-WAF=env WAFDIR=debian/ $(BASE_WAF)
+WAF=./waf
debian/presubj: debian/presubj.in
@echo "presubj parameters:"
override_dh_install: debian/presubj
$(CMD) --fail-missing
-WAFADMIN_FILE=debian/wafadmin/Runner.py
-WAFADMIN_APPEND=debian/runner-append
-
-override_dh_auto_clean: $(WAFADMIN_FILE)
+override_dh_auto_clean:
$(WAF) --nocache distclean
rm -rf _build_
+ rm -rf .waf*
-override_dh_auto_configure: $(WAFADMIN_FILE)
+override_dh_auto_configure:
$(WAF) --nocache configure --prefix /usr
-override_dh_auto_build: $(WAFADMIN_FILE)
+override_dh_auto_build:
$(WAF) build --nocache --debug full
-#override_dh_auto_test: $(WAFADMIN_FILE)
+#override_dh_auto_test:
# xvfb-run $(WAF) --nocache check
-override_dh_auto_install: $(WAFADMIN_FILE)
+override_dh_auto_install:
$(WAF) --nocache install --destdir debian/tmp
rm -f debian/tmp/usr/share/doc/midori/COPYING debian/tmp/usr/share/doc/midori/TRANSLATE
rm -f debian/tmp/usr/share/midori/res/mootools.js
ln -s /usr/share/javascript/mootools/mootools.js debian/tmp/usr/share/midori/res/mootools.js
+ install debian/$(DISTRO)-config debian/tmp/etc/xdg/midori/config
PRIORITY=$(shell sed -r -e '/DEBIAN_WWW_ALTERNATIVES_PRIORITY/ !d' -e 's/.* ([^ ]*)$$/\1/' $(CONFIG_FILE))
debian/midori.postinst: debian/midori.postinst.base
sed "s/DEBIAN_WWW_ALTERNATIVES_PRIORITY/$(PRIORITY)/g" debian/midori.postinst.base > debian/midori.postinst
-$(WAFADMIN_FILE): $(BASE_WAF) $(WAFADMIN_APPEND)
- rm -fr debian/wafadmin/ .waf-*
- $(BASE_WAF) --help >/dev/null
- cp -a ./.waf-*/wafadmin debian/
- rm -fr .waf-*
- cat $(WAFADMIN_APPEND) >> $(WAFADMIN_FILE)
-
-override_dh_clean:
- rm -fr debian/wafadmin
- $(CMD)
-
override_dh_installdeb: debian/midori.postinst
$(CMD)
+++ /dev/null
-# curl "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=43;filename=xmms2-hppa.diff;att=1;bug=558983" | grep ^+ | grep -v ^+++ | sed 's/^+//' > debian/runner-append
-
-class Serial(object):
-
- def __init__(self, bld, j=1):
- self.manager = bld.task_manager
- self.outstanding = []
-
- # progress bar
- self.total = self.manager.total()
- self.processed = 0
- self.error = 0
-
- self.switchflag = 1 # postpone
-
- self.consumers = None
-
- # warning, this one is recursive ..
- def get_next(self):
- if self.outstanding:
- t = self.outstanding.pop(0)
- self.processed += 1
- return t
-
- # handle case where only one wscript exist
- # that only install files
- if not self.manager.groups:
- return None
-
- (_, self.outstanding) = self.manager.get_next_set()
- if not self.outstanding: return None
-
- return self.get_next()
-
- def postpone(self, tsk):
- self.processed -= 1
- self.switchflag *= -1
- # this actually shuffle the list
- if self.switchflag>0: self.outstanding.insert(0, tsk)
- else: self.outstanding.append(tsk)
-
- def start(self):
- debug('runner: Serial start called')
- while 1:
- # get next Task
- tsk = self.get_next()
- if tsk is None: break
-
- if Logs.verbose: debug('runner: retrieving %r' % tsk)
-
- st = tsk.runnable_status()
- if st == ASK_LATER:
- debug('runner: postponing %r' % tsk)
- self.postpone(tsk)
- continue
-
- #continue
- if st == SKIP_ME:
- tsk.hasrun = SKIPPED
- self.manager.add_finished(tsk)
- continue
-
- tsk.position = (self.processed, self.total)
-
- # display the command that we are about to run
- tsk.generator.bld.printout(tsk.display())
-
- # run the command
- if tsk.__class__.stat: ret = tsk.__class__.stat(tsk)
- else: ret = tsk.run()
- self.manager.add_finished(tsk)
-
- # non-zero means something went wrong
- if ret:
- self.error = 1
- tsk.hasrun = CRASHED
- tsk.err_code = ret
- if Options.options.keep: continue
- else: return -1
-
- try:
- tsk.post_run()
- except OSError:
- self.error = 1
- tsk.hasrun = MISSING
- if Options.options.keep: continue
- else: return -1
- else:
- tsk.hasrun = SUCCESS
-
- if self.error:
- return -1
-
-import subprocess
-print "== Using patched Runner.py for HPPA =="
-p = subprocess.Popen(['dpkg', '--print-architecture'], stdout=subprocess.PIPE)
-arch = p.stdout.read().strip()
-p.wait()
-if arch == 'hppa':
- Parallel = Serial
projects / midori / commitdiff