removed dependos on lbpmag

diff --git a/xscreensaver/debian/control b/xscreensaver/debian/control
index da3290c..84c2bf5 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, libpam0g-dev (>= 0.72), 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-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
 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/rules b/xscreensaver/debian/rules
index 8b4eb54..8ae295b 100755 (executable)
--- a/xscreensaver/debian/rules
+++ b/xscreensaver/debian/rules
@@ -43,7 +43,7 @@ build-stamp:
        # Configure for xscreensaver
        ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \
                --prefix=/usr \
-               --without-gl --with-pam --with-gtk --without-kerberos \
+               --without-gl --with-gtk --without-kerberos \
                --with-hackdir=/usr/lib/xscreensaver \
                --with-configdir=/usr/share/xscreensaver/config \
                --mandir=/usr/share/man --with-login-manager \

diff --git a/xscreensaver/debian/xscreensaver.postinst b/xscreensaver/debian/xscreensaver.postinst
index ac84ccd..503ae6a 100644 (file)
--- a/xscreensaver/debian/xscreensaver.postinst
+++ b/xscreensaver/debian/xscreensaver.postinst
@@ -2,34 +2,5 @@
 
 set -e
 
-#fix up our old screwup
-if dpkg-divert --list  /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop | grep -q "diversion of /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop to /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop.orig by xscreensaver"; then
-       rm -f /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-       rm -f /usr/share/control-center/Desktop/screensaver-properties.desktop
-       dpkg-divert --package xscreensaver --remove --rename --divert \
-               /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop.orig \
-               /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-       dpkg-divert --package xscreensaver --remove --rename --divert \
-               /usr/share/control-center/Desktop/screensaver-properties.desktop.orig \
-               /usr/share/control-center/Desktop/screensaver-properties.desktop
-fi
-
-# remove old link if it exists
-if [ -L /usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; then
-       rm /usr/X11R6/lib/X11/app-defaults/XScreenSaver
-fi
-
-# Use the correct app defaults
-cd /etc/X11/app-defaults
-if [ -f XScreenSaver-gl ]; then
-       ln -sf XScreenSaver-gl  XScreenSaver
-else
-       ln -sf XScreenSaver-nogl XScreenSaver
-fi
-
-# Remove /usr/doc symlink
-if [ -d /usr/doc -a -h /usr/doc/xscreensaver -a -d /usr/share/doc/xscreensaver ]; then
-        rm -f /usr/doc/xscreensaver
-fi
 
 #DEBHELPER#