[SCM] smplayer packaging branch, master, updated. debian/0.6.8-1-5-g7a036cc

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

The following commit has been merged in the master branch:
commit b4c0ee594ae0f9a04f1b6a5af5776fcf6e0bd0aa
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sat Nov 21 14:06:56 2009 +0600

    debhelper 7 migration

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 85880c2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,35 +0,0 @@
-This package uses CDBS (and therefore simple-patchsys.mk) in order to 
-apply patches to the upstream source. Patches are stored in 
-debian/patches and their filenames usually end in .patch or .diff .
-For further details, see the man page for cdbs-edit-patch.
-
-All commands described below should be run from the top directory of the 
-package source tree, unless otherwise stated.
-
- * To generate the fully patched source, in a form ready for
-   editing, that would be built to create Debian packages, run: 
-
-     make -f debian/rules apply-patches
-
-   Note: It has been proposed that, in future, this should happen 
-   automatically when you run dpkg-source -x on a CDBS 
-   simple-patchsys.mk source package.  However, this proposal has 
-   apparently not yet been implemented, so for now you have to do 
-   it yourself like this.
-
- * To modify the source and save those modifications so that
-   they will be applied when building the package, pick a
-   suitably informative patch file name, for example
-   01_add_README.source_file.patch, and then run:
-
-     cdbs-edit-patch 01_add_README.source_file.patch
-
-   This will place you in a new shell in a temporary copy of the 
-   source tree.  Make your desired modifications to it, and then 
-   exit the shell to create the patch file containing them (this 
-   file will appear in debian/patches).
-
- * To remove source modifications that are currently being
-   applied when building the package, run:
-
-     make -f debian/rules reverse-patches
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..c9b62d2
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+svn_revision
+svn_revision.txt
+src/svn_revision.h
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index cca3786..cf87174 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: video
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Maia Kozheva <sikon at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 6), libqt4-dev (>= 4.3), zlib1g-dev
+Build-Depends: debhelper (>= 7.0.50~), libqt4-dev (>= 4.3), zlib1g-dev
 Standards-Version: 3.8.3
 Homepage: http://smplayer.sourceforge.net/
 
diff --git a/debian/rules b/debian/rules
index 675054b..c491e37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,17 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE
+MAKE_OPTS  = PREFIX=/usr QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 QMAKE_OPTS="$(QMAKE_OPTS)"
 
-QMAKE_OPTS		    = DEFINES+=NO_DEBUG_ON_CONSOLE
+override_dh_auto_clean:
+	[ ! -f src/Makefile ] || dh_auto_clean
 
-DEB_MAKE_INVOKE             = $(MAKE)
-DEB_MAKE_BUILD_TARGET       = PREFIX=/usr QMAKE=qmake-qt4 QMAKE_OPTS="$(QMAKE_OPTS)" LRELEASE=lrelease-qt4 CONF_PATH=\\\"/usr/share/smplayer\\\"
-DEB_MAKE_INSTALL_TARGET     = $(DEB_MAKE_BUILD_TARGET) DESTDIR=$(CURDIR)/debian/tmp install
-DEB_INSTALL_CHANGELOGS_ALL  = Changelog
+override_dh_auto_build:
+	dh_auto_build -- $(MAKE_OPTS) DOC_PATH=\\\"/usr/share/doc/smplayer\\\"
 
-clean::
-	rm -f svn_revision svn_revision.txt src/svn_revision.h
+override_dh_auto_install:
+	dh_auto_install -- $(MAKE_OPTS) DOC_PATH=/usr/share/doc/smplayer
+	rm -f debian/tmp/usr/share/doc/smplayer/Copying.txt
 
-binary-install/smplayer::
-	dh_icons -p smplayer
+%:
+	dh $@

-- 
smplayer packaging