debian/0000755000000000000000000000000012054114053007161 5ustar debian/midori.docs0000644000000000000000000000004111673367374011337 0ustar docs/user/*.txt docs/user/*.html debian/TODO0000644000000000000000000000204611673367374007701 0ustar * Document how to use Firefox plugins. * Remove runtime dependency on dbus-launch. http://www.twotoasts.de/bugs/index.php?do=details&task_id=113 When building binary packages for Debian, I can either - Build without libunique. Then midori works for everyone, but running "midori foo" on the command line results in a new midori process. - Build with libunique. Then midori doesn't start unless there is a session dbus, or dbus-launch can be used to create one: $ midori; echo $? (midori:2128): Unique-DBus-WARNING **: Unable to open a connection to the session bus: Failed to execute dbus-launch to autolaunch D-Bus session (midori:2128): Unique-DBus-WARNING **: Unable to connect to the running instance, aborting. An instance of Midori is already running but not responding. 1 $ env | grep DBUS $ Neither choice particularly appeals to me. Please sort out the code so that when built with libunique, midori will fall back to the "unique-less" behaviour when there is no session dbus. debian/Ubuntu-config0000644000000000000000000000010511673367374011653 0ustar [settings] homepage=file:///usr/share/ubuntu-artwork/home/index.html debian/patches/0000755000000000000000000000000011673367374010636 5ustar debian/patches/series0000644000000000000000000000002411673367374012047 0ustar add-debian-searches debian/patches/add-debian-searches0000644000000000000000000000073511673367374014331 0ustar diff --git a/data/search b/data/search index e759642..59341ee 100644 --- a/data/search +++ b/data/search @@ -27,3 +27,17 @@ name=The Free Dictionary text=Dictionary, Encyclopedia and Thesaurus uri=http://www.thefreedictionary.com/%s 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 debian/copyright0000644000000000000000000002513711673367374011152 0ustar Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=227 Upstream-Name: midori Upstream-Maintainer: Christian Dywan Upstream-Source: http://goodies.xfce.org/releases/midori/ Files: * Copyright: © 2007-2010, Christian Dywan License: LGPL-2.1+ Files: tests/magic-uri.c Copyright: © 2007-2009, Christian Dywan Copyright (C) 2009 Alexander Butenko License: LGPL-2.1+ Files: midori/midori-view.c Copyright: Copyright (C) 2007-2010 Christian Dywan Copyright (C) 2009 Jean-François Guchens License: LGPL-2.1+ Files: data/speeddial-head.html Copyright: Copyright (C) 2009 Jean-François Guchens License: LGPL-2.1+ Files: data/mootools.js Copyright: Copyright (c) 2006-2009 Valerio Proietti License: MIT Files: extensions/addons.c Copyright: Copyright (C) 2008 Christian Dywan Copyright (C) 2008-2010 Arno Renevier License: LGPL-2.1+ Files: colorful-tabs Copyright: Copyright (C) 2009 Christian Dywan Copyright (C) 2010 Samuel Creshal License: LGPL-2.1+ Files: extensions/adblock.c Copyright: Copyright (C) 2009-2010 Christian Dywan Copyright (C) 2009 Alexander Butenko License: LGPL-2.1+ Files: extensions/cookie-manager.c extensions/cookie-manager/* Copyright: Copyright (C) 2009 Enrico Tröger License: LGPL-2.1+ Files: extensions/feed-panel/* Copyright: Copyright (C) 2009-2010 Dale Whittaker License: LGPL-2.1+ Files: debian/* Copyright: © 2007, Emanuele Rocca © 2008, Trent W. Buck 2009, Ryan Niebur License: expat Files: po/gl.po Copyright: Copyright (C) 2008, 2009 Miguel Anxo Bouzada. Copyright (C) 2009-2010 Leandro Regueiro. License: LGPL-2.1+ Files: po/sv.po Copyright: Copyright (C) 2008, 2009 Free Software Foundation, Inc. License: LGPL-2.1+ Files: katze/katze-http-cookies.c Copyright: Copyright (C) 2008-2009 Christian Dywan Copyright (C) 2008 Xan Lopez Copyright (C) 2008 Dan Winship License: LGPL-2.1+ Files: katze/katze-arrayaction.c Copyright: Copyright (C) 2008-2009 Christian Dywan Copyright (C) 2009 Enrico Tröger License: LGPL-2.1+ Files: midori/socket.c Copyright: Copyright 1999-2008 Hiroyuki Yamamoto Copyright 2006-2009 Enrico Tröger License: LGPL-2.1+ Files: katze/katze-utils.c Copyright: Copyright (C) 2007-2009 Christian Dywan Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald Copyright 2000 Red Hat, Inc. License: LGPL-2.1+ Files: katze/katze-utils.h Copyright: Copyright (C) 2008-2009 Christian Dywan Copyright (C) 2009 Dale Whittaker Copyright (C) 2008 Dale Whittaker Copyright (C) 2009 Jérôme Geulfucci License: LGPL-2.1+ Files: extensions/formhistory.c Copyright: Copyright (C) 2009 Alexander Butenko Copyright (C) 2009 Christian Dywan License: LGPL-2.1+ Files: katze/katze-preferences.c Copyright: Copyright (C) 2007-2009 Christian Dywan License: LGPL-2.1+ Files: katze/katze-preferences.h Copyright: Copyright (C) 2008-2009 Christian Dywan License: LGPL-2.1+ Files: katze/katze-scrolled.c, katze/katze-scrolled.h Copyright: Copyright (C) 2007 Henrik Hedberg Copyright (C) 2009 Nadav Wiener Copyright (C) 2009 Christian Dywan License: LGPL-2.1+ Files: midori/midori-extension.c Copyright: Copyright (C) 2008-2009 Christian Dywan Copyright (C) 2009 Dale Whittaker License: LGPL-2.1+ Files: midori/midori-locationaction.c Copyright: Copyright (C) 2008-2010 Christian Dywan Copyright (C) 2008-2010 Dale Whittaker License: LGPL-2.1+ Files: midori/gtkiconentry.? Copyright: © 2004, Christian Hammond © 2008, Cody Russell (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald Modified by the GTK+ Team and others 1997-2000 License: LGPL-2+ Files: extensions/mouse-gestures.c Copyright: Copyright (C) 2009 Matthias Kruk Copyright (C) 2009-2010 Christian Dywan License: LGPL-2.1+ Files: extensions/status-clock.c Copyright: Copyright (C) 2010 Arno Renevier License: LGPL-2.1+ Files: extensions/tab-switcher.c Copyright: Copyright (C) 2009 André Stösel License: LGPL-2.1+ Files: midori/midori.vapi Copyright: Copyright (C) 2010 Christian Dywan License: expat Files: tools/check-style Copyright: Copyright (C) 2010 Christian Dywan Copyright (C) 2010 Arno Renevier License: LGPL-2.1+ Files: tools/midori-dev Copyright: Copyright (C) 2010 David Mohr License: LGPL-2.1+ Files: extensions/web-cache.c Copyright: Copyright (C) 2009 Christian Dywan Copyright (C) 2009 Alexander Butenko License: LGPL-2.1+ Files: icons/scalable/extension.svg Copyright: © 2008, Nancy Runge License: LGPL-2.1+ Files: midori/sokoke.c Copyright: Copyright (C) 2009 Dale Whittaker Copyright (C) 2009 Alexander Butenko Copyright (C) 2009 Mario Sanchez Prada Copyright (C) 2009 Dan Winship License: LGPL-2.1+ Files: extensions/toolbar-editor.c Copyright: Copyright (C) 2009 Enrico Tröger License: LGPL-2.1+ Files: README, TRANSLATE, INSTALL, TODO, HACKING, ChangeLog, wscript, */wscript_build, docs/user/midori.css Copyright: © 2007, Christian Dywan License: expat Files: waf Copyright: © 2005, Thomas Nagy License: BSD-C3 License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . See /usr/share/common-licenses/LGPL-2.1 for the full license text. License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . See /usr/share/common-licenses/LGPL-2 for the full license text. License: expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. License: BSD-C3 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/presubj.in0000644000000000000000000000062211673367374011211 0ustar Sometimes a problem in Midori is caused by a bug in the rendering engine, Webkit. Please take a moment to try to reproduce bugs with the Webkit test browser, %GTKLAUNCHER%. If you are able to reproduce your bug in the Webkit test browser, report the bug against %LIBWEBKIT_PKG% instead. You may also wish to see if your bug has already been reported as a webkit bug: http://bugs.debian.org/src:webkit debian/midori.preinst0000644000000000000000000000030211673367374012073 0ustar #!/bin/sh set -e dpkg-maintscript-helper mv_conffile \ /etc/xdg/midori/extensions/libadblock.so/config \ /etc/xdg/midori/extensions/adblock/config \ 0.4.1-2 midori -- "$@" #DEBHELPER# exit 0 debian/waf-unpack0000755000000000000000000000251212054072544011153 0ustar #!/usr/bin/env python # This program extracts waf-binary # # Please refer the following link for more details: # http://wiki.debian.org/UnpackWaf # from os import path, rename, remove, chmod import sys import shutil basedir = path.join(path.dirname(path.abspath(__file__)), "..") targetdir = sys.argv[1] skip = False waf = open(path.join(targetdir, "waf"), "r") unp = open(path.join(basedir, "debian/wafunp.py"), "w") shutil.copyfile(path.join(basedir, "debian/waf-unpack"), path.join(basedir, "debian/waf-unpack.bup")) thisfile = open(path.join(basedir, "debian/waf-unpack"), "a") for l in waf: if l == "#==>\n": skip = True thisfile.write(l) elif l == "#<==\n": skip = False thisfile.write(l) elif not skip: unp.write(l) else: thisfile.write(l) waf.close() unp.close() thisfile.close() import wafunp rename(path.join(basedir, "debian/.%s-%s-%s" % (wafunp.WAF, wafunp.VERSION, wafunp.REVISION)), path.join(targetdir, "waf-modules")) rename(path.join(basedir, "debian/waf-unpack.bup"), path.join(basedir, "debian/waf-unpack")) chmod(path.join(basedir, "debian/waf-unpack"), 0744) remove(path.join(targetdir, "waf-modules/t.bz2")) remove(path.join(basedir, "debian/wafunp.pyc")) rename(path.join(basedir, "debian/wafunp.py"), path.join(targetdir, "waf-unpacked")) chmod(path.join(targetdir, "waf-unpacked"), 0744) debian/rules0000755000000000000000000000547112054014222010245 0ustar #!/usr/bin/make -f LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) CFLAGS=$(shell dpkg-buildflags --get CFLAGS) LDFLAGS+=-Wl,--as-needed -Wl,-O1 # waf, thank you _so_ much export LINKFLAGS=$(LDFLAGS) export CCFLAGS=$(CFLAGS) export DEB_BUILD_HARDENING=1 CMD=$(shell echo $@ | sed 's/override_//') LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkitgtk-dev | grep Depends | sed -r 's/.*(libwebkitgtk[^ ]+).*/\1/') GTKLAUNCHER=$(shell dpkg-query -L $(LIBWEBKIT_PKG) | grep GtkLauncher) DISTRO=$(shell lsb_release -is) CONFIG_FILE=debian/config/$(DISTRO).h ifneq (0, $(shell test -e $(CONFIG_FILE); echo "$$?")) DISTRO=Debian endif %: dh $@ upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg)?.*$$/\1/p') dfsg_version = $(upstream_version)+dfsg upstream_pkg = "midori" pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') get-orig-source: uscan --rename --download-current-version --destdir=. tar -xjf $(pkg)_$(upstream_version).orig.tar.bz2 rm -f $(pkg)_$(upstream_version).orig.tar.bz2 mv $(upstream_pkg)-$(upstream_version) $(pkg)_$(dfsg_version).orig $(CURDIR)/debian/waf-unpack $(pkg)_$(dfsg_version).orig rm $(pkg)_$(dfsg_version).orig/waf tar -cjf $(CURDIR)/../$(pkg)_$(dfsg_version).orig.tar.bz2 $(pkg)_$(dfsg_version).orig rm -r $(pkg)_$(dfsg_version).orig WAF=WAFDIR=waf-modules ./waf-unpacked debian/presubj: debian/presubj.in @echo "presubj parameters:" @echo "Replacing %LIBWEBKIT_PKG% with $(LIBWEBKIT_PKG)" @echo "Replacing %GTKLAUNCHER% with $(GTKLAUNCHER)" test -f "/var/lib/dpkg/info/$(LIBWEBKIT_PKG).list" test -f "$(GTKLAUNCHER)" test -n "$(GTKLAUNCHER)" sed -e "s,%LIBWEBKIT_PKG%,$(LIBWEBKIT_PKG),g" -e "s,%GTKLAUNCHER%,$(GTKLAUNCHER),g" $@.in > $@ override_dh_install: debian/presubj $(CMD) --fail-missing override_dh_auto_clean: $(WAF) --nocache distclean rm -rf _build_ rm -rf .waf* rm -rf .lock-wscript rm -rf `find waf-modules -name "*.pyc"` override_dh_auto_configure: $(WAF) --nocache configure --debug-level=none --prefix /usr override_dh_auto_build: $(WAF) build --nocache -v #override_dh_auto_test: # xvfb-run $(WAF) --nocache check 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 install -m 0644 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 override_dh_installdeb: debian/midori.postinst $(CMD) override_dh_strip: $(CMD) --dbg-package=midori-dbg override_dh_installchangelogs: rm -f debian/midori/usr/share/doc/midori/ChangeLog dh_installchangelogs ChangeLog debian/midori.manpages0000644000000000000000000000002011673367374012177 0ustar debian/midori.1 debian/midori.postinst.base0000644000000000000000000000107311673367374013211 0ustar #!/bin/sh set -e case "$1" in configure) update-alternatives \ --install /usr/bin/x-www-browser \ x-www-browser /usr/bin/midori DEBIAN_WWW_ALTERNATIVES_PRIORITY \ --slave /usr/share/man/man1/x-www-browser.1.gz \ x-www-browser.1.gz /usr/share/man/man1/midori.1.gz ;; esac dpkg-maintscript-helper mv_conffile \ /etc/xdg/midori/extensions/libadblock.so/config \ /etc/xdg/midori/extensions/adblock/config \ 0.4.1-2 midori -- "$@" rmdir /etc/xdg/midori/extensions/libadblock.so || true #DEBHELPER# exit 0 debian/compat0000644000000000000000000000000211673367374010405 0ustar 7 debian/README.Debian0000644000000000000000000000271011673367374011250 0ustar Midori for Debian ================= Missing Icons ------------- Based on conversation with the author, and the faq entries cited below, I do not think Midori will be changed upstream to use only "stock" GTK icons. * There are missing icons/ warnings The set of themed icons Midori can use is very limited. For instance icons for a new tab or the throbber are not guaranteed to be available. To fix this, install a Freedesktop.org spec compliant icon theme, such as Tango or Gnome, or one that is compatible with these. * Tweaking Midori on the Gtk level If you don't have a desktop application that takes care of Gtk settings or if your interface doesn't support a particular feature, you can modify any settings easily manually by specifying them in a text file called ~/.gtkrc-2.0 or /etc/gtk-2.0/gtkrc: Use Tango as a fallback for your icon theme: gtk-icon-theme = "MySuperFancyTheme" gtk-fallback-icon-theme = "Tango" -- http://wiki.xfce.org/midori_faq Therefore I will add document this state of affairs in README.Debian and add the following header to debian/control: Recommends: gnome-icon-theme This seems to be in line with what other packages currently do (e.g. galeon). I am choosing not to include a whole bunch of alternatives in the Recommendation because I don't want to have to keep that list of alternatives accurate. -- Trent W. Buck , Thu, 20 Nov 2008 20:23:33 +1100 debian/midori.10000644000000000000000000000206111673367374010553 0ustar .TH MIDORI "1" "September 2007" "midori 0.0.6" "User commands" .SH NAME midori \- fast and lightweight web browser .SH SYNOPSIS .PP \fBmidori\fR [OPTION...] [URL] .SH DESCRIPTION \fBmidori\fR is a lightweight web browser. .SH OPTIONS .IP .SS "Application Options:" .TP \fB\-v\fR, \fB\-\-version\fR Display program version .TP \fB\-\-display\fR=\fIDISPLAY\fR X display to use .SS "Help Options:" .TP \-?, \fB\-\-help\fR Show help options .TP \fB\-\-help\-all\fR Show all help options .TP \fB\-\-help\-gtk\fR Show GTK+ Options .SH REPORTING BUGS Please report comments, suggestions and bugs to christian@twotoasts.de .PP Check for new versions at: http://software.twotoasts.de .SH AUTHOR \fBMidori\fR is copyright (C) 2007 Christian Dywan. .PP This manual page was written by Emanuele Rocca for the Debian GNU/Linux system (but may be used by others). .PP Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. debian/midori.postrm0000644000000000000000000000030211673367374011733 0ustar #!/bin/sh set -e dpkg-maintscript-helper mv_conffile \ /etc/xdg/midori/extensions/libadblock.so/config \ /etc/xdg/midori/extensions/adblock/config \ 0.4.1-2 midori -- "$@" #DEBHELPER# exit 0 debian/watch0000644000000000000000000000016512054014002010205 0ustar version=3 opts=dversionmangle=s/\+dfsg// \ http://archive.xfce.org/src/apps/midori/([\d\.]+)/midori-([\d.]+).tar.bz2 debian/changelog0000644000000000000000000004475712054103222011050 0ustar midori (0.4.3+dfsg-0.1) unstable; urgency=low * Non-maintainer upload * Repack to extract waf script (Closes: 645191) * debian/waf-unpack - add to describe how to extract waf script * debian/rules - add get-orig-source target -- Koichi Akabe Sat, 24 Nov 2012 17:33:35 +0900 midori (0.4.3-1) unstable; urgency=low * New upstream release. -- Yves-Alexis Perez Mon, 19 Dec 2011 00:26:46 +0100 midori (0.4.2-1) unstable; urgency=low * New upstream release. * debian/midori.{preinst,postinst,postrm}: - handle adblock configuration file rename. -- Yves-Alexis Perez Mon, 14 Nov 2011 14:26:25 +0100 midori (0.4.1-2) unstable; urgency=low * debian/control: - update libwebkitgtk-dev build-dep to 1.4.3 * As a side effect, the rebuild against webkit 1.6.1 fix midori crashing because of missing webkit_web_view_get_selected_text() closes: #646198 -- Yves-Alexis Perez Sat, 22 Oct 2011 14:46:34 +0200 midori (0.4.1-1) unstable; urgency=low * New upstream release. - fix middle click on back/forward button. closes: #644840 - correctly clear private data on quit when asked. closes: #644658 * debian/patches: - 0001-Fix-for-Bug-819688 dropped, included upstream. * debian/control: - drop libjs-mootools from depends, it's not needed anymore. * debian/rules: - don't remove mootools.js since it's not even shipped anymore. -- Yves-Alexis Perez Mon, 10 Oct 2011 08:24:46 +0200 midori (0.4.0-2) unstable; urgency=low * debian/patches: - 0001-Fix-for-Bug-819688 added, correctly restore tab panel when needed. -- Yves-Alexis Perez Tue, 06 Sep 2011 09:30:33 +0200 midori (0.4.0-1) unstable; urgency=low * New upstream release. * debian/control: - bump webkit build-dep to 1.1.17. - bump valac build-dep to 0.10. -- Yves-Alexis Perez Tue, 02 Aug 2011 09:44:09 +0200 midori (0.3.6-2) unstable; urgency=low * debian/rules: - don't install upstream changelog twice. closes: #614692 * debian/Debian-config: - update homepage to point to faq.html. * debian/control: - build-dep on libwebkitgtk-dev instead of libwebkit-dev. -- Yves-Alexis Perez Tue, 26 Jul 2011 00:24:23 +0200 midori (0.3.6-1) unstable; urgency=low * New upstream release. * debian/control: - update vcs info. -- Yves-Alexis Perez Mon, 16 May 2011 08:32:33 +0200 midori (0.3.5-1) unstable; urgency=low * New upstream release. * debian/control: - add myself to uploaders... - update standards version to 3.9.2. -- Yves-Alexis Perez Mon, 02 May 2011 21:50:53 +0200 midori (0.3.3-0.1) unstable; urgency=low * Non-maintainer upload. * New upstream release. * debian/rules: - install ChangeLog file as changelog and remove the one installed by make install. * debian/control: - drop dpkg PreDepends. -- Yves-Alexis Perez Tue, 15 Mar 2011 22:36:00 +0100 midori (0.3.2-0.1) unstable; urgency=low * Non-maintainer upload. * New upstream release. - fix bookmarks multiplication. closes: #613739 * debian/patches: - 0001-Only-no-adblock-if-main-frame-in-provisional-state dropped, included upstream. -- Yves-Alexis Perez Sun, 20 Feb 2011 10:50:11 +0100 midori (0.3.0-1.3) unstable; urgency=low * Non-maintainer upload. * debian/control: - replace hardening-includes build-dep by hardening-wrapper. * debian/rules: - enable hardening. -- Yves-Alexis Perez Fri, 04 Feb 2011 09:01:07 +0100 midori (0.3.0-1.2) unstable; urgency=low * Non-maintainer upload. * debian/patches: - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix adblock extension. closes: #611682 * debian/rules: - remove .lock-script in clean target. -- Yves-Alexis Perez Wed, 02 Feb 2011 21:01:25 +0100 midori (0.3.0-1.1) unstable; urgency=low * Non-maintainer upload. * New upstream release. * debian/rules: - 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 - add -O1 to LDFLAGS. * 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 Mon, 31 Jan 2011 17:49:21 +0100 midori (0.2.7-1.1) unstable; urgency=low * Non-maintainer upload. [Ryan Niebur] * New Upstream Version (Closes: #582213) - fixes segfault (Closes: #579118) - correct link to FAQ (Closes: #582512) * refresh patches * update copyright * use dpkg-maintscript-helper to remove old config file /etc/midori/extensions/libadblock.so (Closes: #573208) [Yves-Alexis Perez] * New 2.7 upstream release. * debian/watch edited to correctly track upstream versions. * debian/rules: - use --fail-missing in dh_install * debian/control: - add build-dep on valac to build certain extensions. - update standards version to 3.9.1 -- Yves-Alexis Perez Tue, 17 Aug 2010 22:11:21 +0200 midori (0.2.4-3) unstable; urgency=low * don't run the tests * add debian/source/format * fix building in Serial mode (on HPPA) -- Ryan Niebur Sun, 18 Apr 2010 23:41:50 -0700 midori (0.2.4-2) unstable; urgency=low * use a patched waf for hppa, thanks to Jakub Wilk (Closes: #559989) -- Ryan Niebur Mon, 29 Mar 2010 00:39:30 -0700 midori (0.2.4-1) unstable; urgency=low * New Upstream Version - update d/copyright - handles files in current dir correctly (Closes: #565329) * use bundled waf again (Closes: 571709) * set Standards-Version to 3.8.4 -- Ryan Niebur Sun, 07 Mar 2010 22:28:54 -0800 midori (0.2.2-1) unstable; urgency=low * New Upstream Version (Closes: #556184, #558339) - fixes local uri handling (Closes: #560866, #550844) - move libnotify from Recommends to Build-Deps to follow upstream - update debian/copyright to match upstream changes - fixes handling of URLs like "some.url?%00" (Closes: #561451) - running twice doesn't crash the browser (Closes: #514435) - Ctrl-w on last tab now closes it but still not the browser (Closes: #545251) - Ctrl-u in urlbar with emacs key binding theme works (Closes: #538327) * move libjs-mootools to Recommends, it's not required (Closes: #547584) * tell the user to report the bug against libwebkit-1.0-2 if they reproduce it in the Webkit test browser. Figure out the package name and the path to GtkLauncher automagically during build. (Closes: #562501) * switch to system waf - the FTBFS #559989 is no longer the fault of anything in my package, and I've set #561130 in the BTS to affect midori, so (Closes: #559989) * refresh patch -- Ryan Niebur Thu, 24 Dec 2009 18:30:46 -0800 midori (0.2.0-1) unstable; urgency=low * New Upstream Version (Closes: 551328, 551513) * update debian/copyright * bump libwebkit-dev build-dep to 1.1.15 for adblock (Closes: 546985) * update my email address and remove DMUA field -- Ryan Niebur Sun, 18 Oct 2009 15:44:22 -0700 midori (0.1.10-1) unstable; urgency=low * New upstream release * use mootools.js from the libjs-mootools package -- Ryan Niebur Tue, 15 Sep 2009 22:46:55 -0700 midori (0.1.9-1) unstable; urgency=low * fix watch file, thanks to Rogério Brito * New Upstream Version (Closes: #541354) - refresh patches - update copyright * fix Homepage field, thanks to Francesco Poli (Closes: #541414) * improve bugs search to work for packages too, thanks to Denis Laxalde for the suggestion (Closes: #542050) * Debian Policy 3.8.3 -- Ryan Niebur Wed, 02 Sep 2009 15:36:37 -0700 midori (0.1.8-1) unstable; urgency=low * New Upstream Version - refresh patches - enable tests - update debian/copyright * Debian Policy 3.8.2 -- Ryan Niebur Sat, 01 Aug 2009 09:07:30 -0700 midori (0.1.7-1) unstable; urgency=low * New Upstream Version * adopt package: set myself as maintainer, remove uploaders (Closes: #528731) * rearrange the debian/rules file * use xvfb for tests, but disable them, they don't work right * use 'dh --with quilt' for patching instead of including /usr/share/quilt/quilt.make * fix format of debian/copyright * build dep on debhelper 7.0.50 instead of 7.2 * add debian bts to the list of searches, thanks to Giuseppe for the patch (Closes: #525991) * refresh patches * change the default-homepage patch to use the files in debian/config/ to set the default homepage based on whether it's debian, ubuntu, etc (second half of ubuntu diff) * also set a priority number for the alternative in the distro config file. This sets it to 50 for debian, and 39 for ubuntu (just under firefox). This addresses the other half of the ubuntu diff. * add recommends on libnotify1 * update copyright information * remove extra file, debian/patches/0001-Don-t-expressly-use-libkatze- in-extensions-to-avoid.patch * remove some old todo items from debian/TODO -- Ryan Niebur Fri, 29 May 2009 20:31:09 -0700 midori (0.1.6-1) experimental; urgency=low * New upstream release (Closes: #525471). -- Trent W. Buck Sat, 25 Apr 2009 11:09:59 +1000 midori (0.1.5-1) experimental; urgency=low * New upstream release (Closes: #522549). * Cherry-pick -fPIC fix from upstream's git and remove previous kludge from debian/rules (Closes: #518281). * Don't allow linking with incompatibly old libsoup (Closes: #522436). * Use new "debug" section for midori-dbg. * As Midori is still immature, reduce its priority as an x-www-browser alternatives. Mainly this is to keep Ubuntu's iceweasel users happy. Long-term, I should collaborate with the other x-www-browser providers to agree on a numbering system (e.g. by popcon popularity). Currently it is as follows: 20 conkeror, 30 chimera2, 50 dillo, 50 midori, 69 xlinks2, 70 iceweasel, 70 kazehakase, 85 epiphany-gecko, 100 konqueror, 100 netsurf, 120 galeon -- Trent W. Buck Sun, 05 Apr 2009 14:07:42 +1000 midori (0.1.4-2) experimental; urgency=low * Always use -fPIC. (Closes: #518281). * Force rebuild with newer dependencies, to see what happens. The next upstream release will require these version bumps anyway. * Bump libsoup dependency to 2.25.2. * Bump webkit dependency to 1.1 (Closes: #519854, #519123). * Bump libunique dependency to 1.0.6 (Closes: #509801). Note that 1.0.2 should work: only 1.0.4 is bad. * Reintroduce quilt while we wait for the 3.0 source format. * Add a Debian search to the default search list (Closes: #520381). * Make the homepage a local file. See patch header for rationale. * Use new dh 7.2 "overrides" style. * Update copyright file. * Remove stale CDBS dependency. * Bump standards version to 3.8.1. No changes necessary. -- Trent W. Buck Sat, 21 Mar 2009 21:39:05 +1100 midori (0.1.4-1) unstable; urgency=low * New upstream release. * Use dh(1). * New dependency (libidn11-dev) and undependency (libhildon-1-dev). * Install /etc/xdg/midori/search. -- Trent W. Buck Mon, 09 Mar 2009 22:29:12 +1100 midori (0.1.2-1) unstable; urgency=low [ Trent W. Buck ] * New upstream release (Closes: #512788). Paraphrasing upstream's blog post: * Support for bookmarklets (javascript in bookmarks). * Links with target=_blank now work (opening a new tab). * With recent versions of libsoup and webkit, cookies can persist between sessions. * Preferences or bookmarks are saved to disk as they are changed. * The first time Midori is run after a crash, it will first display a "rescue" dialog allowing preferences to be edited or scripts disabled. This is intended for when a script causes Midori to crash as it boots, which would otherwise require editing config files by hand to fix. * Significant speed and capacity improvements to browsing history. * Appease lintian regarding various warnings. * Update feature list in Description. * Make me the Maintainer and William and Uploader. * Rewrite manpage. [ William Pitcock ] * Fix lintian source warnings concerning midori-dbg. * Update my e-mail address. -- Trent W. Buck Sat, 31 Jan 2009 14:24:16 +1100 midori (0.1.1-1) unstable; urgency=low * New upstream release. From upstream's blog post: * Integration of history completion in the location entry. * libSoup is used in place of GIO for loading icons, viewing sources, saving files, and for the first time icons are actually cached on disk. * The side panel gained a compact mode to take up considerably less space. Bookmarks in the toolbar finally match the menu and the panel at any time. * The Web Inspector [in] WebKitGtk is now supported. * The beginning of unit testing. * The ground work for an extension interface has been done, extension modules can be written in C at the moment. Bindings to Lua and/ or Python are planned for the future. Note that the side panel doesn't currently expose the extension management, but the Page holder was actually rewritten as one of the example extensions. * Change build dependency to libsoup (from gvfs and gtksourceview). * Rewrite manpage and package description. -- Trent W. Buck Sat, 13 Dec 2008 18:00:06 +1100 midori (0.1.0-1) unstable; urgency=low * New upstream release -- Trent W. Buck Fri, 24 Oct 2008 15:42:29 +1100 midori (0.0.21+23-1) UNRELEASED; urgency=low * Upstream snapshot. * TODO: .po issue fixed upstream (FS: 114). * TODO: Help > Contents now browses to FAQ (FS: 112). -- Trent W. Buck Thu, 18 Sep 2008 11:07:19 +1000 midori (0.0.21-1) unstable; urgency=low * New upstream release (Closes: #497647). * control: add new upstream dependencies. * control: Bump Standards-Version to 3.8.0 (no changes). We were actually already using the Homepage header field. * control, compat, rules: bump debhelper to 7, because I'm a bit paranoid about claiming to build with dh4.1. Fix dh_strip args in rules file since the semantics changed in dh5. * README.Debian: discuss "missing" icons. * control: recommend gnome-icon-theme (Closes: #494061). * control: fix homepage link (Closes: #492687). * control: provide www-browser (Closes: #476178). Not adding www-browser alternative since other X-based browsers seem to only set the x-www-browser alternative. * watch: fixed. Upstream tarballs now hosted by XFCE, yay! * presubj, install: have users try GtkLauncher before reporting bugs. * midori.menu: add (Closes: #466588). * midori.install: install .mo and .png files! * control: allow DM uploads, since I'll soon be a DM. -- Trent W. Buck Mon, 15 Sep 2008 22:10:35 +1000 midori (0.0.19-2) unstable; urgency=low * Add build dependency on python (for ./waf). -- Trent W. Buck Wed, 13 Aug 2008 12:30:27 +1000 midori (0.0.19-1) unstable; urgency=low * New upstream release * Upstream uses waf now. Dirty hacks to make CDBS do waf. * Drop the homepage patch, since it wasn't being unapplied correctly and it doesn't really accomplish anything like the desired behaviour in debian/TODO. -- Trent W. Buck Sun, 10 Aug 2008 22:18:52 +1000 midori (0.0.18-2) unstable; urgency=low * Change release to unstable, per William Pitcock's request. -- Trent W. Buck Sun, 08 Jun 2008 13:32:23 +1000 midori (0.0.18-1) experimental; urgency=low * New upstream release * debian/control (Build-Depends): accommodate name change in webkit. * debian/control (Build-Depends): appease lintian by dropping -1. * debian/control (Build-Depends): add libxml-parser-perl. * debian/control (Homepage): add. * debian/control (Maintainer, Uploaders): change (Closes: #480026). * debian/copyright: appease lintian by citing copyright verbatim. * debian/midori.prerm, debian/midori.postrm: tweak cases where update-alternatives is called, hopefully making them more correct. * debian/rules: remove config.log to appease lintian. * debian/watch: add (Closes: #482002). -- Trent W. Buck Sat, 07 Jun 2008 15:00:06 +1000 midori (0.0.17-1) experimental; urgency=low * New upstream release. Closes: #457392 - Fix issues with the preference dialog. Closes: #454206 * Provide an alternative for x-www-browser. Closes: #454607 * Update Standards-Version. -- Emanuele Rocca Thu, 07 Feb 2008 11:11:14 +0100 midori (0.0.13-1) experimental; urgency=low * New upstream release -- Emanuele Rocca Tue, 04 Dec 2007 19:41:39 +0100 midori (0.0.12-1) experimental; urgency=low * New upstream release -- Emanuele Rocca Fri, 30 Nov 2007 18:41:48 +0100 midori (0.0.11-1) experimental; urgency=low * New upstream release -- Emanuele Rocca Fri, 16 Nov 2007 18:56:50 +0100 midori (0.0.10-1) experimental; urgency=low * New upstream release -- Emanuele Rocca Sat, 13 Oct 2007 10:45:09 +0200 midori (0.0.8-1) experimental; urgency=low * New upstream release * Patched to build correctly against webkit 0~svn26044-1 * libwebkitgdk has been renamed to libwebkitgtk, build dependency updated accordingly -- Emanuele Rocca Tue, 09 Oct 2007 22:42:25 +0200 midori (0.0.7-1) experimental; urgency=low * New upstream release. * Added minori-dbg binary package. * Improved long description. -- Emanuele Rocca Sat, 15 Sep 2007 14:01:58 +0200 midori (0.0.6-1) experimental; urgency=low * Initial release. Closes: #441838 -- Emanuele Rocca Mon, 10 Sep 2007 23:37:01 +0200 debian/midori.prerm0000644000000000000000000000023411673367374011540 0ustar #!/bin/sh set -e case "$1" in remove|deconfigure) update-alternatives --remove x-www-browser /usr/bin/midori ;; esac #DEBHELPER# exit 0 debian/source/0000755000000000000000000000000011673367374010507 5ustar debian/source/format0000644000000000000000000000001411673367374011715 0ustar 3.0 (quilt) debian/control0000644000000000000000000000444511673367374010621 0ustar Source: midori Section: web Priority: optional Maintainer: Ryan Niebur Uploaders: Yves-Alexis Perez Build-Depends: debhelper (>= 7.0.50), lsb-release, libgtk2.0-dev (>= 2.10), libglib2.0-dev, libwebkitgtk-dev (>= 1.4.3), libxml2-dev (>= 2.6), # For waf: python, # Optional dependencies: intltool, libidn11-dev, librsvg2-bin, libsqlite3-dev, libunique-dev (>= 1.0.6), python-docutils, libsoup2.4-dev (>= 2.25.2), libnotify-dev, valac (>= 0.10), # For testing under xvfb: xvfb, xauth, xfonts-base, hardening-wrapper, libxss-dev # Disabled optional dependencies: Build-Conflicts: gtk-doc-tools, libgtksourceview2.0-dev (>= 2.0), libhildon-1-dev Standards-Version: 3.9.2 Homepage: http://www.twotoasts.de/index.php?/pages/midori_summary.html Vcs-Git: git://git.debian.org/collab-maint/midori.git Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary Package: midori Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11 Recommends: gnome-icon-theme Provides: www-browser # For http://bugs.debian.org/522436 (missing symbols): Conflicts: libsoup2.4-1 (<< 2.25.2) Description: fast, lightweight graphical web browser Midori is a lightweight web browser based on WebKit. . Its features include: . * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. * Flexibly configurable Web Search. * User scripts and user styles support. * Straightforward bookmark management. * Customizable and extensible interface. * Support for extensions (written in C). * Custom context menu actions. Package: midori-dbg Architecture: any Priority: extra Section: debug Depends: ${shlibs:Depends}, ${misc:Depends}, midori (= ${binary:Version}) Description: fast, lightweight graphical web browser (debug symbols) Midori is a lightweight web browser based on WebKit. . Its features include: . * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. * Flexibly configurable Web Search. * User scripts and user styles support. * Straightforward bookmark management. * Customizable and extensible interface. * Support for extensions (written in C). * Custom context menu actions. . This package contains the debugging symbols for midori. debian/Debian-config0000644000000000000000000000007311673367374011557 0ustar [settings] homepage=file:///usr/share/doc/midori/faq.html debian/config/0000755000000000000000000000000011673367374010454 5ustar debian/config/Debian.h0000644000000000000000000000020411673367374012003 0ustar #define DEBIAN_DISTRO_DEFAULT_HOMEPAGE "file:///usr/share/doc/midori/user/midori.html" #define DEBIAN_WWW_ALTERNATIVES_PRIORITY 50 debian/config/Ubuntu.h0000644000000000000000000000020711673367374012106 0ustar #define DEBIAN_DISTRO_DEFAULT_HOMEPAGE "file:///usr/share/ubuntu-artwork/home/index.html" #define DEBIAN_WWW_ALTERNATIVES_PRIORITY 39 debian/clean0000644000000000000000000000007511673367374010216 0ustar midori/midori-debian.h debian/midori.postinst debian/presubj debian/midori.menu0000644000000000000000000000015511673367374011361 0ustar ?package(midori):needs="x11" section="Applications/Network/Web Browsing" \ title="Midori" command="midori" debian/midori.install0000644000000000000000000000006311673367374012061 0ustar debian/tmp/* debian/presubj /usr/share/bug/midori/ debian/README.source0000644000000000000000000000341111673367374011365 0ustar I'm using the following to roll local snapshot releases. To make the initial checkout: git clone git://git.xfce.org/kalikiana/midori midori && apt-get source midori && cd midori && zcat ../midori*.diff.gz | patch -p1 To update and roll a .deb: debuild clean && git pull && v=$(git describe --tags) && v=${v%-*} && v=${v//-/+} && dch -v $v-1 'New upstream snapshot.' && tar --exclude .git --exclude debian -lzma -cf ../${PWD##*/}_$v.orig.tar.lzma -C .. ${PWD##*/} && mkdir -p debian/source && echo '3.0 (quilt)' >debian/source/format && pdebuild Midori has a large number of optional dependencies; I have made some of them build dependencies based on what I think is widely useful. The easiest way to build your own custom binary without such support is to move the appropriate entries from Build-Depends to Build-Conflicts in debian/control. - gtk-doc-tools: API documentation. - python-docutils: HTML user documentation (from plain text). - intltool: localized UI text (menu titles and such). - libunique-dev: turns midori into a client/server arrangement, where subsequent calls will open windows in the first midori. - libsoup2.4-dev: view source code and favicons and "save as". - libsqlite3-dev: persistent history. Without this, browsing history is lost when you quit midori. Possibly also relevant for bookmarks, I'm not sure. Compiles OK with libsqlite0-dev, but history isn't persistent. - librsvg2-bin: create PNG icons from SVG source at compile time. This avoids needing to rasterize the SVGs on the fly each time midori is run. - libidn11-dev: internationalized domain names. - libhildon-1-dev: an alternative to GTK2, for embedded systems. -- Trent W. Buck , Sat, 21 Mar 2009 19:20:33 +1100