[Pkg-electronics-commits] [gwave] 03/10: Refreshed patches

Mon Oct 9 15:29:02 UTC 2017

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

aelmahmoudy-guest pushed a commit to branch newmaster
in repository gwave.

commit 64c2e2e14d919ddb692ac14c7743ce4a794c722c
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Mon Oct 9 03:29:59 2017 +0200

    Refreshed patches
    
    Removed 01-fix_ascii_import_locale.diff patch, applied upstream
---
 debian/patches/01-fix_ascii_import_locale.diff | 24 ------------------------
 debian/patches/fix_as-needed_linking.diff      | 24 +++++++++++++++---------
 debian/patches/fix_indirect_linking.diff       | 16 ++++++++++------
 debian/patches/series                          |  1 -
 4 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/debian/patches/01-fix_ascii_import_locale.diff b/debian/patches/01-fix_ascii_import_locale.diff
deleted file mode 100644
index cdfb12f..0000000
--- a/debian/patches/01-fix_ascii_import_locale.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Sets LC_NUMERIC to POSIX in order to avoid delimeter parsing
-  issues when data in ASCII formats.
-Origin: origin, commit: r240
-Author: Peter Clifton <pcjc2 at cam.ac.uk>
-diff -urN a/src/gwave.c b/src/gwave.c
---- a/src/gwave.c	2009-02-13 04:40:03.000000000 +0000
-+++ b/src/gwave.c	2009-11-15 14:14:39.185359393 +0000
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <assert.h>
- #include <sys/time.h>
-+#include <locale.h>
- 
- #include <gtk/gtk.h>
- #include <config.h>
-@@ -169,7 +170,7 @@
- 	init_draw();
- 	
- 	gtk_init(&argc, &argv);
--
-+	setlocale(LC_NUMERIC, "POSIX");
- 
- #ifdef HAVE_G_SLICE_SET_CONFIG
- 	/* default mode causes frequent crashes; this probably masks it rather
diff --git a/debian/patches/fix_as-needed_linking.diff b/debian/patches/fix_as-needed_linking.diff
index 102b59b..deb1ec4 100644
--- a/debian/patches/fix_as-needed_linking.diff
+++ b/debian/patches/fix_as-needed_linking.diff
@@ -8,8 +8,10 @@ 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
+Index: gwave/spicefile/Makefile.am
+===================================================================
+--- gwave.orig/spicefile/Makefile.am	2017-10-09 03:28:57.267010577 +0200
++++ gwave/spicefile/Makefile.am	2017-10-09 03:28:57.267010577 +0200
 @@ -10,11 +10,9 @@
  
  noinst_PROGRAMS = test_read
@@ -24,20 +26,24 @@ Last-Update: 2011-09-15
 -sp2sp_LDADD= libspicefile.a
 +sp2sp_LDADD= libspicefile.a @GTK_LIBS@
  
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -55,7 +55,7 @@
+Index: gwave/src/Makefile.in
+===================================================================
+--- gwave.orig/src/Makefile.in	2017-10-09 03:28:57.267010577 +0200
++++ gwave/src/Makefile.in	2017-10-09 03:28:57.267010577 +0200
+@@ -57,7 +57,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@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
---- a/spicefile/Makefile.in
-+++ b/spicefile/Makefile.in
-@@ -186,11 +186,9 @@
+Index: gwave/spicefile/Makefile.in
+===================================================================
+--- gwave.orig/spicefile/Makefile.in	2017-10-09 03:28:57.267010577 +0200
++++ gwave/spicefile/Makefile.in	2017-10-09 03:28:57.267010577 +0200
+@@ -190,11 +190,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
diff --git a/debian/patches/fix_indirect_linking.diff b/debian/patches/fix_indirect_linking.diff
index 0605b58..d714977 100644
--- a/debian/patches/fix_indirect_linking.diff
+++ b/debian/patches/fix_indirect_linking.diff
@@ -3,9 +3,11 @@ Bug: https://sourceforge.net/p/gwave/bugs/4/
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554762
 Forwarded: https://sourceforge.net/p/gwave/bugs/_discuss/thread/a51ed87d/3541/attachment/fix_indirect_linking.diff
 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
---- a/remote/Makefile.in
-+++ b/remote/Makefile.in
-@@ -168,9 +168,9 @@
+Index: gwave/remote/Makefile.in
+===================================================================
+--- gwave.orig/remote/Makefile.in	2017-10-09 03:26:35.782444107 +0200
++++ gwave/remote/Makefile.in	2017-10-09 03:26:35.738443930 +0200
+@@ -172,9 +172,9 @@
  EXTRA_DIST = README
  AM_CFLAGS = @GTK_CFLAGS@ 
  gwave_exec_SOURCES = gwave-exec.c xgclient.c xgexec.h
@@ -17,9 +19,11 @@ Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourcef
  all: all-am
  
  .SUFFIXES:
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -189,7 +189,7 @@
+Index: gwave/src/Makefile.in
+===================================================================
+--- gwave.orig/src/Makefile.in	2017-10-09 03:26:35.782444107 +0200
++++ gwave/src/Makefile.in	2017-10-09 03:26:35.742443947 +0200
+@@ -221,7 +221,7 @@
  	rgeval.c xgserver.c measurebtn.c measurebtn.h \
  	GtkTable_indel.c GtkTable_indel.h  xsnarf.h
  
diff --git a/debian/patches/series b/debian/patches/series
index 05cd743..6f1718a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-fix_ascii_import_locale.diff
 fix_indirect_linking.diff
 fix_as-needed_linking.diff
 guile2.0.diff

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

