Merge branch '3.0' into 3.1

This commit is contained in:
Danny Rawlins 2014-05-08 23:07:22 +10:00
commit 8ba8d88241
4 changed files with 14 additions and 5 deletions

View File

@ -13,7 +13,7 @@ build() {
cd $name-2014-05-06
touch data/changes.log
mkdir -p $PKG/var/www/htdocs/dokuwiki/
cp -r ./ $PKG/var/www/htdocs/dokuwiki/

View File

@ -22,6 +22,7 @@ drwxr-xr-x root/root usr/lib/midori/
-rwxr-xr-x root/root usr/lib/midori/libcopy-tabs.so
-rwxr-xr-x root/root usr/lib/midori/libdelayed-load.so
-rwxr-xr-x root/root usr/lib/midori/libdevpet.so
-rwxr-xr-x root/root usr/lib/midori/libdomain-keys.so
-rwxr-xr-x root/root usr/lib/midori/libexternal-download-manager.so
-rwxr-xr-x root/root usr/lib/midori/libfeed-panel.so
-rwxr-xr-x root/root usr/lib/midori/libflummi.so
@ -29,7 +30,9 @@ drwxr-xr-x root/root usr/lib/midori/
-rwxr-xr-x root/root usr/lib/midori/libhistory-list.so
-rwxr-xr-x root/root usr/lib/midori/libmouse-gestures.so
-rwxr-xr-x root/root usr/lib/midori/libnojs.so
-rwxr-xr-x root/root usr/lib/midori/libnotes.so
-rwxr-xr-x root/root usr/lib/midori/libnsplugin-manager.so
-rwxr-xr-x root/root usr/lib/midori/libopen-with.so
-rwxr-xr-x root/root usr/lib/midori/libshortcuts.so
-rwxr-xr-x root/root usr/lib/midori/libstatus-clock.so
-rwxr-xr-x root/root usr/lib/midori/libstatusbar-features.so
@ -70,6 +73,12 @@ drwxr-xr-x root/root usr/share/icons/hicolor/scalable/status/
drwxr-xr-x root/root usr/share/midori/
drwxr-xr-x root/root usr/share/midori/res/
-rw-r--r-- root/root usr/share/midori/res/about.css
-rw-r--r-- root/root usr/share/midori/res/adblock.list
drwxr-xr-x root/root usr/share/midori/res/adblock/
-rw-r--r-- root/root usr/share/midori/res/adblock/blocked.png
-rw-r--r-- root/root usr/share/midori/res/adblock/disabled.png
-rw-r--r-- root/root usr/share/midori/res/adblock/element_hider.js
-rw-r--r-- root/root usr/share/midori/res/adblock/enabled.png
-rw-r--r-- root/root usr/share/midori/res/autosuggestcontrol.css
-rw-r--r-- root/root usr/share/midori/res/autosuggestcontrol.js
drwxr-xr-x root/root usr/share/midori/res/bookmarks/
@ -90,6 +99,8 @@ drwxr-xr-x root/root usr/share/midori/res/nojs/
-rw-r--r-- root/root usr/share/midori/res/nojs/nojs-statusicon-allowed.png
-rw-r--r-- root/root usr/share/midori/res/nojs/nojs-statusicon-denied.png
-rw-r--r-- root/root usr/share/midori/res/nojs/nojs-statusicon-mixed.png
drwxr-xr-x root/root usr/share/midori/res/notes/
-rw-r--r-- root/root usr/share/midori/res/notes/Create.sql
-rw-r--r-- root/root usr/share/midori/res/speeddial-head.html
drwxr-xr-x root/root usr/share/midori/res/tabby/
-rw-r--r-- root/root usr/share/midori/res/tabby/Create.sql

View File

@ -1 +1 @@
93ceaa9b3b4a65f2a2738293440a8bf5 midori_0.5.7_all_.tar.bz2
b89e25e74199d705e74767499a415976 midori_0.5.8_all_.tar.bz2

View File

@ -5,13 +5,11 @@
# Depends on: cmake libnotify librsvg vala webkit xorg-libxscrnsaver libunique libzeitgeist
name=midori
version=0.5.7
version=0.5.8
release=1
source=(http://www.midori-browser.org/downloads/${name}_${version}_all_.tar.bz2)
build() {
cd $name-$version
install -d build
cd build