r26357 - in /desktop/experimental/gnome-screensaver/debian: changelog gconf-defaults patches/01_debian_screensaver.patch patches/series rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Jan 19 22:17:40 2011
New Revision: 26357

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26357
Log:
  + debian/rules:
    - Remove obsolete configure flag.
  + debian/gconf-defaults,
    debian/patches/01_debian_screensaver.patch:
    - GConf is gone. Patch the gsettings schema to have the Debian
      screensaver by default.

Added:
    desktop/experimental/gnome-screensaver/debian/patches/01_debian_screensaver.patch
Removed:
    desktop/experimental/gnome-screensaver/debian/gconf-defaults
Modified:
    desktop/experimental/gnome-screensaver/debian/changelog
    desktop/experimental/gnome-screensaver/debian/patches/series
    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=26357&op=diff
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-screensaver/debian/changelog [utf-8] Wed Jan 19 22:17:40 2011
@@ -1,8 +1,14 @@
-gnome-screensaver (2.91.3-1) UNRELEASED; urgency=low
+gnome-screensaver (2.91.3-1) experimental; urgency=low
 
   * New upstream release.
     + debian/control.in:
       - Update build dependencies.
+    + debian/rules:
+      - Remove obsolete configure flag.
+    + debian/gconf-defaults,
+      debian/patches/01_debian_screensaver.patch:
+      - GConf is gone. Patch the gsettings schema to have the Debian
+        screensaver by default.
   * debian/control.in,
     debian/rules,
     debian/source/format:
@@ -11,7 +17,7 @@
     debian/patches/0002-add-a-gnome-3-style-panel-with-a-clock.patch:
     + Taken from upstream git, make the screensaver more GNOME 3.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 19 Jan 2011 21:10:47 +0000
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 19 Jan 2011 22:16:20 +0000
 
 gnome-screensaver (2.30.0-2) unstable; urgency=low
 

Added: desktop/experimental/gnome-screensaver/debian/patches/01_debian_screensaver.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/patches/01_debian_screensaver.patch?rev=26357&op=file
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/patches/01_debian_screensaver.patch (added)
+++ desktop/experimental/gnome-screensaver/debian/patches/01_debian_screensaver.patch [utf-8] Wed Jan 19 22:17:40 2011
@@ -1,0 +1,17 @@
+--- a/data/org.gnome.screensaver.gschema.xml.in.in
++++ b/data/org.gnome.screensaver.gschema.xml.in.in
+@@ -16,12 +16,12 @@
+       <description>Set this to TRUE to lock the screen when the screensaver goes active.</description>
+     </key>
+     <key name="mode" enum="org.gnome.screensaver.Mode">
+-      <default>'blank-only'</default>
++      <default>'single'</default>
+       <summary>Screensaver theme selection mode</summary>
+       <description>The selection mode used by screensaver.  May be "blank-only" to enable the screensaver without using any theme on activation, "single" to enable screensaver using only one theme on activation (specified in "themes" key), and "random" to enable the screensaver using a random theme on activation.</description>
+     </key>
+     <key name="themes" type="as">
+-      <default>[]</default>
++      <default>[debian-floaters]</default>
+       <summary>Screensaver themes</summary>
+       <description>This key specifies the list of themes to be used by the screensaver. It's ignored when "mode" key is  "blank-only", should provide the theme name when "mode" is "single", and should provide a list of themes when "mode" is "random".</description>
+     </key>

Modified: desktop/experimental/gnome-screensaver/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/patches/series?rev=26357&op=diff
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-screensaver/debian/patches/series [utf-8] Wed Jan 19 22:17:40 2011
@@ -1,2 +1,3 @@
 0001-remove-cancel-button-and-set-a-minimum-width.patch
 0002-add-a-gnome-3-style-panel-with-a-clock.patch
+01_debian_screensaver.patch

Modified: desktop/experimental/gnome-screensaver/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-screensaver/debian/rules?rev=26357&op=diff
==============================================================================
--- desktop/experimental/gnome-screensaver/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-screensaver/debian/rules [utf-8] Wed Jan 19 22:17:40 2011
@@ -10,7 +10,6 @@
 			--with-xscreensaverdir=/usr/share/xscreensaver/config \
 			--with-xscreensaverhackdir=/usr/lib/xscreensaver \
 			--enable-locking \
-			--with-libgl \
 			--enable-docbook-docs
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed