[SCM] setbfree/master: Patches applied upstream.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Fri Dec 30 19:11:54 UTC 2016


The following commit has been merged in the master branch:
commit 05ddd9665091cefd3d644c80ace7cec8aadbce36
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Dec 30 20:01:48 2016 +0100

    Patches applied upstream.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
deleted file mode 100644
index 3c1492d..0000000
--- a/debian/patches/0001-buildsystem.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix missing LDFLAGS.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: robin at gareus.org
- - Strip OPTIMIZATION out of C{,XX}FLAGS as we pass -O2 to the buildsystem by
-   default.
- - Properly set {build,link}ing flags and fix linking order.
----
- b_overdrive/Makefile |    2 +-
- src/Makefile         |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: setbfree/b_overdrive/Makefile
-===================================================================
---- setbfree.orig/b_overdrive/Makefile
-+++ setbfree/b_overdrive/Makefile
-@@ -51,7 +51,7 @@ overdrive.o: overdrive.c overdrive.h ../
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o overdrive.o overdrive.c
- 
- overmaker:$(OVMSRC) overmakerdefs.h
--	$(CC) -o $(@) $(OVMSRC) -lm
-+	$(CC) $(LDFLAGS) -o $(@) $(OVMSRC) -lm
- 
- overdrive: overmaker
- 	./overmaker > overdrive.c
-Index: setbfree/src/Makefile
-===================================================================
---- setbfree.orig/src/Makefile
-+++ setbfree/src/Makefile
-@@ -82,12 +82,12 @@ setBfree$(EXE_EXT): $(HEADERS) $(OBJS)
- 		$(LDFLAGS) $(LOADLIBES)
- 
- programd: program.c pgmParser.c program.h pgmParser.h main.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall \
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall \
- 		-DPRG_MAIN \
- 		-o $(@) program.c pgmParser.c
- 
- configd: cfgParser.c main.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall \
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall \
- 		-DCFG_MAIN \
- 		-o $(@) cfgParser.c
- 
diff --git a/debian/patches/0002-spelling.patch b/debian/patches/0002-spelling.patch
deleted file mode 100644
index c5b9b0d..0000000
--- a/debian/patches/0002-spelling.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description:  Fix spelling error
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Robin Gareus <robin at gareus.org>
-
-Index: setbfree/doc/setBfree.1
-===================================================================
---- setbfree.orig/doc/setBfree.1
-+++ setbfree/doc/setBfree.1
-@@ -230,7 +230,7 @@ Tuning temperament, gear\-ratios/motor\-
- osc.x\-precision
- D  (0.001)
- .IP
--Wave precision. Maximum allowed error when calulating wave buffer\-length for a given frequency (ideal #of samples \- discrete #of samples)
-+Wave precision. Maximum allowed error when calculating wave buffer\-length for a given frequency (ideal #of samples \- discrete #of samples)
- .TP
- osc.perc.fast
- D  (1.0)
-@@ -588,7 +588,7 @@ Filter gain
- whirl.horn.filter.a.type
- I* (0)
- .IP
--This is the first of two filters to shape the signal to be sent to the horn\-speaker; by default a low\-pass filter with negative gain to cut off high freqencies. Filter type: 0\-8. see "Filter types" below.
-+This is the first of two filters to shape the signal to be sent to the horn\-speaker; by default a low\-pass filter with negative gain to cut off high frequencies. Filter type: 0\-8. see "Filter types" below.
- .TP
- whirl.horn.filter.a.hz
- D* (4500)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4eb9654..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-buildsystem.patch
-0002-spelling.patch

-- 
setbfree packaging



More information about the pkg-multimedia-commits mailing list