Merge branch '3.2' into 3.3

This commit is contained in:
Juergen Daubert 2016-12-13 13:41:38 +01:00
commit d01c4855f3
16 changed files with 20 additions and 18 deletions

View File

@ -29,6 +29,7 @@ drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/cups/
drwxr-xr-x root/root usr/lib/cups/backend/
-rwxr-xr-x root/root usr/lib/cups/backend/beh
lrwxrwxrwx root/root usr/lib/cups/backend/driverless -> /usr/lib/cups/driver/driverless
-rwxr-xr-x root/root usr/lib/cups/backend/implicitclass
-rwxr-xr-x root/root usr/lib/cups/backend/parallel
-rwxr-xr-x root/root usr/lib/cups/backend/serial
@ -59,7 +60,6 @@ drwxr-xr-x root/root usr/lib/cups/filter/
-rwxr-xr-x root/root usr/lib/cups/filter/texttopdf
-rwxr-xr-x root/root usr/lib/cups/filter/texttops
-rwxr-xr-x root/root usr/lib/cups/filter/texttotext
-rwxr-xr-x root/root usr/lib/cups/filter/urftopdf
-rw-r--r-- root/root usr/lib/libcupsfilters.a
-rwxr-xr-x root/root usr/lib/libcupsfilters.la
lrwxrwxrwx root/root usr/lib/libcupsfilters.so -> libcupsfilters.so.1.0.0

View File

@ -1,2 +1,2 @@
7540a6989be0042429f41770b1cdf215 cups-browsed
79c6df031cd97bfeba15edcb305063ca cups-filters-1.12.0.tar.xz
420da5444178a943d1f54dfbc3ba6759 cups-filters-1.13.0.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: cups ghostscript poppler qpdf mupdf
name=cups-filters
version=1.12.0
version=1.13.0
release=1
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed)

View File

@ -243,7 +243,7 @@ drwxr-xr-x root/root usr/share/git-core/templates/hooks/
-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-commit.sample
-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-push.sample
-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-rebase.sample
-rw-r--r-- root/root usr/share/git-core/templates/hooks/pre-receive.sample
-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-receive.sample
-rwxr-xr-x root/root usr/share/git-core/templates/hooks/prepare-commit-msg.sample
-rwxr-xr-x root/root usr/share/git-core/templates/hooks/update.sample
drwxr-xr-x root/root usr/share/git-core/templates/info/
@ -286,6 +286,7 @@ drwxr-xr-x root/root usr/share/git-gui/lib/msgs/
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/ja.msg
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/nb.msg
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/pt_br.msg
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/pt_pt.msg
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/ru.msg
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/sv.msg
-rw-r--r-- root/root usr/share/git-gui/lib/msgs/vi.msg

View File

@ -1,3 +1,3 @@
b423b29027071b520ed95af5639c16d5 git
3cd1dca37be60668f482545716923b72 git-2.10.2.tar.xz
6dc2a09d58a7aea20329b56a1efcb058 git-manpages-2.10.2.tar.xz
dd4e3360e28aec5bb902fb34dd7fce3b git-2.11.0.tar.xz
72718851626e5b2267877cc2194a1ac9 git-manpages-2.11.0.tar.xz

View File

@ -6,7 +6,7 @@
# Nice to have: tk
name=git
version=2.10.2
version=2.11.0
release=1
source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz
git)

View File

@ -27,8 +27,8 @@ drwxr-xr-x root/root usr/include/harfbuzz/
-rw-r--r-- root/root usr/include/harfbuzz/hb.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libharfbuzz.la
lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0.10303.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.10303.0
-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.10303.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0.10304.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.10304.0
-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.10304.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/harfbuzz.pc

View File

@ -1 +1 @@
97ae15a72a93f1f27324a2b8d9bd3b1d harfbuzz-1.3.3.tar.bz2
065843caf247687b94126773285bc70f harfbuzz-1.3.4.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: cairo
name=harfbuzz
version=1.3.3
version=1.3.4
release=1
source=(http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$version.tar.bz2)

View File

@ -141,6 +141,7 @@ drwxr-xr-x root/root usr/lib/mysql/plugin/
-rwxr-xr-x root/root usr/lib/mysql/plugin/auth.so
-rwxr-xr-x root/root usr/lib/mysql/plugin/auth_socket.so
-rwxr-xr-x root/root usr/lib/mysql/plugin/auth_test_plugin.so
-rwxr-xr-x root/root usr/lib/mysql/plugin/connection_control.so
-rw-r--r-- root/root usr/lib/mysql/plugin/daemon_example.ini
-rwxr-xr-x root/root usr/lib/mysql/plugin/libdaemon_example.so
-rwxr-xr-x root/root usr/lib/mysql/plugin/mypluglib.so

View File

@ -1,3 +1,3 @@
1622e62c80d128f1951a12c0125d3fb5 my.cnf
255c5781f0cbb13f0e745b21c0ae3c1c mysql-5.6.34.tar.gz
e4f170f6f73aa94c0d8da90019545908 mysql-5.6.35.tar.gz
4f3967b521f810a0a9d7daa9c81bc85d mysqld

View File

@ -4,7 +4,7 @@
# Depends on: ncurses zlib openssl cmake libaio
name=mysql
version=5.6.34
version=5.6.35
release=1
source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \
my.cnf mysqld)

View File

@ -1 +1 @@
8593f5d42648856b24bb6c62f16357f2 nano-2.7.1.tar.xz
c5bf09a488efa7c2afc6ae9b4d5c206b nano-2.7.2.tar.xz

View File

@ -5,7 +5,7 @@
# Depends on: file ncurses
name=nano
version=2.7.1
version=2.7.2
release=1
source=(http://www.nano-editor.org/dist/v2.7/$name-$version.tar.xz)

View File

@ -1 +1 @@
9b6b0aeffa089a968dd62f77b99cfd37 unrarsrc-5.3.2.tar.gz
588b3fadc04eea7372cbfe98e4709aee unrarsrc-5.4.5.tar.gz

View File

@ -5,7 +5,7 @@
# Depends on:
name=unrar
version=5.3.2
version=5.4.5
release=1
source=(http://www.rarlab.com/rar/${name}src-$version.tar.gz)