Merge pull request #5 in SD/libilbc from ~S3RJ1K/libilbc:master to ma…

…ster

* commit '44549899ce41bce68731029414e4403e545d1786':
  update debian rules

debian/changelog

@@ -1,5 +1,5 @@
-libilbc (0.0.1-1) unstable; urgency=low
+libilbc (0.0.1~1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release
 
- -- William King <william.king@quentustech.com>  Tue, 31 Mar 2015 12:02:23 -0700
+ -- FreeSWITCH Solutions <packages@freeswitch.com>  Tue, 31 Mar 2015 12:02:23 -0700

debian/compat

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

debian/control

@@ -1,23 +1,35 @@
 Source: libilbc
 Priority: extra
-Maintainer: William King <william.king@quentustech.com>
+Maintainer: FreeSWITCH Solutions <packages@freeswitch.com>
 Build-Depends: debhelper (>= 8.0.0), dh-autoreconf
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 Section: libs
 Homepage: http://www.ilbcfreeware.org
-#Vcs-Git: git://git.debian.org/collab-maint/libilbc.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/libilbc.git;a=summary
 
 Package: libilbc-dev
 Section: libdevel
 Architecture: any
 Depends: libilbc1 (= ${binary:Version})
 Description: iLBC (internet Low Bitrate Codec) development libraries
- iLBC (internet Low Bitrate Codec) is a FREE speech codec suitable for robust voice communication over IP. The codec is designed for narrow band speech and results in a payload bit rate of 13.33 kbit/s with an encoding frame length of 30 ms and 15.20 kbps with an encoding length of 20 ms. The iLBC codec enables graceful speech quality degradation in the case of lost frames, which occurs in connection with lost or delayed IP packets.
+ iLBC (internet Low Bitrate Codec) is a FREE speech
+ codec suitable for robust voice communication over IP.
+ The codec is designed for narrow band speech and results
+ in a payload bit rate of 13.33 kbit/s with an encoding
+ frame length of 30 ms and 15.20 kbps with an encoding
+ length of 20 ms. The iLBC codec enables graceful speech
+ quality degradation in the case of lost frames, which
+ occurs in connection with lost or delayed IP packets.
 
 Package: libilbc1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: iLBC (internet Low Bitrate Codec) 
- iLBC (internet Low Bitrate Codec) is a FREE speech codec suitable for robust voice communication over IP. The codec is designed for narrow band speech and results in a payload bit rate of 13.33 kbit/s with an encoding frame length of 30 ms and 15.20 kbps with an encoding length of 20 ms. The iLBC codec enables graceful speech quality degradation in the case of lost frames, which occurs in connection with lost or delayed IP packets.
+ iLBC (internet Low Bitrate Codec) is a FREE speech
+ codec suitable for robust voice communication over IP.
+ The codec is designed for narrow band speech and results
+ in a payload bit rate of 13.33 kbit/s with an encoding
+ frame length of 30 ms and 15.20 kbps with an encoding
+ length of 20 ms. The iLBC codec enables graceful speech
+ quality degradation in the case of lost frames, which
+ occurs in connection with lost or delayed IP packets.

debian/copyright

@@ -1,21 +1,11 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libilbc
-Source: <url://example.com>
 
-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>
-
-# 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+
+Copyright: FreeSWITCH Solutions <[email protected]>
+License: GPL-2.0+
+
+License: GPL-2.0+
  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
@@ -30,9 +20,4 @@ License: GPL-2+
  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".
-
-# 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.
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/libilbc-dev.install

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

debian/libilbc1.install

@@ -1 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/*.so.*
+usr/lib/*/*.so

debian/rules

@@ -1,13 +1,18 @@
 #!/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.
+
+# 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))
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
 	dh $@ --with autoreconf
+
+# setting mangled package version
+override_dh_gencontrol:
+	dh_gencontrol -- -v$(PACKAGEVERSION)