[hamradio-commits] [freedv] 02/02: Packaging for freedv 1.2-1

[Maitland Bottoms]

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

bottoms pushed a commit to branch experimental
in repository freedv.

commit a099b3d81a858d3a677c27b8d65e0b624b514a28
Author: A. Maitland Bottoms <bottoms at debian.org>
Date:   Wed Feb 15 23:18:57 2017 -0500

    Packaging for freedv 1.2-1
---
 debian/changelog                      |  7 +++++++
 debian/copyright                      |  9 +++++----
 debian/docs                           |  3 +++
 debian/format                         |  1 +
 debian/patches/debian-uses-system-sox | 13 ++++++++++++-
 debian/patches/debian-version         |  4 ++--
 debian/patches/link-with-libXxf86vm   |  2 +-
 debian/patches/use-private-codec2     |  4 ++--
 8 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0a484d..7d1f038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freedv (1.2-1) experimental; urgency=medium
+
+  * New upstream release
+  * http://www.rowetel.com/?p=5456
+
+ -- A. Maitland Bottoms <bottoms at debian.org>  Wed, 15 Feb 2017 22:10:13 -0500
+
 freedv (1.1.0.3026-1) experimental; urgency=low
 
   * New upstream experimental trials - svn 3026
diff --git a/debian/copyright b/debian/copyright
index 0e6239c..7ebe6fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: freedv
 Upstream-Contact: http://freedv.org/
-Source: http://files.freedv.org/freedv/freedv-1.0.tar.gz
+Source: http://files.freedv.org/freedv/freedv-1.2.tar.xz
+ http://files.freedv.org/codec2/codec2-0.6.tar.xz
 Comment:
- Packages of vers 0.91, 0.96, 1.0, 1.1
+ Packages of vers 0.91, 0.96, 1.0, 1.1, 1.2
  by A. Maitland Bottoms <bottoms at debian.org>
  .
  FreeDV Specification by Mel Whitten, K0PFX, and David Rowe, VK5DGR
@@ -34,12 +35,12 @@ Comment: r1696 | hobbes1069 | 2014-06-20 10:11:47 -0400 (Fri, 20 Jun 2014)
  add CC license to icons in contrib directory.
 
 Files: debian/*
-Copyright: 2013-2014 A. Maitland Bottoms <bottoms at debian.org>
+Copyright: 2013-2017 A. Maitland Bottoms <bottoms at debian.org>
 License: LGPL-2.1
 
 Files: *
 Copyright: 2013-2015 Dave Witten <wittend at wwrinc.com>
- 2013-1015 David Rowe VK5DGR <david at rowetel.com>
+ 2013-2017 David Rowe VK5DGR <david at rowetel.com>
 License: LGPL-2.1
 
 License: LGPL-2.1
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..acfbcb3
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+credits.txt
+README.txt
+README.txt
diff --git a/debian/format b/debian/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/patches/debian-uses-system-sox b/debian/patches/debian-uses-system-sox
index ed9a2c0..1dbaa65 100644
--- a/debian/patches/debian-uses-system-sox
+++ b/debian/patches/debian-uses-system-sox
@@ -25,7 +25,7 @@
  )
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -180,8 +180,8 @@
+@@ -181,8 +181,8 @@
  add_definitions(-DHAVE_CONFIG_H)
  
  # Config file for bundled sox sources
@@ -36,3 +36,14 @@
  
  # Pthread Library
  find_package(Threads REQUIRED)
+--- a/src/sox_biquad.c
++++ b/src/sox_biquad.c
+@@ -31,7 +31,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include "sox/sox.h"
++#include <sox.h>
+ 
+ #include "sox_biquad.h"
+ 
diff --git a/debian/patches/debian-version b/debian/patches/debian-version
index 7ada703..bb6f354 100644
--- a/debian/patches/debian-version
+++ b/debian/patches/debian-version
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
      message(STATUS "Build type not specified, defaulting to ${CMAKE_BUILD_TYPE}")
  endif(NOT CMAKE_BUILD_TYPE)
  
@@ -9,7 +9,7 @@
  # Work around for not using a svn working copy.
  add_definitions(-D_NO_AUTOTOOLS_)
  find_program(SVNVERSION_PATH svnversion)
-@@ -63,13 +63,17 @@
+@@ -64,13 +64,17 @@
  else()
      set(SVN_REVISION_RESULT 1)
  endif()
diff --git a/debian/patches/link-with-libXxf86vm b/debian/patches/link-with-libXxf86vm
index 8b94e97..78eb92a 100644
--- a/debian/patches/link-with-libXxf86vm
+++ b/debian/patches/link-with-libXxf86vm
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -360,6 +360,12 @@
+@@ -361,6 +361,12 @@
  if(wxWidgets_FOUND)
      include("${wxWidgets_USE_FILE}")
      list(APPEND FREEDV_LINK_LIBS ${wxWidgets_LIBRARIES})
diff --git a/debian/patches/use-private-codec2 b/debian/patches/use-private-codec2
index d1f9e64..43b0498 100644
--- a/debian/patches/use-private-codec2
+++ b/debian/patches/use-private-codec2
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -190,38 +190,19 @@
+@@ -191,38 +191,19 @@
  #
  # Find codec2
  #
@@ -52,7 +52,7 @@
  
  #
  # Find or build portaudio Library
-@@ -296,6 +277,31 @@
+@@ -297,6 +278,31 @@
      include(cmake/BuildSamplerate.cmake)
  endif(NOT USE_STATIC_SAMPLERATE)
  

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