← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xdm/trusty

« back to all changes in this revision

Viewing changes to debian/patches/ftbfs_binutils-gold.diff

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2011-12-09 03:00:26 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20111209030026-baa9vul2hhtujjxh
Tags: 1:1.1.11-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  - debian/{rules, xdm.install, local/ubuntu*}:
    + Add Ubuntu graphics and configure xdm to use them by default.
  - debian/patches/ubuntu_no_whiteglass.diff: Don't hardcode
    the default Xcursor theme to whiteglass. Use the Ubuntu
    default x-cursor-theme instead.

* Drop debian/patches/ftbfs_binutils-gold.diff: Fixed upstream
* Change Vcs-* to XS-Debian-Vcs-*
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ftbfs_binutils-gold.diff
1
 
Description: Fix FTBFS due to binutils-gold. Link against -lXext -lXrender -lXau.
2
 
Bug-Debian: http://bugs.debian.org/556694
3
 
Author: Artur Rona <ari-tczew@ubuntu.com>
4
 
 
5
 
diff -Nru -x '*~' xdm-1.1.10.orig/Makefile.am xdm-1.1.10/Makefile.am
6
 
--- xdm-1.1.10.orig/Makefile.am 2010-04-10 03:49:03.000000000 +0200
7
 
+++ xdm-1.1.10/Makefile.am      2010-11-27 01:08:27.000000000 +0100
8
 
@@ -33,7 +33,7 @@
9
 
 #
10
 
 
11
 
 xdm_CFLAGS = $(XDM_CFLAGS)
12
 
-xdm_LDADD = $(XDM_LIBS) $(XDM_LDFLAGS)
13
 
+xdm_LDADD = $(XDM_LIBS) $(XDM_LDFLAGS) -lXext -lXrender -lXau -lXmu
14
 
 
15
 
 xdm_SOURCES =  \
16
 
         auth.c \