← Back to branch summary

~ubuntu-branches/ubuntu/wily/morse/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/05fix_ftbfs.patch

  • Committer: Package Import Robot
  • Author(s): Nanakos Chrysostomos
  • Date: 2015-06-10 11:26:20 UTC
  • mfrom: (7.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20150610112620-q00v2tou9427gf42
Tags: 2.5-1
http://bugs.debian.org/749420
http://bugs.debian.org/784861
http://bugs.debian.org/716099
http://bugs.debian.org/716111
http://bugs.debian.org/716218
http://bugs.debian.org/716298
* New upstream release.
* Bump S-V to 3.9.6.
* Clean Lintian messages.
* Fix AlarmSet declaration and definition match (Closes: Bug#749420).
* Update watch file (Closes: Bug#784861).
* Fix build (omit morseALSA and morseLinux) for non-Linux arches
  - drop 02makefile.patch, build and install via debian/rules
* Fix -X crash (Closes: #716099, #716111, #716218, #716298)
* Adjust Maintainer/Uploaders fields

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05fix_ftbfs.patch
2
2
Author: Nanakos Chrysostomos <nanakos@wired-net.gr>
3
3
Bug-Ubuntu: https://bugs.launchpad.net/bugs/770766
4
4
 
5
 
--- morse-2.4.orig/morse.d/Makefile
6
 
+++ morse-2.4/morse.d/Makefile
 
5
--- morse-2.5.orig/morse.d/Makefile
 
6
+++ morse-2.5/morse.d/Makefile
7
7
@@ -22,7 +22,7 @@ morse:        morse${DEVICE}
8
8
        ln morse${DEVICE} $@
9
9
 
10
10
 morseX11:      morse.o beepX11.o alarm.o
11
 
-       $(CC) $(X11LIBS) -o $@ morse.o beepX11.o alarm.o
12
 
+       $(CC) -o $@ morse.o beepX11.o alarm.o $(X11LIBS)
 
11
-       $(CC) $(X11LIBS) $(LDFLAGS) -o $@ morse.o beepX11.o alarm.o
 
12
+       $(CC) $(LDFLAGS) -o $@ morse.o beepX11.o alarm.o $(X11LIBS)
13
13
 
14
14
 morseLinux:    morse.o beepLinux.o alarm.o
15
 
        $(CC) -o $@ morse.o beepLinux.o alarm.o -lm
 
15
        $(CC) $(LDFLAGS) -o $@ morse.o beepLinux.o alarm.o -lm