Merge pull request #6 in SD/libbroadvoice from ~S3RJ1K/libbroadvoice:…

…master to master

* commit '20da4d20d5b4a11edb923cb8c4d184ce01e3ae91':
  proper library versioning

broadvoice.spec

@@ -18,7 +18,7 @@ broadvoice is a library for the BroadVoice 16 and 32 speech codecs.
 %package devel
 Summary:    BroadVoice development files
 Group:      Development/Libraries
-Requires:   broadvoice = %{version}
+Requires:   libbroadvoice = %{version}
 
 %description devel
 libbroadvoice development files.

build_deb8.sh

@@ -0,0 +1,6 @@
+#/bin/sh
+
+apt-get -y install build-essential devscripts
+mk-build-deps --install --remove debian/control --tool "apt-get -y --no-install-recommends"
+apt-get -y -f install
+debuild -us -uc -b -I.git -i'\.git/'

debian/README.Debian

@@ -1,6 +1,6 @@
 libbroadvoice for Debian
 ------------------------
 
-<possible notes regarding this package - if none, delete this file>
+libbroadvoice debian package for FreeSwitch project use
 
- -- William King <william.king@quentustech.com>  Tue, 31 Mar 2015 10:28:23 -0700
+ -- FreeSWITCH Solutions <packages@freeswitch.com>  Fri, 09 Feb 2018 12:41:37 +0200

debian/README.source

@@ -1,9 +1,6 @@
 libbroadvoice for Debian
 ------------------------
 
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
+libbroadvoice debian package for FreeSwitch project use
 
+ -- FreeSWITCH Solutions <[email protected]>  Fri, 09 Feb 2018 12:41:37 +0200

debian/changelog

@@ -1,5 +1,12 @@
+libbroadvoice (0.1.0-999~u1) unstable; urgency=low
+
+  * Update version release
+
+ -- FreeSWITCH Solutions <[email protected]>  Fri, 09 Feb 2018 12:50:37 +0200
+
 libbroadvoice (0.1.0-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release, based on release 0.0.1 dated at 20.09.14
+    by Steve Underwood <[email protected]>
 
- -- William King <william.king@quentustech.com>  Tue, 31 Mar 2015 10:28:23 -0700
+ -- FreeSWITCH Solutions <packages@freeswitch.com>  Fri, 09 Feb 2018 12:41:37 +0200

debian/compat

@@ -1 +1 @@
-8
+9

debian/control

@@ -1,23 +1,21 @@
 Source: libbroadvoice
 Priority: extra
-Maintainer: William King <william.king@quentustech.com>
-Build-Depends: debhelper (>= 8.0.0), dh-autoreconf
-Standards-Version: 3.9.3
+Maintainer: FreeSWITCH Solutions <packages@freeswitch.com>
+Build-Depends: debhelper (>= 9), dh-autoreconf, automake (>= 1.14), autoconf (>= 2.69)
+Standards-Version: 3.9.6
 Section: libs
 Homepage: https://www.broadcom.com/support/broadvoice/
-#Vcs-Git: git://git.debian.org/collab-maint/libbroadvoice.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/libbroadvoice.git;a=summary
 
 Package: libbroadvoice-dev
 Section: libdevel
 Architecture: any
-Depends: libbroadvoice1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libbroadvoice1 (= ${binary:Version})
 Description: BroadVoice codec development libraries
-	     BroadVoice is a family of speech coding algorithms created by Broadcom and standardized by CableLabs, SCTE, and ANSI for Voice over IP applications in cable telephony. BroadVoice is also part of the ITU-T Recommendations J.161 and J.361. To encourage wide-spread use of BroadVoice in diverse speech compression applications, Broadcom is providing both the floating-point and fixed-point C source code of BroadVoice on a royalty-free basis under the GNU Lesser General Public License (LGPL), version 2.1, as published by the Free Software Foundation.
+ A library for the BroadVoice 16 and 32 speech codecs.
 
 Package: libbroadvoice1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: BroadVoice codec 
-	     BroadVoice is a family of speech coding algorithms created by Broadcom and standardized by CableLabs, SCTE, and ANSI for Voice over IP applications in cable telephony. BroadVoice is also part of the ITU-T Recommendations J.161 and J.361. To encourage wide-spread use of BroadVoice in diverse speech compression applications, Broadcom is providing both the floating-point and fixed-point C source code of BroadVoice on a royalty-free basis under the GNU Lesser General Public License (LGPL), version 2.1, as published by the Free Software Foundation.
+Description: BroadVoice codec development libraries
+ A library for the BroadVoice 16 and 32 speech codecs.

debian/copyright

@@ -1,38 +1,27 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libbroadvoice
-Source: <url://example.com>
+This package was debianized by FreeSWITCH Solutions <[email protected]>
+on Fri, 09 Feb 2018 12:41:37 +0200.
 
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+It was downloaded from https://www.soft-switch.org/downloads/voipcodecs/snapshots/broadvoice-20091122.tar.gz
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2015 William King <[email protected]>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+Upstream Author(s):
+  Steve Underwood <[email protected]>
+
+Copyright:
+  Copyright (C) 2018 FreeSWITCH Solutions <[email protected]>
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
+License: GPL-2+
+  This package is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  .
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  .
+  You should have received a copy of the GNU General Public License
+  along with this program. If not, see <http://www.gnu.org/licenses/>
+  .
+  On Debian systems, the complete text of the GNU General
+  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/libbroadvoice-dev.install

@@ -1,4 +1,3 @@
 usr/include/*
-#usr/lib/lib*.a
-usr/lib/lib*.so
 usr/lib/pkgconfig/*
+usr/lib/lib*.so

debian/libbroadvoice-dev.lintian-overrides

@@ -0,0 +1,2 @@
+libbroadvoice-dev: new-package-should-close-itp-bug
+libbroadvoice-dev: helper-templates-in-copyright

debian/libbroadvoice1.lintian-overrides

@@ -0,0 +1,3 @@
+libbroadvoice1: new-package-should-close-itp-bug
+libbroadvoice1: package-name-doesnt-match-sonames libbroadvoice0
+libbroadvoice1: helper-templates-in-copyright

debian/rules

@@ -1,13 +1,22 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# get debian distribution codename
+DISTRIBUTION=$(shell lsb_release -sc)
+# get version from changelog, for string mangling
+VERSION=$(shell dpkg-parsechangelog --count 1 --show-field Version)
+# add distribution codename to package version
+PACKAGEVERSION=$(subst ~,~$(DISTRIBUTION)-,$(VERSION))
+
+export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf
+	dh $@
+
+override_dh_auto_configure:
+	./autogen.sh
+	./configure --prefix=/usr --disable-doc --enable-static --enable-shared
+
+# setting mangled package version
+override_dh_gencontrol:
+	dh_gencontrol -- -v$(PACKAGEVERSION)

debian/source.lintian-overrides

@@ -0,0 +1 @@
+libbroadvoice source: native-package-with-dash-version