[hamradio-commits] [linpsk] 07/07: Removed demowave patch, add .pc to .gitignore

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository linpsk.

commit 1083a633245ee8e0134b4fa594dc60976808a14c
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sun May 3 20:41:28 2015 +0100

    Removed demowave patch, add .pc to .gitignore
---
 .gitignore                    |  1 +
 debian/changelog              |  2 ++
 debian/patches/demowave.patch | 13 -------------
 debian/patches/series         |  1 -
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 185983d..d00e927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ linpsk (1.2) UNRELEASED; urgency=medium
     - Reformatted with cme
     - Bump standards version to 3.9.6
     - Removed version from build dependency on libqt4-dev
+  * Refreshed patches:
+    - Removed demowave.patch - now included upstream
 
  -- Iain R. Learmonth <irl at fsfe.org>  Sun, 03 May 2015 20:29:26 +0100
 
diff --git a/debian/patches/demowave.patch b/debian/patches/demowave.patch
deleted file mode 100644
index 8ec36f0..0000000
--- a/debian/patches/demowave.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Found while troubleshooting. Already in upstream VCS.
-
---- linpsk-1.1.orig/src/waveinput.cpp	2010-06-04 12:48:07.000000000 -0400
-+++ linpsk-1.1/src/waveinput.cpp	2010-06-04 12:48:07.000000000 -0400
-@@ -48,7 +48,7 @@
- bool WaveInput::open_Device_read(QString *errorstring)
- {
-  char header[5];
-- unsigned char header1[3]; 
-+ unsigned char header1[4]; 
-  char c;
-  QString s;
-  int i;
diff --git a/debian/patches/series b/debian/patches/series
index 13ab5ec..ce07e7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-demowave.patch
 qt4.patch
 typo.patch
 gcc-4.6.patch

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