[SCM] a52dec packaging branch, master, updated. debian/0.7.4-11-7-g86e3f4c

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 535472272b96cefe6ccb4581ed266658b65ba5b0
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Tue Nov 3 09:41:00 2009 +0100

    Applied all the previous changes from pkg-multimedia SVN.

diff --git a/debian/changelog b/debian/changelog
index f68a73b..508fa1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+a52dec (0.7.4-12) UNRELEASED; urgency=low
+
+  [ Loic Minier ]
+  * Let liba52-0.7.4-dev depend on ${shlibs:Depends}; thanks Niko Tyni.
+
+  [ Fabian Greffrath ]
+  * debian/control:
+    + Removed the "XS-" prefix from the Vcs-Svn and Vcs-Browser fields.
+    + Added Homepage field, removed links from package descriptions.
+  * debian/lintian/liba52-0.7.4-dev, debian/rules:
+    + Removed lintian overrides file.
+  * debian/rules:
+    + Fixed debian-rules-ignores-make-clean-error.
+    + Changed to copy /usr/share/misc/config.{sub,guess} in place just before
+      the ./configure call and remove the files in the clean target.
+  * debian/watch:
+    + Fixed to watch only for versions beginning with a digit.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 29 Aug 2008 09:00:00 +0200
+
 a52dec (0.7.4-11) unstable; urgency=low
 
   [ Sam Hocevar ]
diff --git a/debian/control b/debian/control
index 8068e12..ff1e03b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,9 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
 Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/a52dec
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/a52dec/
+Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/a52dec
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/a52dec/
+Homepage: http://liba52.sourceforge.net/
 
 Package: liba52-0.7.4
 Section: libs
@@ -16,13 +17,12 @@ Description: library for decoding ATSC A/52 streams
  liba52 is a free library for decoding ATSC A/52 streams. The A/52 standard is
  used in a variety of applications, including digital television and DVD. It is
  also known as AC-3.
- .
-  Homepage: <http://liba52.sourceforge.net/>
 
 Package: liba52-0.7.4-dev
 Section: libdevel
 Architecture: any
-Depends: liba52-0.7.4 (= ${binary:Version})
+Depends: liba52-0.7.4 (= ${binary:Version}),
+         ${shlibs:Depends}
 Conflicts: a52dec, a52dec-dev, liba52-dev
 Replaces: a52dec, a52dec-dev, liba52-dev
 Provides: a52dec, a52dec-dev, liba52-dev
@@ -31,6 +31,4 @@ Description: library for decoding ATSC A/52 streams (development)
  used in a variety of applications, including digital television and DVD. It is
  also known as AC-3.
  .
-  Homepage: <http://liba52.sourceforge.net/>
- .
  This package contains the development files.
diff --git a/debian/lintian/liba52-0.7.4-dev b/debian/lintian/liba52-0.7.4-dev
deleted file mode 100644
index 6ae79d3..0000000
--- a/debian/lintian/liba52-0.7.4-dev
+++ /dev/null
@@ -1 +0,0 @@
-liba52-0.7.4-dev: package-name-doesnt-match-sonames
diff --git a/debian/rules b/debian/rules
index 09e81ab..9c3bf3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,13 @@ endif
 config.status: configure patch-stamp
 	dh_testdir
 
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub autotools/config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess autotools/config.guess
+endif
+
 	# Configuring package
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-shared
 
@@ -39,13 +46,8 @@ clean: unpatch
 	rm -f build-stamp
 
 	# Cleaning package
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub autotools/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess autotools/config.guess
-endif
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f autotools/config.sub autotools/config.guess
 
 	dh_clean
 
@@ -59,12 +61,6 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	cp -a liba52/a52_internal.h debian/tmp/usr/include/a52dec
 
-	# Installing lintian overrides
-	for LINTIAN in debian/lintian/*; \
-	do \
-		install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
-	done
-
 binary-indep: build install
 
 binary-arch: build install
diff --git a/debian/watch b/debian/watch
index 80706af..b6d0435 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://liba52.sourceforge.net/files/a52dec-(.*)\.tar\.gz
+http://liba52.sourceforge.net/files/a52dec-(\d.*)\.tar\.gz

-- 
a52dec packaging