Skip to content

Commit

Permalink
merge patched into master
Browse files Browse the repository at this point in the history
  • Loading branch information
MestreLion committed Nov 9, 2012
2 parents e6928c1 + ff61c84 commit 4a45446
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ CC = gcc
TARGET = wavegain
DEFS = -DHAVE_CONFIG_H
LIBS = -lm
SOURCES = $(shell echo *.c)
HEADERS = $(shell echo *.h)
SOURCES := $(wildcard *.c)
HEADERS := $(wildcard *.h)

prefix = /usr/local
bindir = $(prefix)/bin
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Copyright owners in the source files.
Originally released as LGPL-2.1 or later, although some source code simply says
GPL, and some others some says GPL2+. Despite this, the project as a whole
should be regarded as LGPL-2.1+, as per COPYING file. To avoid further confusion
in the future, I suggested source files be standartized with a common header and
in the future, I suggest source files be standartized with a common header and
re-licensed, preferably as GPL-3 or later (not LGPL).

I claim no copyright over the C source code, including patches I made.
Expand Down
4 changes: 2 additions & 2 deletions debian/.git-dpm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
da911d9df759b5c83071d7877e8025fcf37a505e
da911d9df759b5c83071d7877e8025fcf37a505e
ff61c84aa8720dc85bc6ad5d031f554231e3ca11
ff61c84aa8720dc85bc6ad5d031f554231e3ca11
885af9d4b0c102ef77bf1ef2a92a30cd224d4f97
885af9d4b0c102ef77bf1ef2a92a30cd224d4f97
wavegain_1.3.1.orig.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions debian/patches/0001-add-Makefile.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9e22f121a62e7de0f5b778fe396bf6d807c8bd5d Mon Sep 17 00:00:00 2001
From eea0f9e05e834bc287b9d28c286c5a9244724e3a Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Fri, 5 Oct 2012 05:24:25 -0300
Subject: add Makefile
Expand All @@ -19,7 +19,7 @@ sage for your changes. Lines starting

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7f80b00
index 0000000..2e60b31
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,35 @@
Expand All @@ -29,8 +29,8 @@ index 0000000..7f80b00
+TARGET = wavegain
+DEFS = -DHAVE_CONFIG_H
+LIBS = -lm
+SOURCES = $(shell echo *.c)
+HEADERS = $(shell echo *.h)
+SOURCES := $(wildcard *.c)
+HEADERS := $(wildcard *.h)
+
+prefix = /usr/local
+bindir = $(prefix)/bin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fe1e169651013308f307ecc1949fb37ada4dff9c Mon Sep 17 00:00:00 2001
From c6713772ff51d1e88eb4c0ba028a3b3308f9887a Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Fri, 5 Oct 2012 05:46:36 -0300
Subject: add manual
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6c49eaa6799857221382c7504e1a674c73fb6b89 Mon Sep 17 00:00:00 2001
From 35d90914e348ffabc5336067814afbcff2e3c972 Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Tue, 9 Oct 2012 01:12:40 -0300
Subject: create output tempfile in a secure way and in same directory as
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b245afab544fc8809ab3d5f6ade951d869b59ba7 Mon Sep 17 00:00:00 2001
From b3a09c085a2dcf87dd121adec7ba5f7179ed4362 Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Wed, 10 Oct 2012 08:46:13 -0300
Subject: fix all GCC's default warnings, release now compiles cleanly
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7aa6cd896b0c3ab62f6c35dd23b8a2fef4cdb396 Mon Sep 17 00:00:00 2001
From b61b7ad387fbb8cba9759804df2b8419be28fa58 Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Tue, 16 Oct 2012 21:30:15 -0300
Subject: fix several GCC -Wall warnings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From da911d9df759b5c83071d7877e8025fcf37a505e Mon Sep 17 00:00:00 2001
From 0206aea8f20d7ff0bb807ad9e50f4c442dbf84bf Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Wed, 17 Oct 2012 06:34:47 -0300
Subject: add TODO
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bb636146237618b874e5636d3320d8b43c239bdd Mon Sep 17 00:00:00 2001
From ff61c84aa8720dc85bc6ad5d031f554231e3ca11 Mon Sep 17 00:00:00 2001
From: MestreLion <[email protected]>
Date: Fri, 5 Oct 2012 05:25:12 -0300
Subject: add README
Expand All @@ -10,7 +10,7 @@ Subject: add README

diff --git a/README b/README
new file mode 100644
index 0000000..3b77fe0
index 0000000..3235199
--- /dev/null
+++ b/README
@@ -0,0 +1,179 @@
Expand Down Expand Up @@ -105,7 +105,7 @@ index 0000000..3b77fe0
+Originally released as LGPL-2.1 or later, although some source code simply says
+GPL, and some others some says GPL2+. Despite this, the project as a whole
+should be regarded as LGPL-2.1+, as per COPYING file. To avoid further confusion
+in the future, I suggested source files be standartized with a common header and
+in the future, I suggest source files be standartized with a common header and
+re-licensed, preferably as GPL-3 or later (not LGPL).
+
+I claim no copyright over the C source code, including patches I made.
Expand Down
12 changes: 6 additions & 6 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
0001-add-Makefile.patch
0002-add-README.patch
0003-add-manual.patch
0004-create-output-tempfile-in-a-secure-way-and-in-same-d.patch
0005-fix-all-GCC-s-default-warnings-release-now-compiles-.patch
0006-fix-several-GCC-Wall-warnings.patch
0007-add-TODO.patch
0002-add-manual.patch
0003-create-output-tempfile-in-a-secure-way-and-in-same-d.patch
0004-fix-all-GCC-s-default-warnings-release-now-compiles-.patch
0005-fix-several-GCC-Wall-warnings.patch
0006-add-TODO.patch
0007-add-README.patch

0 comments on commit 4a45446

Please sign in to comment.