[Pkg-electronics-commits] [SCM] Package for Gwave branch, master, updated. debian/20090213-3-7-gfdf1b78

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 00019bcb49dee2877673ec1524aecba66b7ea85e
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Thu Sep 15 16:29:28 2011 +0200

    * Renamed fix_needless_linking.diff patch to fix_as-needed_linking.diff
    * Updated patch to fix test_read linking
    
    Thanks: Matthias Klose <doko at ubuntu.com>
    Closes: #641725

diff --git a/debian/patches/fix_as-needed_linking.diff b/debian/patches/fix_as-needed_linking.diff
new file mode 100644
index 0000000..ae8723c
--- /dev/null
+++ b/debian/patches/fix_as-needed_linking.diff
@@ -0,0 +1,52 @@
+Description: Reorder arguments when linking sp2sp, test_read & gwave to fix 
+ FTBFS with ld --as-needed
+Forwarded: no
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+Author: Matthias Klose <doko at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/641725
+Bug-Ubuntu: https://launchpad.net/bugs/770956
+Last-Update: 2011-09-15
+
+--- a/spicefile/Makefile.am
++++ b/spicefile/Makefile.am
+@@ -10,11 +10,9 @@
+ 
+ noinst_PROGRAMS = test_read
+ test_read_SOURCES =  test_read.c
+-test_read_LDFLAGS = @GTK_LIBS@
+-test_read_LDADD = libspicefile.a
++test_read_LDADD = libspicefile.a @GTK_LIBS@
+ 
+ bin_PROGRAMS=sp2sp
+ sp2sp_SOURCES=sp2sp.c
+-sp2sp_LDFLAGS= @GTK_LIBS@
+-sp2sp_LDADD= libspicefile.a
++sp2sp_LDADD= libspicefile.a @GTK_LIBS@
+ 
+--- 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
+@@ -186,11 +186,9 @@
+ libspicefile_a_SOURCES = spicestream.c ss_cazm.c ss_hspice.c ss_spice3.c ss_spice2.c ss_nsout.c spicestream.h wavefile.c wavefile.h spice2.h ssintern.h
+ AM_CFLAGS = @GTK_CFLAGS@
+ test_read_SOURCES = test_read.c
+-test_read_LDFLAGS = @GTK_LIBS@
+-test_read_LDADD = libspicefile.a
++test_read_LDADD = libspicefile.a @GTK_LIBS@
+ sp2sp_SOURCES = sp2sp.c
+-sp2sp_LDFLAGS = @GTK_LIBS@
+-sp2sp_LDADD = libspicefile.a
++sp2sp_LDADD = @GTK_LIBS@ libspicefile.a
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/debian/patches/fix_needless_linking.diff b/debian/patches/fix_needless_linking.diff
deleted file mode 100644
index bc6761e..0000000
--- a/debian/patches/fix_needless_linking.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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 ccbfdcf..f9c6abe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 01-fix_ascii_import_locale.diff
 fix_indirect_linking.diff
-fix_needless_linking.diff
+fix_as-needed_linking.diff

-- 
Package for Gwave