Package: fspanel
Version: 0.7-9
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Update 30-makefile.patch to place libs in the proper place.
Fixes FTBFS. (LP: #770750)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru fspanel-0.7/debian/patches/30-makefile.patch fspanel-0.7/debian/patches/30-makefile.patch
--- fspanel-0.7/debian/patches/30-makefile.patch 2009-12-20 14:38:29.000000000 -0500
+++ fspanel-0.7/debian/patches/30-makefile.patch 2011-09-13 17:44:58.000000000 -0400
@@ -8,10 +8,10 @@
Makefile | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
-diff --git a/Makefile b/Makefile
-index eaf7345..a52fc19 100644
---- a/Makefile
-+++ b/Makefile
+Index: fspanel-0.7/Makefile
+===================================================================
+--- fspanel-0.7.orig/Makefile 2011-09-13 17:43:22.000000000 -0400
++++ fspanel-0.7/Makefile 2011-09-13 17:44:57.000000000 -0400
@@ -1,14 +1,17 @@
CC = gcc
-C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I/usr/X11R6/include -m386 -malign-loops=2 -malign-jumps=2 -malign-functions=2
@@ -24,7 +24,7 @@
$(PROGNAME): Makefile fspanel.c fspanel.h icon.xpm
- $(CC) $(C_FLAGS) $(L_FLAGS) fspanel.c -o $(PROGNAME)
- @ls -l $(PROGNAME)
-+ $(CC) $(C_FLAGS) $(L_FLAGS) $(EXTRA_CFLAGS) fspanel.c -o $(PROGNAME)
++ $(CC) $(C_FLAGS) $(EXTRA_CFLAGS) fspanel.c -o $(PROGNAME) $(L_FLAGS)
-clean:
+clean:
@@ -36,6 +36,3 @@
+ install -m 755 $(PROGNAME) $(DESTDIR)/usr/bin
+ install -d -m 755 $(DESTDIR)/usr/share/man/man1
+
---
-1.6.5
-
