[SCM] gavl packaging branch, master, updated. debian/1.1.2-1-1-g7b59cfc

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

The following commit has been merged in the master branch:
commit 7b59cfcc08d6aced021b2fbb690c8f7c59058cb6
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Fri Mar 26 14:15:30 2010 +0100

    Switch to debhelper 7, drop cdbs. Call autoreconf to fix bug #558502. Adjust build-dependencies.

diff --git a/debian/control b/debian/control
index 0dfea49..f67618a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,11 @@ Uploaders: Free Ekanayaka <freee at debian.org>,
 DM-Upload-Allowed: yes
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.8.4
-Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), doxygen
+Build-Depends: debhelper (>= 7.0.50~),
+ doxygen,
+ automake,
+ libtool,
+ autotools-dev
 Vcs-Git: git://git.debian.org/pkg-multimedia/gavl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gavl.git
 
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 8fb4b34..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,79 +0,0 @@
-Source: gavl
-Section: libs
-Priority: extra
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Free Ekanayaka <freee at debian.org>,
- Romain Beauxis <toots at rastageeks.org>,
- Alessio Treglia <quadrispro at ubuntu.com>
-DM-Upload-Allowed: yes
-Homepage: http://gmerlin.sourceforge.net/
-Standards-Version: 3.8.4
-Build-Depends: @cdbs@, doxygen
-Vcs-Git: git://git.debian.org/pkg-multimedia/gavl.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gavl.git
-
-Package: libgavl1
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: low level audio and video library - runtime files
- Gavl handles all the details of audio and video formats like colorspaces,
- samplerates, multichannel configurations etc. It provides standardized
- definitions for those formats as well as container structures for carrying
- audio samples or video images inside an application.
- .
- In addition, it handles the sometimes ugly task to convert between all
- these formats and provides some elementary operations (copying, scaling,
- alpha blending etc).
- . 
- This package contains the files needed to run a program compiled using
- Gavl.
-
-Package: libgavl1-dbg
-Architecture: any
-Section: debug
-Depends: libgavl1 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for libgavl1
- Gavl handles all the details of audio and video formats like colorspaces,
- samplerates, multichannel configurations etc. It provides standardized
- definitions for those formats as well as container structures for carrying
- audio samples or video images inside an application.
- .
- In addition, it handles the sometimes ugly task to convert between all
- these formats and provides some elementary operations (copying, scaling,
- alpha blending etc).
- . 
- This package contains the debugging symbols for libgavl1
-
-Package: libgavl-dev
-Architecture: any
-Section: libdevel
-Depends: libgavl1 (= ${binary:Version}), pkg-config, ${misc:Depends}
-Recommends: libgavl-doc
-Description: low level audio and video library - development files
- Gavl handles all the details of audio and video formats like colorspaces,
- samplerates, multichannel configurations etc. It provides standardized
- definitions for those formats as well as container structures for carrying
- audio samples or video images inside an application.
- .
- In addition, it handles the sometimes ugly task to convert between all
- these formats and provides some elementary operations (copying, scaling,
- alpha blending etc).
- . 
- This package contains the files needed to compile and statically link
- against Gavl.
-
-Package: libgavl-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: low level audio and video library - documentation files
- Gavl handles all the details of audio and video formats like colorspaces,
- samplerates, multichannel configurations etc. It provides standardized
- definitions for those formats as well as container structures for carrying
- audio samples or video images inside an application.
- .
- In addition, it handles the sometimes ugly task to convert between all
- these formats and provides some elementary operations (copying, scaling,
- alpha blending etc).
- . 
- This package contains the documentation about Gavl.
diff --git a/debian/rules b/debian/rules
index a319474..3d4ead3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# In order to regenerate 'debian/control' :
-#    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
-DEB_CONFIGURE_EXTRA_FLAGS := --docdir=\$${prefix}/share/doc/libgavl-doc --enable-static --with-cpuflags=none
-DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v$(DEB_UPSTREAM_VERSION)
-DEB_DH_STRIP_ARGS := --dbg-package=libgavl1-dbg
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	autoreconf -f -i
+	dh_auto_configure -- \
+		--docdir=\$${prefix}/share/doc/libgavl-doc \
+		--enable-static \
+		--with-cpuflags=none
+
+override_dh_strip:
+	dh_strip --dbg-package=libgavl1-dbg
 

-- 
gavl packaging