[Pkg-oss4-maintainers] [PATCH 2/3] meta data updates:

Thu Oct 23 08:42:31 UTC 2014

* Use debhelper 9.
  * Bump to standard 3.9.6.
  * Add Benda Xu to uploaders.
  * Run wrap-and-sort.
  * Canonicalize Vcs-Svn field and add Vcs-Browser field.
---
 debian/changelog                 |  8 ++++++++
 debian/compat                    |  3 +--
 debian/control                   | 39 +++++++++++++++++++++++----------------
 debian/copyright                 | 13 ++++++-------
 debian/liboss4-salsa-dev.install |  2 +-
 debian/oss4-base.install         | 20 ++++++++++----------
 debian/oss4-dev.install          |  1 -
 debian/oss4-source.install       |  2 +-
 8 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97beecc..7042300 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
 oss4 (4.2-build2010-1) unstable; urgency=low
 
+  [ Sebastien NOEL ]
   * New upstream release.
     - fix build with recent kernel. (Closes: #696751)
   * Add build dependency on libtool-bin. (Closes: #761783)
   * Fix build problems due to the move of limits.h. Thanks to Michal Suchanek
     for the patch. (Closes: #713841)
 
+  [ Benda Xu ]
+  * Use debhelper 9.
+  * Bump to standard 3.9.6.
+  * Add Benda Xu to uploaders.
+  * Run wrap-and-sort.
+  * Canonicalize Vcs-Svn field and add Vcs-Browser field.
+
  -- Sebastien NOEL <sebastien at twolife.org>  Mon, 06 Oct 2014 17:11:18 +0200
 
 oss4 (4.2-build2007-2.1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 4d446d8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,2 +1 @@
-7
-
+9
diff --git a/debian/control b/debian/control
index 83ea08c..2acb65b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,25 @@ Source: oss4
 Section: sound
 Priority: optional
 Maintainer: Debian OSS4 Maintainers <pkg-oss4-maintainers at lists.alioth.debian.org>
-Uploaders: Sebastien NOEL <sebastien at twolife.org>, Romain Beauxis <toots at rastageeks.org>, Samuel Thibault <sthibault at debian.org>
-Build-Depends: 
- debhelper (>= 7), cdbs, gawk, 
- libgtk2.0-dev, txt2man, patchutils, 
- libtool-bin, dkms [linux-any]
-Vcs-Svn: svn://svn.debian.org/svn/pkg-oss4/oss4/
-Standards-Version: 3.9.5
+Uploaders: Sebastien NOEL <sebastien at twolife.org>,
+           Romain Beauxis <toots at rastageeks.org>,
+           Samuel Thibault <sthibault at debian.org>,
+           Benda Xu <heroxbd at gentoo.org>
+Build-Depends: cdbs,
+               debhelper (>= 9),
+               dkms [linux-any],
+               gawk,
+               libgtk2.0-dev,
+               libtool-bin,
+               patchutils,
+               txt2man
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-oss4
+Vcs-Svn: svn://anonscm.debian.org/pkg-oss4/oss4
+Standards-Version: 3.9.6
 
 Package: oss4-base
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: linux-sound-base
 Replaces: linux-sound-base
 Recommends: pm-utils
@@ -30,8 +38,8 @@ Description: Open Sound System - base package
  in the oss4-source package using the module-assistant utility.
 
 Package: oss4-gtk
-Architecture: linux-any kfreebsd-any
-Depends: oss4-base [linux-any], ${shlibs:Depends}, ${misc:Depends}
+Architecture: kfreebsd-any linux-any
+Depends: oss4-base [linux-any], ${misc:Depends}, ${shlibs:Depends}
 Description: Open Sound System - simple GTK2-based mixer control
  Open Sound System (OSS) is an attempt in unifying
  the digital audio architecture for UNIX.
@@ -41,7 +49,7 @@ Description: Open Sound System - simple GTK2-based mixer control
 Package: oss4-dkms
 Section: kernel
 Architecture: linux-any
-Depends: ${misc:Depends}, oss4-base, dkms, dpkg-dev
+Depends: dkms, dpkg-dev, oss4-base, ${misc:Depends}
 Recommends: linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic
 Provides: oss4-modules
 Description: Open Sound System - DKMS module sources
@@ -51,7 +59,7 @@ Description: Open Sound System - DKMS module sources
 
 Package: oss4-source
 Architecture: linux-any
-Depends: ${misc:Depends}, make, debhelper, module-assistant, dpkg-dev
+Depends: debhelper, dpkg-dev, make, module-assistant, ${misc:Depends}
 Description: Open Sound System - drivers sources
  This package provides the source code for the OSS4 kernel modules,
  in a form suitable for use by module-assistant.
@@ -78,8 +86,8 @@ Package: liboss4-salsa-dev
 Provides: libasound2-dev, liboss-salsa-dev
 Conflicts: libasound2-dev, liboss-salsa-dev
 Section: libdevel
-Architecture: kfreebsd-any hurd-any
-Depends: ${misc:Depends}, liboss4-salsa2 (= ${binary:Version})
+Architecture: hurd-any kfreebsd-any
+Depends: liboss4-salsa2 (= ${binary:Version}), ${misc:Depends}
 Description: OSS to Alsa compatibility library -- development files
  Liboss4-salsa is a library providing an ALSA interface on top of OSS.
  .
@@ -92,11 +100,10 @@ Architecture: any
 Provides: libasound2
 Conflicts: libasound2
 Multi-arch: same
-Depends: ${misc:Depends}, liboss4-salsa2
+Depends: liboss4-salsa2, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: OSS to Alsa compatibility library - binary compatibility symlink
  Liboss4-salsa is a library providing an ALSA interface on top of OSS.
  .
  This package contains a symbolic link that makes applications already compiled
  with ALSA use liboss4-salsa.
-
diff --git a/debian/copyright b/debian/copyright
index e6f4f57..6436f1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Sun, 13 Jul 2008 18:52:58 +0200.
 
 It was downloaded from http://www.4front-tech.com/developer/sources/stable/gpl/
 
-Copyright: 
+Copyright:
 
 Files in lib/libsalsa/ have the following copyright:
     Copyright © 2004 by Hannu Savolainen < hannu at opensound.com>
@@ -14,11 +14,11 @@ The file oss/lib/flashsupport.c has the following copyright:
 The file attic/drv/oss_allegro/id.h has copyright:
     © 1998-1998 ESS Technology, Inc.
 
-The files attic/drv/oss_allegro/{allegro_code.h,kernelbn.inc,kernel.h} 
+The files attic/drv/oss_allegro/{allegro_code.h,kernelbn.inc,kernel.h}
 have copyright:
     Copyright © 1997-1999, ESS Technology, Inc.
 
-The files in attic/drv/oss_allegro/{hckernel.h,hardware.h,port.h,srcmgr.inc} 
+The files in attic/drv/oss_allegro/{hckernel.h,hardware.h,port.h,srcmgr.inc}
 have copyright:
     Copyright © 1992-2000  Don Kim (don.kim at esstech.com)
 
@@ -123,7 +123,7 @@ The files tutorials/sndkit/dsp/{recplay.c,help.c} have the following license:
  * 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.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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
@@ -155,8 +155,7 @@ All other files are released under GPL v2 license (no other versions).
 
 
 On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in 
+License version 2 can be found in
   /usr/share/common-licenses/GPL-2,
 the text of the GNU General Public License version 2.1 can be found in
-  /usr/share/common-licenses/GPL-2.1 
-
+  /usr/share/common-licenses/GPL-2.1
diff --git a/debian/liboss4-salsa-dev.install b/debian/liboss4-salsa-dev.install
index 52d6041..50adc25 100644
--- a/debian/liboss4-salsa-dev.install
+++ b/debian/liboss4-salsa-dev.install
@@ -1,2 +1,2 @@
-debian/include-alsa/alsa /usr/include
 debian/alsa.pc /usr/lib/pkgconfig
+debian/include-alsa/alsa /usr/include
diff --git a/debian/oss4-base.install b/debian/oss4-base.install
index 9a76c39..6ccd7a7 100644
--- a/debian/oss4-base.install
+++ b/debian/oss4-base.install
@@ -1,24 +1,24 @@
-debian/oss.conf etc/
+debian/30oss4-pm etc/pm/sleep.d
 debian/modprobe.d/oss4-base.conf etc/modprobe.d/
+debian/oss.conf etc/
 debian/tmp/usr/bin/ossinfo
 debian/tmp/usr/bin/ossmix
 debian/tmp/usr/bin/ossplay
 debian/tmp/usr/bin/osstest
+debian/tmp/usr/lib/oss/conf.tmpl/* etc/oss4/conf/
+debian/tmp/usr/lib/oss/etc/devices.list etc/oss4/
+debian/tmp/usr/lib/oss/version.dat etc/oss4/
+debian/tmp/usr/sbin/ossdetect
+debian/tmp/usr/sbin/ossdevlinks
+debian/tmp/usr/sbin/savemixer
+debian/tmp/usr/sbin/vmixctl
 debian/tmp/usr/share/man/man1/ossinfo.1.gz
 debian/tmp/usr/share/man/man1/ossmix.1.gz
 debian/tmp/usr/share/man/man1/ossplay.1.gz
 debian/tmp/usr/share/man/man1/ossrecord.1.gz
 debian/tmp/usr/share/man/man1/osstest.1.gz
-debian/tmp/usr/sbin/ossdetect
-debian/tmp/usr/sbin/ossdevlinks
-debian/tmp/usr/sbin/savemixer
-debian/tmp/usr/sbin/vmixctl
+debian/tmp/usr/share/man/man7
 debian/tmp/usr/share/man/man8/ossdetect.8.gz
 debian/tmp/usr/share/man/man8/ossdevlinks.8.gz
 debian/tmp/usr/share/man/man8/savemixer.8.gz
 debian/tmp/usr/share/man/man8/vmixctl.8.gz
-debian/tmp/usr/share/man/man7
-debian/tmp/usr/lib/oss/etc/devices.list etc/oss4/
-debian/tmp/usr/lib/oss/version.dat etc/oss4/
-debian/tmp/usr/lib/oss/conf.tmpl/* etc/oss4/conf/
-debian/30oss4-pm etc/pm/sleep.d
diff --git a/debian/oss4-dev.install b/debian/oss4-dev.install
index fe4dd53..b8318f6 100644
--- a/debian/oss4-dev.install
+++ b/debian/oss4-dev.install
@@ -1,2 +1 @@
 debian/tmp/usr/lib/oss/include/sys/soundcard.h usr/include/linux
-
diff --git a/debian/oss4-source.install b/debian/oss4-source.install
index 1dbd551..a0d6181 100644
--- a/debian/oss4-source.install
+++ b/debian/oss4-source.install
@@ -1,2 +1,2 @@
-build-tree/oss4.tar.bz2 usr/src/
 
+build-tree/oss4.tar.bz2 usr/src/
-- 
2.1.1


