[vdr] 01/02: Updated default plugin templated, dropped dependencies.sh

Tobias Grimm tiber-guest at moszumanska.debian.org
Sun Mar 15 11:35:06 UTC 2015


This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr.

commit 7ef29753a78f64fa2bf5c91d662af63d97221400
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 15 09:32:25 2015 +0100

    Updated default plugin templated, dropped dependencies.sh
---
 debian/dependencies.sh       | 21 ---------------------
 debian/plugin-template/rules | 15 +--------------
 debian/vdr-dev.install       |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/dependencies.sh b/debian/dependencies.sh
deleted file mode 100644
index 20ce380..0000000
--- a/debian/dependencies.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# dependencies.sh - vdr plugins depend on the current vdr version
-#
-# This script is called in debian/rules of vdr plugins:
-#    sh /usr/share/vdr-dev/dependencies.sh
-#
-# It sets a dependency to the current vdr version for all binary packages of the
-# plugin package. The current vdr version is the version of the vdr-dev package
-# used to compile the plugin package.
-#
-# This script sets the substitution variable "vdr:Depends" which is used in the
-# debian/control file of vdr plugins, e.g.:
-#    Depends: ${vdr:Depends}
-
-set -e
-
-ABI_VERSION=`cat /usr/share/vdr-dev/abi-version`
-
-# A plugin requires exactly the VDR ABI version it was compiled for
-for p in $(dh_listpackages); do
-    echo "vdr:Depends=$ABI_VERSION" >> debian/$p.substvars
-done
diff --git a/debian/plugin-template/rules b/debian/plugin-template/rules
index 9f487b6..5b5f32f 100755
--- a/debian/plugin-template/rules
+++ b/debian/plugin-template/rules
@@ -3,18 +3,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
-
 %:
-	dh $@
-
-override_dh_auto_build:
-	dh_auto_build -- all $(MAKE_OPTIONS)
-
-override_dh_auto_clean:
-	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -rf locale libvdr-*.so.*
-
-override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
+	dh $@ --with vdrplugin
diff --git a/debian/vdr-dev.install b/debian/vdr-dev.install
index 2f3cd56..eccb947 100644
--- a/debian/vdr-dev.install
+++ b/debian/vdr-dev.install
@@ -4,7 +4,6 @@ usr/lib/pkgconfig/vdr.pc
 debian/debianize-vdrplugin      usr/bin/
 
 debian/plugin-template/         usr/share/vdr-dev/
-debian/dependencies.sh          usr/share/vdr-dev/
 debian/abi-version              usr/share/vdr-dev/
 
 debian/dh-addon-vdrplugin/vdrplugin.pm               /usr/share/perl5/Debian/Debhelper/Sequence/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git



More information about the pkg-vdr-dvb-changes mailing list