Merge branch '3.0' into 3.1

6 files changed, 14 insertions, 8 deletions

diff --git a/harfbuzz-icu/.footprint b/harfbuzz-icu/.footprint
index 6651b66a2..a0e86d79b 100644
--- a/harfbuzz-icu/.footprint
+++ b/harfbuzz-icu/.footprint
@@ -5,9 +5,9 @@ drwxr-xr-x	root/root	usr/include/harfbuzz/
 -rw-r--r--	root/root	usr/include/harfbuzz/hb-icu.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libharfbuzz-icu.la
-lrwxrwxrwx	root/root	usr/lib/libharfbuzz-icu.so -> libharfbuzz-icu.so.0.929.0
-lrwxrwxrwx	root/root	usr/lib/libharfbuzz-icu.so.0 -> libharfbuzz-icu.so.0.929.0
--rwxr-xr-x	root/root	usr/lib/libharfbuzz-icu.so.0.929.0
+lrwxrwxrwx	root/root	usr/lib/libharfbuzz-icu.so -> libharfbuzz-icu.so.0.930.0
+lrwxrwxrwx	root/root	usr/lib/libharfbuzz-icu.so.0 -> libharfbuzz-icu.so.0.930.0
+-rwxr-xr-x	root/root	usr/lib/libharfbuzz-icu.so.0.930.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/harfbuzz-icu.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/harfbuzz-icu/.md5sum b/harfbuzz-icu/.md5sum
index 7025b3b9a..9e4e91f68 100644
--- a/harfbuzz-icu/.md5sum
+++ b/harfbuzz-icu/.md5sum
@@ -1 +1 @@
-6251eb6d57e8c4e9e855188dbbdf8b6d  harfbuzz-0.9.29.tar.bz2
+ba0b01d285d48f20834b7de9bb4fc435  harfbuzz-0.9.30.tar.bz2
diff --git a/harfbuzz-icu/Pkgfile b/harfbuzz-icu/Pkgfile
index 8c58ba87d..2ae2b9c8c 100644
--- a/harfbuzz-icu/Pkgfile
+++ b/harfbuzz-icu/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: harfbuzz icu
 
 name=harfbuzz-icu
-version=0.9.29
+version=0.9.30
 release=1
 source=(http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$version.tar.bz2)
 
diff --git a/xscreensaver/.footprint b/xscreensaver/.footprint
index 02880f498..8b4a216d3 100644
--- a/xscreensaver/.footprint
+++ b/xscreensaver/.footprint
@@ -159,6 +159,7 @@ drwxr-xr-x	root/root	usr/lib/xscreensaver/
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/polytopes
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/pong
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/popsquares
+-rwxr-xr-x	root/root	usr/lib/xscreensaver/projectiveplane
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/providence
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/pulsar
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/pyro
@@ -195,6 +196,7 @@ drwxr-xr-x	root/root	usr/lib/xscreensaver/
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/surfaces
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/swirl
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/tangram
+-rwxr-xr-x	root/root	usr/lib/xscreensaver/tessellimage
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/thornbird
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/timetunnel
 -rwxr-xr-x	root/root	usr/lib/xscreensaver/topblock
@@ -373,6 +375,7 @@ drwxr-xr-x	root/root	usr/man/man6/
 -rw-r--r--	root/root	usr/man/man6/polyominoes.6.gz
 -rw-r--r--	root/root	usr/man/man6/polytopes.6.gz
 -rw-r--r--	root/root	usr/man/man6/pong.6.gz
+-rw-r--r--	root/root	usr/man/man6/projectiveplane.6.gz
 -rw-r--r--	root/root	usr/man/man6/providence.6.gz
 -rw-r--r--	root/root	usr/man/man6/pulsar.6.gz
 -rw-r--r--	root/root	usr/man/man6/pyro.6.gz
@@ -409,6 +412,7 @@ drwxr-xr-x	root/root	usr/man/man6/
 -rw-r--r--	root/root	usr/man/man6/surfaces.6.gz
 -rw-r--r--	root/root	usr/man/man6/swirl.6.gz
 -rw-r--r--	root/root	usr/man/man6/tangram.6.gz
+-rw-r--r--	root/root	usr/man/man6/tessellimage.6.gz
 -rw-r--r--	root/root	usr/man/man6/thornbird.6.gz
 -rw-r--r--	root/root	usr/man/man6/timetunnel.6.gz
 -rw-r--r--	root/root	usr/man/man6/topblock.6.gz
@@ -585,6 +589,7 @@ drwxr-xr-x	root/root	usr/share/xscreensaver/config/
 -rw-r--r--	root/root	usr/share/xscreensaver/config/polytopes.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/pong.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/popsquares.xml
+-rw-r--r--	root/root	usr/share/xscreensaver/config/projectiveplane.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/providence.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/pulsar.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/pyro.xml
@@ -621,6 +626,7 @@ drwxr-xr-x	root/root	usr/share/xscreensaver/config/
 -rw-r--r--	root/root	usr/share/xscreensaver/config/surfaces.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/swirl.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/tangram.xml
+-rw-r--r--	root/root	usr/share/xscreensaver/config/tessellimage.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/thornbird.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/timetunnel.xml
 -rw-r--r--	root/root	usr/share/xscreensaver/config/topblock.xml
diff --git a/xscreensaver/.md5sum b/xscreensaver/.md5sum
index 95e4c632b..763f3ad3e 100644
--- a/xscreensaver/.md5sum
+++ b/xscreensaver/.md5sum
@@ -1 +1 @@
-dd4390f36b9c9d79b66d18b145ca62ad  xscreensaver-5.26.tar.gz
+14f9104fa03f85371f885bdad956764d  xscreensaver-5.29.tar.gz
diff --git a/xscreensaver/Pkgfile b/xscreensaver/Pkgfile
index f569f735a..07a1f7216 100644
--- a/xscreensaver/Pkgfile
+++ b/xscreensaver/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://www.jwz.org/xscreensaver/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Jay Dolan, jdolan at jdolan dot dyndns dot org
-# Depends on: bc fortune libglade giflib netpbm xorg-libxmu glu
+# Depends on: bc fortune libglade giflib intltool netpbm xorg-libxmu glu
 
 name=xscreensaver
-version=5.26
+version=5.29
 release=1
 source=(http://www.jwz.org/$name/$name-$version.tar.gz)