r3368 - in vdr/vdr-plugin-mp3/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sat Sep 23 16:02:55 UTC 2006
Author: tiber-guest
Date: 2006-09-23 16:02:54 +0000 (Sat, 23 Sep 2006)
New Revision: 3368
Added:
vdr/vdr-plugin-mp3/trunk/debian/TODO.Debian
vdr/vdr-plugin-mp3/trunk/debian/compat
vdr/vdr-plugin-mp3/trunk/debian/mount
vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.examples
Removed:
vdr/vdr-plugin-mp3/trunk/debian/mount.sh
vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch
vdr/vdr-plugin-mp3/trunk/debian/patches/10_mount.sh-path.dpatch
vdr/vdr-plugin-mp3/trunk/debian/patches/90_APIVERSION.dpatch
Modified:
vdr/vdr-plugin-mp3/trunk/debian/changelog
vdr/vdr-plugin-mp3/trunk/debian/control
vdr/vdr-plugin-mp3/trunk/debian/patches/00list
vdr/vdr-plugin-mp3/trunk/debian/rules
vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.dirs
vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.install
vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.links
Log:
* Removed 01_g++4.1-fix.dpatch
* Removed 90_APIVERSION.dpatch
* Renamed 10_mount.sh-path.dpatch to 10_debian-fhs-defaults.dpatch
* Install HISTROY with dh_installchangelogs
* Depend on eject
* Depend on mjpegtools (>=1:1.8.0) and netpbm
* Moved shell scripts to /usr/share/vdr-plugin-mp3
* Added debian/compat
Added: vdr/vdr-plugin-mp3/trunk/debian/TODO.Debian
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/TODO.Debian (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/TODO.Debian 2006-09-23 16:02:54 UTC (rev 3368)
@@ -0,0 +1,2 @@
+* Make a more Debian-like mp3sources.conf (maybe pointing to /media/cdrom and
+ /media/usb - but what about cdfs?)
Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,7 +1,15 @@
vdr-plugin-mp3 (0.9.15-1) UNRELEASED; urgency=low
- * (NOT RELEASED YET) New upstream release
+ * (NOT RELEASED YET)
+ * New upstream release
+ * Removed 01_g++4.1-fix.dpatch
+ * Removed 90_APIVERSION.dpatch
+ * Renamed 10_mount.sh-path.dpatch to 10_debian-fhs-defaults.dpatch
* Install HISTROY with dh_installchangelogs
+ * Depend on eject
+ * Depend on mjpegtools (>=1:1.8.0) and netpbm
+ * Moved shell scripts to /usr/share/vdr-plugin-mp3
+ * Added debian/compat
-- Tobias Grimm <tg at e-tobi.net> Thu, 21 Sep 2006 21:53:46 +0200
Added: vdr/vdr-plugin-mp3/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/compat (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/compat 2006-09-23 16:02:54 UTC (rev 3368)
@@ -0,0 +1 @@
+4
Modified: vdr/vdr-plugin-mp3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/control 2006-09-23 16:02:54 UTC (rev 3368)
@@ -3,12 +3,12 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, vdr-dev (>=1.4.2-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>=1.4.2-1), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev
Standards-Version: 3.7.2
Package: vdr-plugin-mp3
Architecture: any
-Depends: ${shlibs:Depends}, ${vdr:Depends}
+Depends: ${shlibs:Depends}, ${vdr:Depends}, eject, mjpegtools (>=1:1.8.0), netpbm
Conflicts: ${vdr:Conflicts}
Description: Plugin to vdr for playing mp3's
This plugin for vdr allows you to play mp3's, ogg-files and
Copied: vdr/vdr-plugin-mp3/trunk/debian/mount (from rev 3365, vdr/vdr-plugin-mp3/trunk/debian/mount.sh)
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mount (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/mount 2006-09-23 16:02:54 UTC (rev 3368)
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# This script is called from VDR to mount/unmount/eject
+# the sources for MP3 play and/or image sources,
+#
+# argument 1: wanted action, one of mount,unmount,eject,status
+# argument 2: mountpoint to act on
+#
+# mount,unmount,eject must return 0 if succeeded, 1 if failed
+# status must return 0 if device is mounted, 1 if not
+#
+# ok -> changed mount to not abort, if eject -t did fail, e.g. for a usb storage device
+
+action="$1"
+path="$2"
+
+case "$action" in
+mount)
+ eject -t "$path" &>/dev/null # close the tray, but not do/print anything if that fails
+ mount "$path" || exit 1 # mount it
+ ;;
+unmount)
+ umount "$path" || exit 1 # unmount it
+ ;;
+eject)
+ eject "$path" || exit 1 # eject disk
+ ;;
+status)
+ cat /proc/mounts | grep -q "$path" # check if mounted
+ if [ $? -ne 0 ]; then # not mounted ...
+ exit 1
+ fi
+esac
+
+exit 0
Deleted: vdr/vdr-plugin-mp3/trunk/debian/mount.sh
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mount.sh 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/mount.sh 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# This script is called from VDR to mount/unmount/eject
-# the sources for MP3 play and/or image sources,
-#
-# argument 1: wanted action, one of mount,unmount,eject,status
-# argument 2: mountpoint to act on
-#
-# mount,unmount,eject must return 0 if succeeded, 1 if failed
-# status must return 0 if device is mounted, 1 if not
-#
-# ok -> changed mount to not abort, if eject -t did fail, e.g. for a usb storage device
-
-action="$1"
-path="$2"
-
-case "$action" in
-mount)
- eject -t "$path" &>/dev/null # close the tray, but not do/print anything if that fails
- mount "$path" || exit 1 # mount it
- ;;
-unmount)
- umount "$path" || exit 1 # unmount it
- ;;
-eject)
- eject "$path" || exit 1 # eject disk
- ;;
-status)
- cat /proc/mounts | grep -q "$path" # check if mounted
- if [ $? -ne 0 ]; then # not mounted ...
- exit 1
- fi
-esac
-
-exit 0
Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,3 +1 @@
-01_g++4.1-fix
-10_mount.sh-path
-90_APIVERSION
+10_debian-fhs-defaults
Deleted: vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 01_g++4.1-fix.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS with g++4.1 (closes: #356176)
-
- at DPATCH@
-diff -urNad vdr-plugin-mp3-0.9.14/decoder-ogg.h /tmp/dpep.p5GRLd/vdr-plugin-mp3-0.9.14/decoder-ogg.h
---- vdr-plugin-mp3-0.9.14/decoder-ogg.h 2005-02-06 12:42:26.000000000 +0100
-+++ /tmp/dpep.p5GRLd/vdr-plugin-mp3-0.9.14/decoder-ogg.h 2006-03-14 16:59:45.218308000 +0100
-@@ -49,7 +49,7 @@
- ~cOggFile();
- bool Open(bool log=true);
- void Close(void);
-- long long cOggFile::Seek(long long posMs=0, bool relativ=false);
-+ long long Seek(long long posMs=0, bool relativ=false);
- int Stream(short *buffer, int samples);
- bool CanSeek(void) { return canSeek; }
- long long IndexMs(void);
Copied: vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch (from rev 3365, vdr/vdr-plugin-mp3/trunk/debian/patches/10_mount.sh-path.dpatch)
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch 2006-09-23 16:02:54 UTC (rev 3368)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 10_debian-fhs-defaults by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change several default-paths for Debian FHS conformance
+
+ at DPATCH@
+diff -urNad vdr-plugin-mp3-0.9.15~/data-mp3.c vdr-plugin-mp3-0.9.15/data-mp3.c
+--- vdr-plugin-mp3-0.9.15~/data-mp3.c 2006-04-23 17:41:14.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/data-mp3.c 2006-09-23 16:55:54.000000000 +0200
+@@ -36,8 +36,8 @@
+ #define di(x) ;
+ #endif
+
+-const char *imagecache = "/var/cache/images/mp3";
+-const char *imageconv = "image_convert.sh";
++const char *imagecache = "/var/cache/vdr-plugin-mp3/images";
++const char *imageconv = "/usr/share/vdr-plugin-mp3/image_convert";
+
+ // image suffixes to search
+ const char *img_suff[] = { "jpg","png","gif",0 };
+diff -urNad vdr-plugin-mp3-0.9.15~/data.c vdr-plugin-mp3-0.9.15/data.c
+--- vdr-plugin-mp3-0.9.15~/data.c 2006-05-16 19:31:09.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/data.c 2006-09-23 16:51:16.000000000 +0200
+@@ -38,7 +38,7 @@
+
+ // ----------------------------------------------------------------
+
+-const char *mountscript = "mount.sh";
++const char *mountscript = "/usr/lib/vdr-plugin-mp3/mount.sh";
+
+ char *Quote(const char *str)
+ {
Deleted: vdr/vdr-plugin-mp3/trunk/debian/patches/10_mount.sh-path.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/10_mount.sh-path.dpatch 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/10_mount.sh-path.dpatch 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 10_mount.sh-path.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change the default-path of mount.sh to /usr/lib/vdr-plugin-mp3/mount.sh
-
- at DPATCH@
-diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-mp3/vdr-plugin-mp3-0.8.3/data.c vdr-plugin-mp3-0.8.3/data.c
---- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-mp3/vdr-plugin-mp3-0.8.3/data.c 2004-04-22 13:17:27.000000000 +0200
-+++ vdr-plugin-mp3-0.8.3/data.c 2004-07-03 14:49:38.000000000 +0200
-@@ -36,7 +36,7 @@
-
- // ----------------------------------------------------------------
-
--const char *mountscript = "mount.sh";
-+const char *mountscript = "/usr/lib/vdr-plugin-mp3/mount.sh";
-
- char *Quote(const char *str)
- {
Deleted: vdr/vdr-plugin-mp3/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/90_APIVERSION.dpatch 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/90_APIVERSION.dpatch 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
- -patch)
- sed -i -e s/VDRVERSION/APIVERSION/g Makefile
- ;;
- -unpatch)
- sed -i -e s/APIVERSION/VDRVERSION/g Makefile
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
- ;;
-esac
-
-exit 0
Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules 2006-09-23 16:02:54 UTC (rev 3368)
@@ -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,37 +12,42 @@
INSTALL_PROGRAM += -s
endif
-VDR=vdr
-PACKAGE=$(VDR)-plugin-mp3
-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 DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=. \
- WITH_OSS_OUTPUT=1 WITHOUT_MPLAYER=1
-
+ $(MAKE) all VDRDIR=/usr/include/$(VDR) LIBDIR=. \
+ WITH_OSS_OUTPUT=1 WITHOUT_MPLAYER=1
touch build-stamp
clean: clean-patched unpatch
-
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
- -make clean VDRDIR=$(VDRDIR)
- rm -f libvdr-*.so*
-
+ -$(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
dh_clean
install: build
@@ -56,14 +55,17 @@
dh_testroot
dh_clean -k
dh_installdirs
-
dh_install
- # install mount.sh and mp3sources.conf
- cp $(CURDIR)/examples/mp3sources.conf.example $(CURDIR)/debian/$(PACKAGE)/etc/vdr/plugins/mp3sources.conf
- #cp $(CURDIR)/examples/mount.sh.example $(CURDIR)/debian/$(PACKAGE)/usr/lib/$(PACKAGE)/mount.sh
- chmod 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib/$(PACKAGE)/mount.sh
+ install -m 755 $(CURDIR)/debian/mount \
+ $(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/
+ install -m 755 $(CURDIR)/examples/image_convert.sh.example \
+ $(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/image_convert
+
+ cp $(CURDIR)/examples/mp3sources.conf.example \
+ $(CURDIR)/debian/$(VDR)-plugin-mp3/etc/vdr/plugins/mp3sources.conf
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -72,18 +74,27 @@
binary-arch: build install
dh_testdir
dh_testroot
+# dh_installdebconf
dh_installdocs
- dh_installexamples -pvdr-plugin-mp3 examples/mount.sh.example examples/mp3sources.conf.example
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
dh_installchangelogs HISTORY
dh_link
dh_strip
dh_compress
dh_fixperms
+# dh_makeshlibs
dh_installdeb
+# dh_perl
dh_shlibdeps
/usr/lib/$(VDR)-dev/patchlevel.sh subst
/usr/lib/$(VDR)-dev/dependencies.sh
@@ -92,4 +103,5 @@
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
Modified: vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.dirs
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.dirs 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.dirs 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,2 +1,3 @@
-etc/vdr/plugins
-usr/lib/vdr-plugin-mp3
+etc/vdr/plugins/
+usr/share/vdr-plugin-mp3/
+var/cache/vdr-plugin-mp3/images/
Added: vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.examples
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.examples (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.examples 2006-09-23 16:02:54 UTC (rev 3368)
@@ -0,0 +1 @@
+examples/*
Modified: vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.install
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.install 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.install 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1,3 +1 @@
-libvdr-mp3.so.* usr/lib/vdr/plugins
-
-debian/mount.sh usr/lib/vdr-plugin-mp3
+libvdr-mp3.so.* usr/lib/vdr/plugins
Modified: vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.links
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.links 2006-09-23 14:32:13 UTC (rev 3367)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.links 2006-09-23 16:02:54 UTC (rev 3368)
@@ -1 +1 @@
-etc/vdr/plugins/mp3sources.conf var/lib/vdr/plugins/mp3sources.conf
+etc/vdr/plugins/mp3sources.conf var/lib/vdr/plugins/mp3sources.conf
More information about the pkg-vdr-dvb-changes
mailing list