~ubuntu-branches/ubuntu/trusty/xscreensaver/trusty

« back to all changes in this revision

Viewing changes to debian/patches/24_hacks_xsublim_enable.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-11-30 13:33:13 UTC
  • mfrom: (1.1.8 upstream) (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091130133313-3b5nz2e7hvbb8h3l
Tags: 5.10-3ubuntu1
* Merge with Debian unstable, remaining changes: (LP: #489062)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: xscreensaver-5.08/hacks/Makefile.in
2
 
===================================================================
3
 
--- xscreensaver-5.08.orig/hacks/Makefile.in    2009-06-26 13:48:20.000000000 +1000
4
 
+++ xscreensaver-5.08/hacks/Makefile.in 2009-06-26 13:49:03.000000000 +1000
5
 
@@ -171,13 +171,13 @@
6
 
                  fontglide apple2 xanalogtv pong  wormhole \
7
 
                  pacman fuzzyflakes anemotaxis memscroller substrate \
8
 
                  intermomentary fireworkx fiberlamp boxfit interaggregate \
9
 
-                 celtic cwaves m6502 abstractile lcdscrub \
10
 
+                 celtic cwaves m6502 abstractile lcdscrub xsublim \
11
 
                  @JPEG_EXES@
12
 
 JPEG_EXES      = webcollage-helper
13
 
 
14
 
 RETIRED_EXES   = ant bubbles critical flag forest laser lightning lisa \
15
 
                  lissie lmorph rotor sphere spiral t3d vines whirlygig \
16
 
-                 worm xsublim
17
 
+                 worm
18
 
 
19
 
 HACK_OBJS_1    = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
20
 
                  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@
21
 
@@ -223,12 +223,12 @@
22
 
                  anemotaxis.man memscroller.man substrate.man \
23
 
                  intermomentary.man fireworkx.man fiberlamp.man boxfit.man \
24
 
                  interaggregate.man celtic.man cwaves.man abstractile.man \
25
 
-                 lcdscrub.man
26
 
+                 lcdscrub.man xsublim.man
27
 
 
28
 
 RETIRED_MEN    = ant.man bubbles.man critical.man flag.man forest.man \
29
 
                  laser.man lightning.man lisa.man lissie.man lmorph.man \
30
 
                  rotor.man sphere.man spiral.man t3d.man vines.man \
31
 
-                 whirlygig.man worm.man xsublim.man
32
 
+                 whirlygig.man worm.man
33
 
 
34
 
 STAR           = *
35
 
 EXTRAS         = README Makefile.in xml2man.pl m6502.sh .gdbinit \