Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
	xscreensaver/debian/control

diff --git a/xscreensaver/debian/changelog b/xscreensaver/debian/changelog
index 036f79c..dcbb006 100644 (file)
--- a/xscreensaver/debian/changelog
+++ b/xscreensaver/debian/changelog
@@ -1,3 +1,9 @@
+xscreensaver (5.11-1+maemo2) stable-proposed-updates; urgency=high
+
+  * Fixed problem with icons 
+
+ -- Vlad Vasiliev <vlad@gas.by>  Fri, 13 Aug 2010 15:13:57 -0400
+
 xscreensaver (5.11-1+maemo1) stable-proposed-updates; urgency=high
 
   * Adapted for Maemo and LiveWallpaper

diff --git a/xscreensaver/debian/control b/xscreensaver/debian/control
index 84c2bf5..4dc010c 100644 (file)
--- a/xscreensaver/debian/control
+++ b/xscreensaver/debian/control
@@ -2,7 +2,7 @@ Source: xscreensaver
 Section: user/desktop
 Priority: optional
 Maintainer: Vlad Vasiliev <vlad@gas.by>
-Build-Depends: bc, debhelper (>= 4.0), libgtk2.0-dev, libgl1-mesa-dev | libgl-dev, freeglut3-dev, xutils-dev, libgnome2-dev, libxml2-dev, libglade2-dev, libjpeg62-dev, libgles2-sgx-img-dev | libgles2-dev, intltool, autotools-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxss-dev, libxt-dev, libxtst-dev, libxxf86vm-dev, x11proto-core-dev, quilt, libxss-dev, libxtst-dev
+Build-Depends: bc, debhelper (>= 4.0), libgtk2.0-dev, libgl1-mesa-swx11-dev, freeglut3-dev, xutils-dev, libgnome2-dev, libxml2-dev, libglade2-dev, libjpeg62-dev, libgles2-sgx-img-dev | libgles2-dev, intltool, autotools-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxss-dev, libxt-dev, libxtst-dev, libxxf86vm-dev, x11proto-core-dev, quilt, libxss-dev, libxtst-dev
 Standards-Version: 3.8.0
 Homepage: http://www.jwz.org/xscreensaver/
 Vcs-git: git://git.debian.org/git/collab-maint/xscreensaver.git

diff --git a/xscreensaver/debian/xscreensaver.files b/xscreensaver/debian/xscreensaver.files
index 5e721a0..5564b19 100644 (file)
--- a/xscreensaver/debian/xscreensaver.files
+++ b/xscreensaver/debian/xscreensaver.files
@@ -390,6 +390,6 @@ usr/share/livewp/external_themes/xrayswarm.xml
 usr/share/livewp/external_themes/xsnow.xml
 usr/share/livewp/external_themes/xspirograph.xml
 usr/share/livewp/external_themes/zoom.xml
-usr/share/livewp/external_icons/icon.png
-usr/share/livewp/external_icons/icond.png
+usr/share/livewp/external_icons/xscreensaver.png
+usr/share/livewp/external_icons/xscreensaverd.png