← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/20_hacks_maze_xpm_libs.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
https://launchpad.net/bugs/489062
* 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:
debian/patches/20_hacks_maze_xpm_libs.patch
 
1
Index: xscreensaver/hacks/Makefile.in
 
2
===================================================================
 
3
--- xscreensaver.orig/hacks/Makefile.in 2009-09-08 23:42:16.000000000 +0200
 
4
+++ xscreensaver/hacks/Makefile.in      2009-09-08 23:42:18.000000000 +0200
 
5
@@ -592,7 +592,7 @@
 
6
        $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 
7
 
 
8
 maze:          maze.o          $(HACK_OBJS) $(ERASE) $(LOGO)
 
9
-       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(ERASE) $(LOGO) $(HACK_LIBS)
 
10
+       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(ERASE) $(LOGO) $(HACK_LIBS) $(XPM_LIBS)
 
11
 
 
12
 moire:         moire.o         $(HACK_OBJS) $(COL) $(SHM)
 
13
        $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(SHM) $(HACK_LIBS)