r785 - in vdr/vdr-plugin-muggle/trunk/debian: . patches

Tobias Grimm pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 04 Jul 2005 17:13:19 +0000


Author: tiber-guest
Date: 2005-07-04 17:13:19 +0000 (Mon, 04 Jul 2005)
New Revision: 785

Removed:
   vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch
Modified:
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/control
   vdr/vdr-plugin-muggle/trunk/debian/patches/00list
   vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf
   vdr/vdr-plugin-muggle/trunk/debian/rules
Log:
- New upstream release
- Took over changes from vdrdevel


Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2005-07-03 16:58:42 UTC (rev 784)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2005-07-04 17:13:19 UTC (rev 785)
@@ -1,7 +1,15 @@
+vdr-plugin-muggle (0.1.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Added graphTFT-cover patch
+  * Activated FLAC support
+  * Added libflac++-dev to Build-Depends in debian/control
+  * Bumped Standards-Version to 3.6.2
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Mon,  4 Jul 2005 19:01:36 +0200
+
 vdr-plugin-muggle (0.1.6-5) unstable; urgency=low
 
-  * (NOT RELEASED YET)
-
   * Thomas Schmidt <tschmidt@debian.org>
     - Depend/Build-Depend on vdr (>=1.3.27-1)
     - Conflict with vdr (>=1.3.28)

Modified: vdr/vdr-plugin-muggle/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control	2005-07-03 16:58:42 UTC (rev 784)
+++ vdr/vdr-plugin-muggle/trunk/debian/control	2005-07-04 17:13:19 UTC (rev 785)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders:  Thomas Günther <tom@toms-cafe.de>, Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <tg@e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.27-1), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.27-1), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev
+Standards-Version: 3.6.2
 
 Package: vdr-plugin-muggle
 Architecture: any

Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2005-07-03 16:58:42 UTC (rev 784)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2005-07-04 17:13:19 UTC (rev 785)
@@ -1,2 +1 @@
-01_include-i18n
 02_graphTFT-cover

Deleted: vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch	2005-07-03 16:58:42 UTC (rev 784)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch	2005-07-04 17:13:19 UTC (rev 785)
@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 01_include-i18n patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add include i18n.h for compatibility with vdr-1.2.6.
-
-@DPATCH@
---- muggle-0.1.6/vdr_decoder.c
-+++ muggle-0.1.6/vdr_decoder.c
-@@ -30,6 +30,7 @@
- #include "vdr_setup.h"
- #include "vdr_decoder.h"
- #include "vdr_decoder_mp3.h"
-+#include "i18n.h"
- 
- extern void showmessage(const char *,int duration=0);
- 

Modified: vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf	2005-07-03 16:58:42 UTC (rev 784)
+++ vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf	2005-07-04 17:13:19 UTC (rev 785)
@@ -34,7 +34,7 @@
 #
 # -u USERNAME
 
--u root
+-u muggle
 
 # use PASSWORD as database password
 # (default is none)
@@ -46,11 +46,3 @@
 # (default is "/mnt/music")
 #
 # -t TOPDIR
-
-
-# enable full Giantdisc compatibility mode
-# (default is no)
-#
-# -g
-
--g

Modified: vdr/vdr-plugin-muggle/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules	2005-07-03 16:58:42 UTC (rev 784)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules	2005-07-04 17:13:19 UTC (rev 785)
@@ -42,7 +42,7 @@
 	touch mg_tables.h
 
 	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
-	    HAVE_ONLY_SERVER=1 HAVE_VORBISFILE=1
+	    HAVE_ONLY_SERVER=1 HAVE_VORBISFILE=1 HAVE_FLAC=1
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -50,7 +50,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean HAVE_VORBISFILE=1
+	-$(MAKE) -o .dependencies clean HAVE_VORBISFILE=1 HAVE_FLAC=1
 	rm -f libvdr-*.so.*
 	dh_clean