r733 - in vdr/vdr-plugin-bitstreamout/trunk/debian: . lintian
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 26 Jun 2005 21:53:34 +0000
Author: tiber-guest
Date: 2005-06-26 21:53:34 +0000 (Sun, 26 Jun 2005)
New Revision: 733
Added:
vdr/vdr-plugin-bitstreamout/trunk/debian/compat
vdr/vdr-plugin-bitstreamout/trunk/debian/lintian/
vdr/vdr-plugin-bitstreamout/trunk/debian/lintian/vdr-plugin-bitstreamout
Removed:
vdr/vdr-plugin-bitstreamout/trunk/debian/dirs
vdr/vdr-plugin-bitstreamout/trunk/debian/vdr-plugin-bitstreamout.override
Modified:
vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
vdr/vdr-plugin-bitstreamout/trunk/debian/config
vdr/vdr-plugin-bitstreamout/trunk/debian/copyright
vdr/vdr-plugin-bitstreamout/trunk/debian/install
vdr/vdr-plugin-bitstreamout/trunk/debian/postinst
vdr/vdr-plugin-bitstreamout/trunk/debian/postrm
vdr/vdr-plugin-bitstreamout/trunk/debian/rules
Log:
took over some changes from vdrdevel
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog 2005-06-26 21:53:34 UTC (rev 733)
@@ -1,7 +1,12 @@
vdr-plugin-bitstreamout (0.84-1) unstable; urgency=low
* (NOT RELEASED YET) New upstream release
-
+ * Tobias Grimm <tg@e-tobi.net>
+ - Using debian/compat now
+ - Reformatted some files
+ - Fixed upstream homepage
+ - Moved ovverrides to debian/lintian
+ - Using "unified" debian/rules now
* Thomas Schmidt <tschmidt@debian.org>
- New upstream release
- Added initial Czech translation (cs.po) of the debconf template
Added: vdr/vdr-plugin-bitstreamout/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/compat 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/compat 2005-06-26 21:53:34 UTC (rev 733)
@@ -0,0 +1 @@
+4
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/config
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/config 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/config 2005-06-26 21:53:34 UTC (rev 733)
@@ -2,9 +2,9 @@
if ! mount | grep -q tmpfs
then
- . /usr/share/debconf/confmodule
+ . /usr/share/debconf/confmodule
- # ask module install question:
- db_input high vdr-plugin-bitstreamout/mount_tmpfs || false
- db_go
+ # ask module install question:
+ db_input high vdr-plugin-bitstreamout/mount_tmpfs || false
+ db_go
fi
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/copyright 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/copyright 2005-06-26 21:53:34 UTC (rev 733)
@@ -1,7 +1,7 @@
This package was debianized by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> on
Sun, 3 Jun 2003 01:27:40 +0200.
-It was downloaded from http://bistreamout.sourceforge.net
+It was downloaded from http://bitstreamout.sourceforge.net
Upstream Author: Dr. Werner Fink <werner@suse.de>
Deleted: vdr/vdr-plugin-bitstreamout/trunk/debian/dirs
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/dirs 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/dirs 2005-06-26 21:53:34 UTC (rev 733)
@@ -1 +0,0 @@
-usr/share/lintian/overrides
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/install 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/install 2005-06-26 21:53:34 UTC (rev 733)
@@ -1 +1,2 @@
-libvdr-bitstreamout.so.* usr/lib/vdr/plugins
+libvdr-bitstreamout.so.* usr/lib/vdr/plugins/
+debian/lintian/vdr-plugin-bitstreamout usr/share/lintian/overrides/
Added: vdr/vdr-plugin-bitstreamout/trunk/debian/lintian/vdr-plugin-bitstreamout
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/lintian/vdr-plugin-bitstreamout 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/lintian/vdr-plugin-bitstreamout 2005-06-26 21:53:34 UTC (rev 733)
@@ -0,0 +1 @@
+vdr-plugin-bitstreamout: package-contains-upstream-install-documentation usr/share/doc/vdr-plugin-bitstreamout/INSTALL
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/postinst 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/postinst 2005-06-26 21:53:34 UTC (rev 733)
@@ -26,33 +26,33 @@
case "$1" in
configure)
- . /usr/share/debconf/confmodule
+ . /usr/share/debconf/confmodule
- db_get vdr-plugin-bitstreamout/mount_tmpfs
-
- if [ $RET = "true" ]
- then
- # Try to mount tmpfs
+ db_get vdr-plugin-bitstreamout/mount_tmpfs
- if ! mount | grep -q tmpfs
- then
- if [ ! -d /dev/shm ]
- then
- mkdir /dev/shm
- fi
-
- if mount -t tmpfs tmpfs /dev/shm
- then
- if ! cat /etc/fstab | grep -q ^tmpfs
- then
- echo "tmpfs /dev/shm tmpfs defaults 0 0" >> /etc/fstab
- fi
- else
- echo "tmpfs could not be mounted, probably your kernel \
- does not have tmpfs-support"
- fi
- fi
- fi
+ if [ $RET = "true" ]
+ then
+ # Try to mount tmpfs
+
+ if ! mount | grep -q tmpfs
+ then
+ if [ ! -d /dev/shm ]
+ then
+ mkdir /dev/shm
+ fi
+
+ if mount -t tmpfs tmpfs /dev/shm
+ then
+ if ! cat /etc/fstab | grep -q ^tmpfs
+ then
+ echo "tmpfs /dev/shm tmpfs defaults 0 0" >> /etc/fstab
+ fi
+ else
+ echo "tmpfs could not be mounted, probably your kernel \
+ does not have tmpfs-support"
+ fi
+ fi
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -70,4 +70,3 @@
#DEBHELPER#
exit 0
-
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/postrm
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/postrm 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/postrm 2005-06-26 21:53:34 UTC (rev 733)
@@ -19,19 +19,19 @@
case "$1" in
- purge)
- # purge debconf database
- . /usr/share/debconf/confmodule
- db_purge || echo "WARNING: db_purge failed"
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
+ purge)
+ # purge debconf database
+ . /usr/share/debconf/confmodule
+ db_purge || echo "WARNING: db_purge failed"
+ ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/rules 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/rules 2005-06-26 21:53:34 UTC (rev 733)
@@ -5,12 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -18,40 +12,47 @@
INSTALL_PROGRAM += -s
endif
-VDR=vdr
-PACKAGE=$(VDR)-plugin-bitstreamout
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
dh_testdir
-
touch configure-stamp
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp
+build: build-stamp
+build-stamp: configure-stamp
dh_testdir
-
- $(MAKE) all CXXARCH= DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=.
-
+ $(MAKE) all CXXARCH= DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+ [ "$(VDR)" = "vdr" ] || cp vdr-bitstreamout.5 $(VDR)-bitstreamout.5
touch build-stamp
clean: clean-patched unpatch
-
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- rm -rf build-tree
-
- rm -f libvdr-*.so*
- -make clean
+ -$(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
+ [ "$(VDR)" = "vdr" ] || rm -f $(VDR)-bitstreamout.5
- # Update debconf-templates:
- debconf-updatepo
-
+ # Update debconf-templates:
+ debconf-updatepo
+
dh_clean
install: build
@@ -59,10 +60,6 @@
dh_testroot
dh_clean -k
dh_installdirs
-
- # lintian override
- cp $(CURDIR)/debian/vdr-plugin-bitstreamout.override $(CURDIR)/debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE)
-
dh_install
# Build architecture-independent files here.
@@ -73,34 +70,33 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdebconf
+ dh_installdebconf
dh_installdocs
dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman vdr-bitstreamout.5
- dh_installinfo
- dh_installchangelogs
- dh_installchangelogs ChangeLog
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+ dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
dh_fixperms
+# dh_makeshlibs
dh_installdeb
+# dh_perl
dh_shlibdeps
-
- # VDR can be customized with quite a lot of different patches, which can make
- # the plugins binary incompatible.
- # Although Debian will not provide different binary packages for VDR, we
- # will include a patchlevel info, which is created at compile time and can
- # be checked before a plugin is loaded.
-
- [ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
- [ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
-
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Deleted: vdr/vdr-plugin-bitstreamout/trunk/debian/vdr-plugin-bitstreamout.override
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/vdr-plugin-bitstreamout.override 2005-06-26 21:16:01 UTC (rev 732)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/vdr-plugin-bitstreamout.override 2005-06-26 21:53:34 UTC (rev 733)
@@ -1 +0,0 @@
-vdr-plugin-bitstreamout: package-contains-upstream-install-documentation usr/share/doc/vdr-plugin-bitstreamout/INSTALL