[SCM] libshout/master: Revert to build-depend unversioned on debhelper: Tightening unneeded with CDBS. Update changelog, control file and copyright hints.

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Feb 15 16:26:40 UTC 2012


The following commit has been merged in the master branch:
commit bcf54e675e553e18d3edf53d688438d3334fa730
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Feb 15 17:26:33 2012 +0100

    Revert to build-depend unversioned on debhelper: Tightening unneeded with CDBS. Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index f10b594..abd5a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ libshout (2.2.2-8) UNRELEASED; urgency=low
   * Introduce MultiArch support. Thanks to Steve Langasek for
     the original patch: (Closes: #652504)
     - debian/control:
-      + Bump debhelper build-dep to 9.
       + Bump cdbs minimum requirement to 0.4.93~.
       + Don't build-depend on dh-buildinfo, which is non multiarch-safe.
     - debian/rules:
diff --git a/debian/control b/debian/control
index 466e729..79f71f2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,14 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
  Romain Beauxis <toots at rastageeks.org>,
  Ying-Chun Liu <grandpaul at gmail.com>
 Build-Depends: autotools-dev,
- cdbs (>= 0.4.93~),
- debhelper (>= 9),
+ debhelper,
  libogg-dev,
  libvorbis-dev,
  pkg-config,
  libtheora-dev,
  libspeex-dev,
- d-shlibs (>= 0.48)
+ d-shlibs (>= 0.48),
+ cdbs (>= 0.4.93~)
 Vcs-Git: git://git.debian.org/pkg-multimedia/libshout.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libshout.git
 Standards-Version: 3.9.2
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 7725e3f..a00f02a 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -131,6 +131,15 @@ Copyright: 1991, Free Software Foundation, Inc
 License: LGPL-2+
  FIXME
 
+Files: config.guess
+ config.sub
+ missing
+Copyright: 1992-1999
+ 1992-2005,
+ 1996-1997, 1999-2000, 2002-2005
+License: GPL-2+
+ FIXME
+
 Files: src/net/resolver.c
  src/thread/thread.c
  src/thread/thread.h
@@ -142,13 +151,6 @@ License: LGPL-2+
 Files: compile
  depcomp
 Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
-License: GPL
- FIXME
-
-Files: config.guess
- config.sub
-Copyright: 1992-1999
- 1992-2005,
 License: GPL-2+
  FIXME
 
@@ -159,17 +161,6 @@ Copyright: 1995, Sam Rushing <rushing at nightmare.com>
 License: UNKNOWN
  FIXME
 
-Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2005
-License: GPL
- FIXME
-
-Files: debian/rules
-Copyright: 2003, Keegan Quinn <ice at thebasement.org>
- 2004-2008, 2011 Jonas Smedegaard <dr at jones.dk>
-License: GPL
- FIXME
-
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
  (ISLOWER ? ( | 0x40) : )
@@ -203,6 +194,12 @@ Copyright: 1996-2001, 2003-2005
 License: GPL-2+
  FIXME
 
+Files: debian/rules
+Copyright: 2003, Keegan Quinn <ice at thebasement.org>
+ 2004-2008, 2011 Jonas Smedegaard <dr at jones.dk>
+License: GPL-2+
+ FIXME
+
 Files: src/net/sock.h
 Copyright: 1999, the icecast team
 License: GPL-2+

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list