Merge lp:~sil2100/android-audiosystem/packaging_review into lp:android-audiosystem

[Łukasz Zemczak]

Clean up packaging to conform to our latest packaging standards

Branch ready for review.

A few things to notice:
- This project has no tests ran on build, as well as no integration tests (a WI?)
- There were a few missing files (two headers and a binary), I removed them since we don't use them basically - I tried looking into the build system to maybe disable them, but then thought that integration in the source code is not that cool

Waiting for review!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/android-audiosystem-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-quantal-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-raring-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/android-audiosystem-ci/1/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

debian/copyright:
- we should follow the main license from upstream for the packaging, so Apache2 in this case.
I didn't check the license yet, did you check with licensecheck -r * --copyright that it's up to date?

debian/rules:
override_dh_auto_clean:
    ./build-component.sh --clean
-> you should add as we discussed a call to dh_clean I guess

Otherwise, looks perfect to me! You can add the bootstrap commit too (latest vcs revision is enough).

Good work ;)

review: Needs Fixing

[lp:~sil2100/android-audiosystem/packaging_review]

46. By Łukasz Zemczak on 2013-04-12

As mentioned by Didier, let's use the main license from upstream for packaging.

47. By Łukasz Zemczak on 2013-04-12

Automatic snapshot from revision 44 (bootstrap)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/android-audiosystem-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-quantal-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-raring-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/android-audiosystem-ci/2/rebuild

review: Approve (continuous-integration)

[lp:~sil2100/android-audiosystem/packaging_review]

48. By Łukasz Zemczak on 2013-04-12

Some BSD licensed files added

[Didier Roche-Tolomelli (didrocks)]

Nice work!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/android-audiosystem-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-quantal-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-raring-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/android-audiosystem-ci/3/rebuild

review: Approve (continuous-integration)

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-04-12 16:30:32 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-11 20:01:09 +0000
+++ debian/changelog	2013-04-12 16:30:32 +0000
@@ -1,3 +1,13 @@
+android-audiosystem (1.8-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules, debian/copyright,
+    debian/libwaudio1-dev.install:
+    - Modifications to conform better to our packaging standards
+  * Removed debian/source/format
+  * Automatic snapshot from revision 44 (bootstrap)
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Fri, 12 Apr 2013 11:38:23 +0200
+
 android-audiosystem (1.8) quantal; urgency=low
 
   * Tuning default pulse alsa modules to allow recording and playing at 16kHz

=== modified file 'debian/control'
--- debian/control	2013-02-08 07:54:14 +0000
+++ debian/control	2013-04-12 16:30:32 +0000
@@ -1,21 +1,22 @@
 Source: android-audiosystem
 Section: libs
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               libasound2-dev,
+               pkg-config,
                zlib1g-dev,
-               libasound2-dev,
-               pkg-config
 Standards-Version: 3.9.4
-Vcs-Bzr: lp:android-audiosystem
+Homepage: https://launchpad.net/android-audiosystem
+# If you aren't a member of ~phablet-team but need to upload packaging changes,
+# just go ahead. ~phablet-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/android-audiosystem/trunk
 
 Package: libwaudio1
-Section: libs
 Architecture: armel armhf
-Pre-Depends: multiarch-support
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Description: Android Audio Subsystem wrapper
  This package contains the Android Audio Subsystem wrapper that uses binder to
  connect with Android's AudioFlinger.
@@ -24,21 +25,19 @@
 Section: libdevel
 Architecture: armel armhf
 Multi-Arch: same
-Depends: ${misc:Depends},
+Depends: libwaudio1 (= ${binary:Version}),
+         ${misc:Depends},
          ${shlibs:Depends},
-         libwaudio1 (= ${binary:Version})
 Description: Android Audio Subsystem wrapper (development files)
  This package contains the development files needed to compile applications
  which uses libwaudio.
 
 Package: libandroid-audiosystem-asound2
-Section: libs
 Architecture: armel armhf
-Pre-Depends: multiarch-support
 Multi-Arch: same
-Depends: ${shlibs:Depends},
+Depends: pulseaudio,
          ${misc:Depends},
-         pulseaudio
+         ${shlibs:Depends},
 Description: Android Audio Subsystem support for ALSA via Binder
  ALSA pcm and ctl audio io plugin that routes data to the Android AudioFlinger
  service using Binder (libwaudio1).

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-08 07:54:14 +0000
+++ debian/copyright	2013-04-12 16:30:32 +0000
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Android Audio Subsystem support for ALSA via Binder
 Upstream-Contact: Ricardo Salveti de Araujo <[e-mail]>
-Source: lp:ubuntu-phablet/android-audiosystem
+Source: lp:android-audiosystem
 
 Files: lib/binder/* lib/libcutils/* lib/libmedia/* lib/liblog/* lib/utils/*
        include/android/* include/binder/* include/cutils/* include/linux/*
@@ -19,9 +19,15 @@
            Copyright (C) 2012, Canonical Ltd
 License: LGPL-2.1+
 
+Files: include/machine/*
+Copyright: Copyright (C) 2008-2010, The Android Open Source Project
+           Copyright (C) 1988-1990, The Regents of the University of California
+           Copyright (C) 1993, Christopher G. Demetriou
+License: BSD
+
 Files: debian/*
 Copyright: Copyright (C) 2012, Canonical Ltd
-License: GPL-3
+License: Apache-2.0
 
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,19 +58,30 @@
  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  MA 02110-1301, USA.
 
-License: GPL-3
- This program is free software: you can redistribute it and/or modify it
- under the terms of the the GNU General Public License version 3, as
- published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the applicable version of the GNU Lesser 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
- can be found in `/usr/share/common-licenses/GPL-3'
+License: BSD
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

=== modified file 'debian/libwaudio1-dev.install'
--- debian/libwaudio1-dev.install	2012-11-01 00:54:20 +0000
+++ debian/libwaudio1-dev.install	2013-04-12 16:30:32 +0000
@@ -1,2 +1,2 @@
+usr/include/waudio.h
 usr/lib/*/libwaudio.so
-usr/include/waudio.h

=== modified file 'debian/rules'
--- debian/rules	2012-10-31 12:12:47 +0000
+++ debian/rules	2013-04-12 16:30:32 +0000
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -15,3 +17,10 @@
 
 override_dh_auto_install:
 	./build-component.sh --install
+
+override_dh_install:
+	# We don't need those right now, so remove them
+	rm debian/tmp/usr/bin/audiotest
+	rm debian/tmp/usr/include/alsa/asound_module_pcm_android.h
+	rm debian/tmp/usr/include/alsa/asound_module_ctl_android.h
+	dh_install --fail-missing

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2012-11-01 10:34:20 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (native)