r26800 - in /desktop/experimental/gnome-screensaver/debian: changelog control.in debian-floaters.desktop.in debian-swirl-logo.svg gnome-screensaver.dirs gnome-screensaver.install po-up/ rules

[fpeters at users.alioth.debian.org]

Author: fpeters
Date: Tue Mar  8 18:38:35 2011
New Revision: 26800

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26800
Log:
gnome-screensaver (2.91.91-1) experimental; urgency=low

  * New upstream release.
  * debian/debian-floaters.desktop.in, debian/debian-swirl-logo.svg,
    debian/gnome-screensaver.install, debian/rules, debian/po-up:
    remove Floating Debian Swirl screensaver, there is no theme support
    anymore.
  * debian/rules: remove xscreensaver hacks configure flag, ditto.
  * debian/control.in: do not suggest xscreensaver-data or rss-glx, ditto.


Added:
    desktop/experimental/gnome-screensaver/debian/gnome-screensaver.dirs
Removed:
    desktop/experimental/gnome-screensaver/debian/debian-floaters.desktop.in
    desktop/experimental/gnome-screensaver/debian/debian-swirl-logo.svg
    desktop/experimental/gnome-screensaver/debian/gnome-screensaver.install
    desktop/experimental/gnome-screensaver/debian/po-up/
Modified:
    desktop/experimental/gnome-screensaver/debian/changelog
    desktop/experimental/gnome-screensaver/debian/control.in
    desktop/experimental/gnome-screensaver/debian/rules

Modified: desktop/experimental/gnome-screensaver/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/changelog?rev=26800&op=diff
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-screensaver/debian/changelog [utf-8] Tue Mar  8 18:38:35 2011
@@ -1,3 +1,15 @@
+gnome-screensaver (2.91.91-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/debian-floaters.desktop.in, debian/debian-swirl-logo.svg,
+    debian/gnome-screensaver.install, debian/rules, debian/po-up:
+    remove Floating Debian Swirl screensaver, there is no theme support
+    anymore.
+  * debian/rules: remove xscreensaver hacks configure flag, ditto.
+  * debian/control.in: do not suggest xscreensaver-data or rss-glx, ditto.
+
+ -- Frederic Peters <fpeters at debian.org>  Tue, 08 Mar 2011 18:04:52 +0100
+
 gnome-screensaver (2.91.90-1) experimental; urgency=low
 
   * New upstream release.

Modified: desktop/experimental/gnome-screensaver/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/control.in?rev=26800&op=diff
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-screensaver/debian/control.in [utf-8] Tue Mar  8 18:38:35 2011
@@ -42,7 +42,6 @@
          gsettings-desktop-schemas (>= 0.1.7-2)
 Recommends: gnome-power-manager,
             libpam-gnome-keyring
-Suggests: xscreensaver-data, rss-glx
 Description: GNOME screen saver and locker
  gnome-screensaver is a screen saver and locker that aims to have simple,
  sane and secure defaults, and be well integrated with the GNOME desktop.

Added: desktop/experimental/gnome-screensaver/debian/gnome-screensaver.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/gnome-screensaver.dirs?rev=26800&op=file
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/gnome-screensaver.dirs (added)
+++ desktop/experimental/gnome-screensaver/debian/gnome-screensaver.dirs [utf-8] Tue Mar  8 18:38:35 2011
@@ -1,0 +1,1 @@
+/usr/share/gnome

Modified: desktop/experimental/gnome-screensaver/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/rules?rev=26800&op=diff
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-screensaver/debian/rules [utf-8] Tue Mar  8 18:38:35 2011
@@ -7,8 +7,6 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-			--with-xscreensaverdir=/usr/share/xscreensaver/config \
-			--with-xscreensaverhackdir=/usr/lib/xscreensaver \
 			--enable-locking \
 			--enable-docbook-docs
 
@@ -18,20 +16,3 @@
 	mv debian/gnome-screensaver/etc/xdg/autostart \
 		debian/gnome-screensaver/usr/share/gnome/autostart
 	rm -rf debian/gnome-screensaver/usr/share/doc/gnome-screensaver-*
-
-INFILES := $(wildcard debian/*.desktop.in)
-OUTFILES := $(INFILES:.desktop.in=.desktop)
-
-%.desktop: %.desktop.in
-	intltool-merge -d debian/po-up $< $@
-
-build/gnome-screensaver:: $(OUTFILES)
-
-clean::
-	rm -f $(OUTFILES)
-
-update-po::
-	ls $(INFILES) | sed 's#^#../#' >debian/po-up/POTFILES.in
-	cd debian/po-up && intltool-update -g debian --pot && \
-		for i in *.po; do intltool-update -g debian --dist $${i%.po}; done
-	rm -f debian/po-up/POTFILES.in