tweaked Stuart's debian files, can build .deb OK

git-svn-id: https://svn.code.sf.net/p/freetel/code@3326 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/freedv-dev/README.txt b/freedv-dev/README.txt
index 7cf03817f4dd16cf85b9bed95e31dd3294c498df..cb6e2c4e17b4a78c5e2733db3fc0eda4ff2cace4 100644 (file)
--- a/freedv-dev/README.txt
+++ b/freedv-dev/README.txt
@@ -206,6 +206,11 @@ configure emacs:
  Building an Ubuntu 16.04 Package 
 ====================================
 
+Notes by David R, July 2017.  Work is progress....
+
+Method 1
+--------
+
 1/ Set up instructions here:
 
   http://packaging.ubuntu.com/html/
@@ -229,9 +234,32 @@ configure emacs:
   $ sudo dpkg --install freedv_1.2.2-1_i386.deb
   $ freedv
   $ sudo apt-get remove freedv
+
+Method 2
+--------
+
+More streamlined version (e.g. for test package based on SVN version 3255):
+
+  (Edit debian files in your version of freedv-dev)
+  $ cd tmp
+  $ svn export ~/freedv-dev freedv-dev; tar czf freedv-dev.tgz freedv-dev; rm -Rf freedv-dev
+  $ bzr dh-make freedv-dev 3255 freedv-dev.tgz
+  (Press s for single)
+  $ cd freedv-dev
+  $ bzr builddeb -- -us -uc
   
+Method 3
+--------
+
+Using Stuart Longlands debian files from 2015
+
+  (Edit debian files in your version of freedv-dev)
+  $ cd freedv-dev
+  $ dpkg-buildpackage -uc -us
+
+====================
 FreeDV GUI TODO List
---------------------
+====================
 
 [ ] Ubuntu packaging
 [ ] default sound card in/out setting for rx out of the box

diff --git a/freedv-dev/credits.txt b/freedv-dev/credits.txt
deleted file mode 100644 (file)
index 431e399..0000000
--- a/freedv-dev/credits.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Credits (code or ideas borrowed from):
-==============================================
-Dave Witten and David Rowe (obviously)
-Mel Whitten K0PFX (material and moral support)
-Bruce Perens (cheerleader, promotion and publicity)
-Mooneer Salem KG6AOV(Mac OSX Patch)
-Soeren Straarup OZ2DAK (FreeBSD Port)
-Don Mak
-Steve Nance (K5FR)
-Joel Stanley (Hamlib prototyping) and Mark Jessop (Mac OSX) 
-James Ahlstrom (Quisk)
-FLDIGI
-All the folks on the digital voice google group...

diff --git a/freedv-dev/debian/changelog b/freedv-dev/debian/changelog
index ddfe80b528c40d3a3bf6bcd027fd0b590d4d5b32..89a68fbec37f0d6ef1bb519405b46f616f85cb35 100644 (file)
--- a/freedv-dev/debian/changelog
+++ b/freedv-dev/debian/changelog
@@ -1,5 +1,5 @@
-freedv (1.0-150830) unstable; urgency=low
+freedv (3255) unstable; urgency=low
 
-  * Subversion snapshot of tag 1.0.
+  * Subversion snapshot revision 3255.
 
- -- Stuart Longland <stuartl@longlandclan.yi.org>  Sun, 30 Aug 2015 09:01:13 +1000
+ -- David Rowe <david@rowetel.com>  Sat, 22 July 2017

diff --git a/freedv-dev/debian/control b/freedv-dev/debian/control
index d1472b250c40fa7745bf9733beb551ac8471a56d..1e39b2d9dc993ed93dda061c71be6bc045a2de7e 100644 (file)
--- a/freedv-dev/debian/control
+++ b/freedv-dev/debian/control
@@ -1,8 +1,8 @@
-Source: fdmdv2
+Source: freedv
 Section: main
 Priority: optional
 Maintainer: Stuart Longland <stuartl@longlandclan.yi.org>
-Build-Depends: debhelper (>= 9), cmake, libcodec2-dev, libgtk2.0-dev,
+Build-Depends: debhelper (>= 9), cmake, 
  libhamlib-dev, libsamplerate-dev, libasound2-dev, libao-dev, libgsm1-dev,
  portaudio19-dev, libsox-dev, libsndfile1-dev, libwxgtk3.0-dev
 Standards-Version: 3.9.5
@@ -11,9 +11,10 @@ Homepage: http://www.freedv.org
 #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/freedv.git;a=summary
 
 Package: freedv
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcodec2
-Description: FreeDV: Open-Source Digital Voice modem
- FreeDV is a digital voice modem that can transmit voice-quality
- audio digitally over HF radio links in as little as 1.25kHz
- bandwidth in varying conditions.
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeDV: Open-Source Digital Voice
+ FreeDV is a digital voice system for HF radio. This
+ GUI application allows you to run FreeDV with any SSB
+ radio.
+ 
\ No newline at end of file

diff --git a/freedv-dev/debian/docs b/freedv-dev/debian/docs
index acfbcb3375472fc441f3c75f310bdae51f3f8a7e..384c0fba5a1a1fd86fb67b3c4fa5eeba01a302c6 100644 (file)
--- a/freedv-dev/debian/docs
+++ b/freedv-dev/debian/docs
@@ -1,3 +1,2 @@
-credits.txt
-README.txt
-README.txt
+RELEASE_NOTES.txt
+USER_MANUAL.txt

diff --git a/freedv-dev/debian/rules b/freedv-dev/debian/rules
index ad89215097aa8325094d1bece17f95cdd8d1a01b..9d9df0b2e3f970dca0b972c02a81071ae0a01f25 100755 (executable)
--- a/freedv-dev/debian/rules
+++ b/freedv-dev/debian/rules
@@ -26,5 +26,5 @@ include /usr/share/dpkg/default.mk
 override_dh_auto_configure:
        dh_auto_configure -- \
               -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-              -DUSE_STATIC_CODEC2=FALSE \
-              -DUSE_STATIC_SPEEXDSP=FALSE
+              -DUSE_STATIC_CODEC2=TRUE \
+              -DUSE_STATIC_SPEEXDSP=TRUE