[Pkg-wmaker-commits] [wmbatppc] 08/35: Imported Debian patch 2.5-5

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbatppc.

commit f94a75e6d57a19e11f84cce925cf8e3e41f85cb0
Author: Julien BLACHE <jblache at debian.org>
Date:   Fri Dec 2 13:01:03 2011 +0000

    Imported Debian patch 2.5-5
---
 debian/changelog                    | 10 ++++++++++
 debian/patches/fix_link_order.patch | 19 +++++++++++++++++++
 debian/patches/series               |  1 +
 debian/source/format                |  1 +
 4 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ca1a71f..927ae68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+wmbatppc (2.5-5) unstable; urgency=low
+
+  * Switch to source format 3.0 (quilt).
+
+  * debian/patches/fix_link_order.patch:
+    + Fix link order for ld --as-needed, patch from Colin Watson
+      (closes: #650276). 
+
+ -- Julien BLACHE <jblache at debian.org>  Fri, 02 Dec 2011 13:01:03 +0000
+
 wmbatppc (2.5-4) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/fix_link_order.patch b/debian/patches/fix_link_order.patch
new file mode 100644
index 0000000..5cec444
--- /dev/null
+++ b/debian/patches/fix_link_order.patch
@@ -0,0 +1,19 @@
+Description: fix link order to list libraries after objects
+ Build fails with ld --as-needed because the libraries are listed after
+ the objects that use them.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/650276
+
+Index: wmbatppc-2.5/Makefile
+===================================================================
+--- wmbatppc-2.5.orig/Makefile	2003-07-23 14:58:42.000000000 +0000
++++ wmbatppc-2.5/Makefile	2011-12-02 10:39:03.000000000 +0000
+@@ -18,7 +18,7 @@
+ 	$(CC) -I/usr/X11R6/share/include $(FLAGS) -c -Wall wmbatppc.c -o $*.o
+ 
+ wmbatppc: $(OBJS) wmbatppc.o
+-	$(CC) $(FLAGS) -o wmbatppc $(OBJS) -lXext $(LIBDIR) $(LIBS) wmbatppc.o
++	$(CC) $(FLAGS) -o wmbatppc wmbatppc.o $(OBJS) -lXext $(LIBDIR) $(LIBS)
+ 
+ all:: wmbatppc
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7558707
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_link_order.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbatppc.git