[Pkg-electronics-commits] [SCM] Package for Gwave branch, master, updated. debian/20090213-1-16-gb5a7c8d

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit b5a7c8db313e969241a4bcbb6bafea8e62d9a836
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Wed Apr 7 23:02:51 2010 +0200

    Added fix_needless_linking.diff patch to reorder arguments when linking
    sp2sp & gwave so LDFLAGS would operate.

diff --git a/debian/changelog b/debian/changelog
index 8cac72e..13f057b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ gwave (20090213-3) unstable; urgency=low
       http://lists.alioth.debian.org/pipermail/pkg-electronics-devel/2010-April/001827.html
     + Bumped Standards-Version to 3.8.4, no changes needed.
   * Removed files that were left over from previous releases.
+  * Added fix_needless_linking.diff patch to reorder arguments when
+    linking sp2sp & gwave so LDFLAGS would operate.
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Wed, 07 Apr 2010 15:07:14 +0200
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Wed, 07 Apr 2010 23:04:15 +0200
 
 gwave (20090213-2) unstable; urgency=low
 
diff --git a/debian/patches/fix_indirect_linking.diff b/debian/patches/fix_indirect_linking.diff
index c2edf63..7e29753 100644
--- a/debian/patches/fix_indirect_linking.diff
+++ b/debian/patches/fix_indirect_linking.diff
@@ -1,7 +1,7 @@
 Description: Provide -lX11 when linking gwave, gwave-exec & gwave-repl
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554762
 Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2899748&group_id=211903&atid=1019623
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
 --- a/remote/Makefile.in
 +++ b/remote/Makefile.in
 @@ -168,9 +168,9 @@
diff --git a/debian/patches/fix_needless_linking.diff b/debian/patches/fix_needless_linking.diff
new file mode 100644
index 0000000..bc6761e
--- /dev/null
+++ b/debian/patches/fix_needless_linking.diff
@@ -0,0 +1,28 @@
+Description: Reorder arguments when linking sp2sp & gwave so LDFLAGS would
+ operate.
+Forwarded: no
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -55,7 +55,7 @@
+ 	GtkTable_indel.$(OBJEXT)
+ gwave_OBJECTS = $(am_gwave_OBJECTS)
+ gwave_DEPENDENCIES = ../spicefile/libspicefile.a
+-gwave_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gwave_LDFLAGS) \
++gwave_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+--- a/spicefile/Makefile.in
++++ b/spicefile/Makefile.in
+@@ -189,8 +189,8 @@
+ test_read_LDFLAGS = @GTK_LIBS@
+ test_read_LDADD = libspicefile.a
+ sp2sp_SOURCES = sp2sp.c
+-sp2sp_LDFLAGS = @GTK_LIBS@
+-sp2sp_LDADD = libspicefile.a
++sp2sp_LDFLAGS =
++sp2sp_LDADD = @GTK_LIBS@ libspicefile.a
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
index 2e74e23..ccbfdcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-fix_ascii_import_locale.diff
 fix_indirect_linking.diff
+fix_needless_linking.diff

-- 
Package for Gwave