~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2

« back to all changes in this revision

Viewing changes to debian/patches/62_ubuntu-texturl-fridge.patch

  • Committer: Bazaar Package Importer
  • Author(s): Tormod Volden
  • Date: 2008-03-06 11:01:03 UTC
  • Revision ID: james.westby@ubuntu.com-20080306110103-3jm7pd3b316l8zqo
Tags: 5.04-4ubuntu1
* Merge from debian unstable, remaining changes: (LP: #201626)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
  - 91_ubuntu-no-pam-conf: don't ship pam.conf
  - 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
    file for what it is to not confuse it with gnome-screensaver
  - debian/rules: don't hide the xscreensaver desktop icon if the
    user insists on installing xscreensaver (LP: #86416)
  - 54_drivers_demogtk.patch: Patching a compile failure with
    GTK+ in Hardy
  - 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
    TIFFs so that they're the right direction
  - debian/control: Increasing the GTK+ version to 2.12 for the patch
    28_rotate.patch
  - glslideshow.desktop: Changing so that it shows only one image, one
    time and no extra black on the edges.
* Fixed upstream:
  - install xscreensaver-properties.desktop to right place (LP: #201481)
  - remove planetary-gears screensaver (LP: #196360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: xscreensaver-5.04/driver/XScreenSaver.ad.in
2
 
===================================================================
3
 
--- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in    2007-12-09 18:36:14.000000000 +0100
4
 
+++ xscreensaver-5.04/driver/XScreenSaver.ad.in 2007-12-09 18:36:22.000000000 +0100
5
 
@@ -60,7 +60,7 @@
6
 
 *textLiteral:          XScreenSaver
7
 
 *textFile:             @DEFAULT_TEXT_FILE@
8
 
 *textProgram:          fortune
9
 
-*textURL:              http://www.livejournal.com/stats/latest-rss.bml
10
 
+*textURL:              http://fridge.ubuntu.com/node/feed
11
 
 
12
 
 *overlayTextForeground:        #FFFF00
13
 
 *overlayTextBackground:        #000000