Imported Debian patch 0.1.6-1
This commit is contained in:
Trent W. Buck
Ryan Niebur
parent
de4e9a8439
commit
a6e6928157
|
|
@ -0,0 +1,45 @@
|
|||
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 <trentbuck@gmail.com>, Thu, 20 Nov 2008 20:23:33 +1100
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
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 <trentbuck@gmail.com>, Sat, 21 Mar 2009 19:20:33 +1100
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
* Document how to use Firefox plugins.
|
||||
|
||||
* Should midori.prerm remove the alternative for $1 = upgrade?
|
||||
|
||||
Scheme48's package does this, but I can't work out where in
|
||||
debian-policy or update-alternatives(8) it says if this is right or
|
||||
wrong.
|
||||
|
||||
* Default home page should not require internet access
|
||||
|
||||
http://www.twotoasts.de/bugs/index.php?do=details&task_id=111
|
||||
|
||||
Midori might be run by users who do not have an (active) internet
|
||||
connection. For example, they might want to read the ImageMagick
|
||||
documentation, which is HTML files in /usr/share/doc/.
|
||||
|
||||
It's confusing for such users to have the default page be stored on
|
||||
the internet. This can be alleviated by simply including (and
|
||||
installing) an HTML file to be the default home page. The Debian
|
||||
Firefox (Iceweasel) packages do this.
|
||||
|
||||
* 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.
|
||||
|
|
@ -0,0 +1,240 @@
|
|||
midori (0.1.6-1) experimental; urgency=low
|
||||
|
||||
* New upstream release (Closes: #525471).
|
||||
|
||||
-- Trent W. Buck <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> Sat, 13 Dec 2008 18:00:06 +1100
|
||||
|
||||
midori (0.1.0-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Trent W. Buck <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <trentbuck@gmail.com> 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 <ema@debian.org> Thu, 07 Feb 2008 11:11:14 +0100
|
||||
|
||||
midori (0.0.13-1) experimental; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Emanuele Rocca <ema@debian.org> Tue, 04 Dec 2007 19:41:39 +0100
|
||||
|
||||
midori (0.0.12-1) experimental; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Emanuele Rocca <ema@debian.org> Fri, 30 Nov 2007 18:41:48 +0100
|
||||
|
||||
midori (0.0.11-1) experimental; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Emanuele Rocca <ema@debian.org> Fri, 16 Nov 2007 18:56:50 +0100
|
||||
|
||||
midori (0.0.10-1) experimental; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Emanuele Rocca <ema@debian.org> 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 <ema@debian.org> 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 <ema@debian.org> Sat, 15 Sep 2007 14:01:58 +0200
|
||||
|
||||
midori (0.0.6-1) experimental; urgency=low
|
||||
|
||||
* Initial release. Closes: #441838
|
||||
|
||||
-- Emanuele Rocca <ema@debian.org> Mon, 10 Sep 2007 23:37:01 +0200
|
||||
|
|
@ -0,0 +1 @@
|
|||
7
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
Source: midori
|
||||
Section: web
|
||||
Priority: optional
|
||||
Maintainer: Trent W. Buck <trentbuck@gmail.com>
|
||||
Uploaders: William Pitcock <nenolod@dereferenced.org>, Patrick Winnertz <winnie@debian.org>
|
||||
DM-Upload-Allowed: yes
|
||||
Build-Depends:
|
||||
debhelper (>= 7.2),
|
||||
quilt,
|
||||
libgtk2.0-dev (>= 2.10),
|
||||
libglib2.0-dev,
|
||||
libwebkit-dev (>= 1.1),
|
||||
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),
|
||||
# Disabled optional dependencies:
|
||||
Build-Conflicts:
|
||||
gtk-doc-tools,
|
||||
libgtksourceview2.0-dev (>= 2.0),
|
||||
libhildon-1-dev
|
||||
Standards-Version: 3.8.1
|
||||
Homepage: http://software.twotoasts.de/index.php?/pages/midori_summary.html
|
||||
|
||||
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.
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
Format-Specification:
|
||||
http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=227
|
||||
Upstream-Name: midori
|
||||
Upstream-Maintainer: Christian Dywan <christian@twotoasts.de>
|
||||
Upstream-Source: http://goodies.xfce.org/releases/midori/
|
||||
|
||||
|
||||
|
||||
Files: *
|
||||
Copyright: © 2007, Christian Dywan <christian@twotoasts.de>
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: debian/*
|
||||
Copyright: © 2007, Emanuele Rocca <ema@debian.org>
|
||||
Copyright: © 2008, Trent W. Buck <trentbuck@gmail.com>
|
||||
License: expat
|
||||
|
||||
Files: midori/gtkiconentry.?
|
||||
Copyright: © 2004, Christian Hammond
|
||||
Copyright: © 2008, Cody Russell <bratsche@gnome.org>
|
||||
License: LGPL-2+
|
||||
|
||||
Files: midori/midori-locationentry.?
|
||||
Copyright: © 2008, Dale Whittaker <dayul@users.sf.net>
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: extensions/mouse-gestures/*
|
||||
Copyright: © 2009, Matthias Kruk <mkruk@matthiaskruk.de>
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: midori-0.1.4.orig/icons/scalable/extension.svg
|
||||
Copyright: © 2008, Nancy Runge <nancy@twotoasts.de>
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: README, TRANSLATE, INSTALL, TODO, HACKING, ChangeLog,
|
||||
wscript, */wscript_build, docs/user/midori.css
|
||||
Copyright: © 2007, Christian Dywan <christian@twotoasts.de>
|
||||
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.
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
.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 <ema@debian.org> 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.
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
docs/user/*.txt
|
||||
docs/user/*.html
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
debian/tmp/*
|
||||
debian/presubj /usr/share/bug/midori/
|
||||
|
|
@ -0,0 +1 @@
|
|||
debian/midori.1
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
?package(midori):needs="x11" section="Applications/Network/Web Browsing" \
|
||||
title="Midori" command="midori"
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
case "$1" in
|
||||
configure)
|
||||
update-alternatives \
|
||||
--install /usr/bin/x-www-browser \
|
||||
x-www-browser /usr/bin/midori 50 \
|
||||
--slave /usr/share/man/man1/x-www-browser.1.gz \
|
||||
x-www-browser.1.gz /usr/share/man/man1/midori.1.gz
|
||||
;;
|
||||
esac
|
||||
#DEBHELPER#
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
case "$1" in
|
||||
remove|deconfigure)
|
||||
update-alternatives --remove x-www-browser /usr/bin/midori
|
||||
;;
|
||||
esac
|
||||
#DEBHELPER#
|
||||
exit 0
|
||||
56
debian/patches/0001-Don-t-expressly-use-libkatze-in-extensions-to-avoid.patch
vendored
Normal file
56
debian/patches/0001-Don-t-expressly-use-libkatze-in-extensions-to-avoid.patch
vendored
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
From ed2a35d70b78232562aeb1ba0158fe785916c96b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Dywan <christian@twotoasts.de>
|
||||
Date: Mon, 30 Mar 2009 00:14:43 +0200
|
||||
Subject: [PATCH] Don't expressly use libkatze in extensions to avoid -fPIC problem
|
||||
|
||||
---
|
||||
extensions/wscript_build | 1 -
|
||||
katze/wscript_build | 3 ---
|
||||
midori/wscript_build | 6 ------
|
||||
3 files changed, 0 insertions(+), 10 deletions(-)
|
||||
|
||||
Index: midori-0.1.5/extensions/wscript_build
|
||||
===================================================================
|
||||
--- midori-0.1.5.orig/extensions/wscript_build 2009-03-31 17:23:09.000000000 +1100
|
||||
+++ midori-0.1.5/extensions/wscript_build 2009-03-31 17:23:14.000000000 +1100
|
||||
@@ -26,5 +26,4 @@
|
||||
obj.includes = '..'
|
||||
obj.source = source
|
||||
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
|
||||
- obj.uselib_local = 'katze'
|
||||
obj.install_path = '${LIBDIR}/midori'
|
||||
Index: midori-0.1.5/katze/wscript_build
|
||||
===================================================================
|
||||
--- midori-0.1.5.orig/katze/wscript_build 2009-03-31 17:23:09.000000000 +1100
|
||||
+++ midori-0.1.5/katze/wscript_build 2009-03-31 17:23:14.000000000 +1100
|
||||
@@ -11,6 +11,3 @@
|
||||
obj.find_sources_in_dirs ('.')
|
||||
obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
|
||||
obj.install_path = None
|
||||
-
|
||||
-if platform.architecture ()[0] == '64bit':
|
||||
- obj.env.append_value ('CCFLAGS', '-fPIC')
|
||||
Index: midori-0.1.5/midori/wscript_build
|
||||
===================================================================
|
||||
--- midori-0.1.5.orig/midori/wscript_build 2009-03-31 17:23:09.000000000 +1100
|
||||
+++ midori-0.1.5/midori/wscript_build 2009-03-31 17:23:14.000000000 +1100
|
||||
@@ -14,9 +14,6 @@
|
||||
obj.uselib_local = 'katze'
|
||||
obj.install_path = None
|
||||
|
||||
-if platform.architecture ()[0] == '64bit':
|
||||
- obj.env.append_value ('CCFLAGS', '-fPIC')
|
||||
-
|
||||
obj = bld.new_task_gen ('cc', 'staticlib')
|
||||
obj.name = 'panels'
|
||||
obj.target = 'panels'
|
||||
@@ -26,9 +23,6 @@
|
||||
obj.uselib_local = 'midori'
|
||||
obj.install_path = None
|
||||
|
||||
-if platform.architecture ()[0] == '64bit':
|
||||
- obj.env.append_value ('CCFLAGS', '-fPIC')
|
||||
-
|
||||
obj = bld.new_task_gen ('cc', 'program')
|
||||
obj.target = 'midori'
|
||||
obj.includes = '. .. ../panels'
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
Fix #520381 - add a Debian search to the default search list.
|
||||
Index: midori-0.1.5/data/search
|
||||
===================================================================
|
||||
--- midori-0.1.5.orig/data/search 2009-03-31 17:23:08.000000000 +1100
|
||||
+++ midori-0.1.5/data/search 2009-03-31 17:23:24.000000000 +1100
|
||||
@@ -19,3 +19,10 @@
|
||||
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
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
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.
|
||||
Index: midori-0.1.6/midori/midori-websettings.c
|
||||
===================================================================
|
||||
--- midori-0.1.6.orig/midori/midori-websettings.c 2009-04-25 13:02:52.000000000 +1000
|
||||
+++ midori-0.1.6/midori/midori-websettings.c 2009-04-25 13:02:59.000000000 +1000
|
||||
@@ -550,7 +550,7 @@
|
||||
"homepage",
|
||||
_("Homepage"),
|
||||
_("The homepage"),
|
||||
- "http://www.google.com",
|
||||
+ "file:///usr/share/doc/midori/user/midori.html",
|
||||
flags));
|
||||
|
||||
/**
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
default-homepage
|
||||
add-debian-searches
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
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, /usr/lib/webkit-1.0/libexec/GtkLauncher.
|
||||
You may also wish to see if your bug has already been reported
|
||||
as a webkit bug: http://bugs.debian.org/src:webkit
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
#!/usr/bin/make -f
|
||||
%:
|
||||
dh $@
|
||||
|
||||
# http://bugs.debian.org/499225
|
||||
override_dh_auto_clean:
|
||||
./waf --nocache distclean
|
||||
# Upstream doesn't clean up after "./waf check".
|
||||
rm -rf _build_
|
||||
override_dh_auto_configure:
|
||||
./waf --nocache configure --prefix /usr
|
||||
override_dh_auto_build:
|
||||
./waf --nocache build --debug full
|
||||
override_dh_auto_test:
|
||||
./waf --nocache check
|
||||
override_dh_auto_install:
|
||||
./waf --nocache install --destdir debian/tmp
|
||||
# By deleting these two unnecessary files here, midori.install can
|
||||
# just say "install everything from /usr" instead of having to list
|
||||
# all the other files.
|
||||
rm -f debian/tmp/usr/share/doc/midori/COPYING
|
||||
rm -f debian/tmp/usr/share/doc/midori/TRANSLATE
|
||||
|
||||
override_dh_strip: # http://bugs.debian.org/510772
|
||||
dh_strip --dbg-package=midori-dbg
|
||||
|
||||
## While we wait for the Debian archive to support 3.0 (quilt).
|
||||
ifeq (,$(wildcard debian/source/format))
|
||||
include /usr/share/quilt/quilt.make
|
||||
clean: unpatch
|
||||
build binary-arch: patch
|
||||
endif
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
version=3
|
||||
http://goodies.xfce.org/releases/midori/midori-([\d.]+).tar.bz2
|
||||
Loading…
Reference in New Issue