rev 10821 - in kde-extras/kvdr/trunk: . debian debian/patches
Mark Purcell
msp at alioth.debian.org
Sun Jun 1 11:47:04 UTC 2008
Author: msp
Date: 2008-06-01 11:47:04 +0000 (Sun, 01 Jun 2008)
New Revision: 10821
Added:
kde-extras/kvdr/trunk/debian/
kde-extras/kvdr/trunk/debian/README.Debian
kde-extras/kvdr/trunk/debian/changelog
kde-extras/kvdr/trunk/debian/control
kde-extras/kvdr/trunk/debian/copyright
kde-extras/kvdr/trunk/debian/dirs
kde-extras/kvdr/trunk/debian/kvdr.1
kde-extras/kvdr/trunk/debian/kvdr.1.sgml
kde-extras/kvdr/trunk/debian/kvdr.doc-base_debhelp_broken
kde-extras/kvdr/trunk/debian/kvdr.postinst
kde-extras/kvdr/trunk/debian/kvdr.sh
kde-extras/kvdr/trunk/debian/kvdr.xpm
kde-extras/kvdr/trunk/debian/menu
kde-extras/kvdr/trunk/debian/patches/
kde-extras/kvdr/trunk/debian/patches/05_amd64_fixes.patch
kde-extras/kvdr/trunk/debian/patches/10_bad_pointer_cast.patch
kde-extras/kvdr/trunk/debian/rules
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: kde-extras/kvdr/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: kde-extras/kvdr/trunk/debian/README.Debian
===================================================================
--- kde-extras/kvdr/trunk/debian/README.Debian (rev 0)
+++ kde-extras/kvdr/trunk/debian/README.Debian 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,23 @@
+kvdr for Debian
+---------------
+
+The default kvdr executable (runned as kvdr.real) depends on a working VDR
+setup, providing an open port for the local machine (see vdr(1) manpage,
+/usr/share/doc/vdr/examples/svdrphosts.conf).
+
+ - If you have already running VDR and listening on VDR port, you can call
+ kvdr.real directly. If you wish to use this menu wrapper, create the symlink
+ "~/.kvdr-vdir" pointing to your video directory.
+
+ - If you have working vdr, you only need to enable SVDRP access. To do this,
+ copy the file /usr/share/doc/vdr/examples/svdrphosts.conf to your video
+ directory, then proceed as described above.
+
+ - If you did not configure vdr before, please read its documentation (in
+ /usr/share/doc/vdr), create the needed files (or copy the examples) and
+ proceed as described above.
+
+The menu wrapper script will try to invoke a new session of vdr-daemon if no
+running vdr has been detected.
+
+ -- Eduard Bloch <blade at debian.org>, Tue, 20 Aug 2002 10:45:42 +0200
Added: kde-extras/kvdr/trunk/debian/changelog
===================================================================
--- kde-extras/kvdr/trunk/debian/changelog (rev 0)
+++ kde-extras/kvdr/trunk/debian/changelog 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,193 @@
+kvdr (0.64-5.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix bashism in debian/rules. (Closes: #477591)
+ * Fix menu section.
+
+ -- Peter Eisentraut <petere at debian.org> Mon, 26 May 2008 03:39:19 +0200
+
+kvdr (0.64-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with due to a bad cast conversion. (Closes: #442984)
+ Patch by Mike O'Connor <stew at vireo.org>.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Wed, 26 Dec 2007 09:35:45 +0100
+
+kvdr (0.64-5) unstable; urgency=low
+
+ * New maintainer. (Closes: #412469: ITA: kvdr -- DVB (digital TV)
+ Video Disk Recorder for KDE - Debian Bug report logs)
+ * Thanks to Alastair McKinstry for maintenance todate
+
+ -- Mark Purcell <msp at debian.org> Tue, 13 Mar 2007 22:18:45 +0000
+
+kvdr (0.64-4) unstable; urgency=low
+
+ * New maintainer. (Closes: #412469: ITA: kvdr -- DVB (digital TV)
+ Video Disk Recorder for KDE - Debian Bug report logs)
+ * Thanks to Alastair McKinstry for maintenance todate
+
+ -- Mark Purcell <msp at debian.org> Tue, 13 Mar 2007 20:55:19 +0000
+
+kvdr (0.64-3) unstable; urgency=low
+
+ * Rebuild against libXft package for Xft.so.2. Closes: #370395.
+ * Move to debhelper >= 5. No changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 11 Sep 2006 11:28:42 +0100
+
+kvdr (0.64-2) unstable; urgency=low
+
+ * Fix Build-Dep on libxv-dev (xorg transition). Closes: #372550
+ * Move to Standards-Version: 3.7.2. No changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 20 Jun 2006 09:51:42 +0000
+
+kvdr (0.64-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build as non-native package. Closes: #354053.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 8 Mar 2006 12:47:34 +0000
+
+kvdr (0.63-6) unstable; urgency=low
+
+ * Fix FTBFS on ppc64, thanks to patch from Andreas Jochens. Closes: #325274.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 27 Aug 2005 12:46:59 +0100
+
+kvdr (0.63-5) unstable; urgency=low
+
+ * C++ Transition: Depend on kdelibs4-dev >= 3.4.2-1
+ * New build-dependencies on libxxf86vm-dev, libxxf86dga-dev required.
+ * Move to Standards-Version: 3.6.2. No Changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 21 Aug 2005 14:34:19 +0100
+
+kvdr (0.63-4) unstable; urgency=low
+
+ * Do not depend on libgcc=1:4.0, which is in experimental, not sid.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 11 Feb 2005 20:46:40 +0000
+
+kvdr (0.63-3) unstable; urgency=low
+
+ * Improved amd64 patch from Andreas Jochens.
+ * Don't unnecessarily build twice (check build-stamp in debian/rules)
+ * Typo in man page.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 9 Feb 2005 09:45:00 +0000
+
+kvdr (0.63-2) unstable; urgency=low
+
+ * Run autoconf before building; include autoconf changes in patch.
+ Closes: #294326.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 9 Feb 2005 09:28:35 +0000
+
+kvdr (0.63-1) unstable; urgency=low
+
+ * New upstream release. Closes: #293993.
+ * Use DBS to track patch changes.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 7 Feb 2005 10:59:25 +0000
+
+kvdr (0.61-6) unstable; urgency=low
+
+ * FTBFS on amd64: correct cast from void* to int. Closes: #287242.
+ * Fixed lintian warnings:
+ - Don't include zero-byte upstream ChangeLog
+ - Place menu file in /usr/share/applications
+ - quoted sections in .menu file
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 31 Jan 2005 19:49:42 +0000
+
+kvdr (0.61-3) unstable; urgency=low
+
+ * Remove unused templates that might confuse translators. Closes: #234609.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 25 Feb 2004 20:47:57 +0000
+
+kvdr (0.61-2) unstable; urgency=low
+
+ * Remove references to the removed kvdr/note. Closes: #233513.
+ * kvdr.sh: Don't try to kill $VDRPID if its non-existent. Closes: #223514.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 22 Feb 2004 12:23:04 +0000
+
+kvdr (0.61-1) unstable; urgency=low
+
+ * New upstream version.
+ * Bumped Standards-Version to 3.6.1. No change required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 16 Nov 2003 11:52:31 +0000
+
+kvdr (0.52-3) unstable; urgency=low
+
+ * Bumped Standards-Version to 3.6.0. No change required.
+ * Changed maintainer email to mckinstry at debian.org
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 30 Jul 2003 14:20:10 +0100
+
+kvdr (0.52-2) unstable; urgency=low
+
+ * Remove unnecessary linking against qt. Closes: #194665.
+ * Bumped Standards-Version to 3.5.10. No change required.
+ * Added extra args to configure to find X in minimal build environment:
+ Closes: #194668.
+
+ -- Alastair McKinstry <mckinstry at computer.org> Sun, 25 May 2003 19:36:09 +0100
+
+kvdr (0.52-1) unstable; urgency=low
+
+ * New Maintainer.
+ * New Upstream release.
+ * Built against KDE3/Qt3. Closes: #185986, #164936.
+ * Moved to Standards-Version: 3.5.9
+
+ -- Alastair McKinstry <mckinstry at computer.org> Sun, 25 May 2003 19:18:28 +0100
+
+kvdr (0.51.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed upstream's debian/ crap
+ * Wrote hints to enable SVDRP, closes: #141036
+ * Orphaned the package, no interesst
+
+ -- Eduard Bloch <blade at debian.org> Sat, 3 Aug 2002 12:55:36 +0200
+
+kvdr (0.42-3) unstable; urgency=low
+
+ * New debconf translations, Closes: #136595, #136935, #134465, #137916.
+ Thanks to all translators.
+
+ -- Eduard Bloch <blade at debian.org> Tue, 12 Mar 2002 17:18:13 +0100
+
+kvdr (0.42-2) unstable; urgency=medium
+
+ * Upstream hints: Depends: v4l-conf, Recommends: alsa-utils
+
+ -- Eduard Bloch <blade at debian.org> Wed, 26 Dec 2001 20:55:18 +0100
+
+kvdr (0.42-1) unstable; urgency=low
+
+ * New upstream release
+ * included a warning about an open port
+
+ -- Eduard Bloch <blade at debian.org> Sun, 25 Nov 2001 02:39:45 +0100
+
+kvdr (0.41-1) unstable; urgency=low
+
+ * New upstream release
+ * requires updated vdr, set Depends
+
+ -- Eduard Bloch <blade at debian.org> Wed, 14 Nov 2001 10:00:45 +0100
+
+kvdr (0.35-1) unstable; urgency=low
+
+ * Initial Release.
+ * wrote a simple manpage and a wrapper to start/stop vdr-daemon
+ * fixed the desktop file
+
+ -- Eduard Bloch <blade at debian.org> Fri, 5 Oct 2001 22:55:37 +0200
Added: kde-extras/kvdr/trunk/debian/control
===================================================================
--- kde-extras/kvdr/trunk/debian/control (rev 0)
+++ kde-extras/kvdr/trunk/debian/control 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,19 @@
+Source: kvdr
+Section: misc
+Priority: extra
+Maintainer: Mark Purcell <msp at debian.org>
+Build-Depends: debhelper (>> 5), autotools-dev, autoconf, kdelibs4-dev (>= 3.4.2-1), libqt3-compat-headers, dbs, libxxf86vm-dev, libxxf86dga-dev, libxv-dev
+Standards-Version: 3.7.2
+
+Package: kvdr
+Architecture: any
+Recommends: alsa-utils
+Depends: ${shlibs:Depends}, vdr (>= 0.98), debconf, v4l-conf, gmessage
+Description: DVB (digital TV) Video Disk Recorder for KDE
+ Video Disk Recorder (VDR) is a digital sat-receiver program using
+ Linux and DVB-S technologies. It allows one to record MPEG2 streams,
+ as well as output the stream to TV. It is also possible to watch DVDs with
+ some comfort.
+ .
+ This package contains a frontend program for watching TV in X11/KDE
+ without needing a special TV box.
Added: kde-extras/kvdr/trunk/debian/copyright
===================================================================
--- kde-extras/kvdr/trunk/debian/copyright (rev 0)
+++ kde-extras/kvdr/trunk/debian/copyright 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,11 @@
+This package was debianized by Eduard Bloch <blade at debian.org> on
+Fri, 5 Oct 2001 22:55:37 +0200.
+
+It was downloaded from http://www.s.netic.de/gfiala/
+
+Upstream Author: Guido Fiala <gfiala at s.netic.de>
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: kde-extras/kvdr/trunk/debian/dirs
===================================================================
--- kde-extras/kvdr/trunk/debian/dirs (rev 0)
+++ kde-extras/kvdr/trunk/debian/dirs 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1 @@
+/usr/share/doc/kde
Added: kde-extras/kvdr/trunk/debian/kvdr.1
===================================================================
--- kde-extras/kvdr/trunk/debian/kvdr.1 (rev 0)
+++ kde-extras/kvdr/trunk/debian/kvdr.1 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,88 @@
+.\" This -*- nroff -*- file has been generated from
+.\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
+...\"
+...\" transcript compatibility for postscript use.
+...\"
+...\" synopsis: .P! <file.ps>
+...\"
+.de P!
+\\&.
+.fl \" force out current output buffer
+\\!%PB
+\\!/showpage{}def
+...\" the following is from Ken Flowers -- it prevents dictionary overflows
+\\!/tempdict 200 dict def tempdict begin
+.fl \" prolog
+.sy cat \\$1\" bring in postscript file
+...\" the following line matches the tempdict above
+\\!end % tempdict %
+\\!PE
+\\!.
+.sp \\$2u \" move below the image
+..
+.de pF
+.ie \\*(f1 .ds f1 \\n(.f
+.el .ie \\*(f2 .ds f2 \\n(.f
+.el .ie \\*(f3 .ds f3 \\n(.f
+.el .ie \\*(f4 .ds f4 \\n(.f
+.el .tm ? font overflow
+.ft \\$1
+..
+.de fP
+.ie !\\*(f4 \{\
+. ft \\*(f4
+. ds f4\"
+' br \}
+.el .ie !\\*(f3 \{\
+. ft \\*(f3
+. ds f3\"
+' br \}
+.el .ie !\\*(f2 \{\
+. ft \\*(f2
+. ds f2\"
+' br \}
+.el .ie !\\*(f1 \{\
+. ft \\*(f1
+. ds f1\"
+' br \}
+.el .tm ? font underflow
+..
+.ds f1\"
+.ds f2\"
+.ds f3\"
+.ds f4\"
+'\" t
+.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+.TH "KVDR" "1"
+.SH "NAME"
+kvdr \(em program to watch TV and record DVB video
+.SH "SYNOPSIS"
+.PP
+\fBkvdr\fP
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBkvdr\fP command.
+.PP
+This manual page was written for the \fBDebian GNU/Linux\fP distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the
+\fBHTML\fP format; see below.
+.PP
+This program can be invoked as \fBkvdr\fP or \fBkvdr.real\fP. In the first case, a wrapper script is run which will try to invoke the underlying \fBvdr\fP daemon, run \fBkvdr.real\fP and stop the daemon when \fBkvdr.real\fP has finished.
+
+.SH "OPTIONS"
+.PP
+For a full summary of options, run \fIvdr --help\fP.
+
+.SH "SEE ALSO"
+.PP
+The original documentation from the program author is
+available in \fI/usr/share/doc/kde/HTML/default/kvdr/\fP.
+
+.SH "AUTHOR"
+.PP
+This program was written by Guido Fiala (gfiala at s.netic.de).
+This manual page was written by Eduard Bloch blade at debian.org for
+the \fBDebian GNU/Linux\fP system (but may be used by others).
+...\" created by instant / docbook-to-man, Mon 08 Oct 2001, 04:25
Added: kde-extras/kvdr/trunk/debian/kvdr.1.sgml
===================================================================
--- kde-extras/kvdr/trunk/debian/kvdr.1.sgml (rev 0)
+++ kde-extras/kvdr/trunk/debian/kvdr.1.sgml 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,111 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Eduard</firstname>">
+ <!ENTITY dhsurname "<surname>Bloch</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>Oktober 5, 2001</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>blade at debian.org</email>">
+ <!ENTITY dhusername "Eduard Bloch">
+ <!ENTITY dhucpackage "<refentrytitle>KVDR</refentrytitle>">
+ <!ENTITY dhpackage "kvdr">
+
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2001</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>program to watch TV and record DVB video</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command>
+ command.</para>
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ Instead, it has documentation in the
+ <application>HTML</application> format; see below.</para>
+
+ <para>This program can be invoked as <command>kvdr</command> or <command>kvdr.real</command>. In the first case, a wrapper script is run which will try to invoke the underlying <command>vdr</command> daemon, run <command>kvdr.real</command> and stop the daemon when <command>kvdr.real</command> has finished.
+ </para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <para>For a full summary of options, run <citetitle>vdr --help</citetitle>.
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>The original documentation from the program author is
+ available in <citetitle>/usr/share/doc/kde/HTML/default/kvdr/</citetitle>.
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This program was written by Guido Fiala (gfiala at s.netic.de).
+ This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (but may be used by others).</para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Added: kde-extras/kvdr/trunk/debian/kvdr.doc-base_debhelp_broken
===================================================================
--- kde-extras/kvdr/trunk/debian/kvdr.doc-base_debhelp_broken (rev 0)
+++ kde-extras/kvdr/trunk/debian/kvdr.doc-base_debhelp_broken 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,10 @@
+Document: kvdr
+Title: Debian kvdr Manual
+Author: Guido Fiala <gfiala at s.netic.de>
+Abstract: This manual describes what kvdr is and how it can be used.
+Section: Apps/Viewers
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kvdr/index.html
+Files: /usr/share/doc/kde/HTML/en/kvdr/*.html
+
Added: kde-extras/kvdr/trunk/debian/kvdr.postinst
===================================================================
--- kde-extras/kvdr/trunk/debian/kvdr.postinst (rev 0)
+++ kde-extras/kvdr/trunk/debian/kvdr.postinst 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+#
+# source debconf library
+#export DEBCONF_DEBUG=developer
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
Added: kde-extras/kvdr/trunk/debian/kvdr.sh
===================================================================
--- kde-extras/kvdr/trunk/debian/kvdr.sh (rev 0)
+++ kde-extras/kvdr/trunk/debian/kvdr.sh 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,20 @@
+#!/bin/sh
+unset VDRPID
+if [ -z "`pidof vdr vdr-daemon vdr-kbd vdr-lirc vdr-rcu`" ] ; then
+ if [ -e ~/.kvdr-vdir/svdrphosts.conf ] ; then
+ vdr-daemon --port 2001 -v ~/.kvdr-vdir &
+ VDRPID=$!
+ sleep 3
+ kill $VDRPID
+ kvdr.real $*
+ else
+ if [ -e /usr/share/doc/kvdr/README.Debian ] ; then
+ gmessage -geometry 500x500 -file /usr/share/doc/kvdr/README.Debian
+ else
+ gmessage 'Please read the docs!'
+ fi
+ fi
+else
+ # a daemon is running, start kvdr
+ kvdr.real $*
+fi
Added: kde-extras/kvdr/trunk/debian/kvdr.xpm
===================================================================
--- kde-extras/kvdr/trunk/debian/kvdr.xpm (rev 0)
+++ kde-extras/kvdr/trunk/debian/kvdr.xpm 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,169 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 147 2",
+" c black",
+". c #080103",
+"X c #0d0408",
+"o c #0d0a0b",
+"O c #130c0d",
+"+ c #180408",
+"@ c #110f11",
+"# c #151815",
+"$ c #191411",
+"% c #1c171e",
+"& c #181815",
+"* c #1a1919",
+"= c #29070a",
+"- c #231b1d",
+"; c #3f0c0e",
+": c #381a14",
+"> c #241e21",
+", c #39221e",
+"< c #242123",
+"1 c #252628",
+"2 c #292424",
+"3 c #2d232a",
+"4 c #2c2927",
+"5 c #292a29",
+"6 c #2f302f",
+"7 c #322629",
+"8 c #3c2e36",
+"9 c #3c332f",
+"0 c #353333",
+"q c #323738",
+"w c #343938",
+"e c #3c3732",
+"r c #3b3a34",
+"t c #3c3b39",
+"y c #3f4247",
+"u c #47120e",
+"i c #451414",
+"p c #40181b",
+"a c #481013",
+"s c #501c15",
+"d c #551c18",
+"f c #433c34",
+"g c #433d3b",
+"h c #522425",
+"j c #5f2023",
+"k c #5a2b26",
+"l c #611916",
+"z c #621b1d",
+"x c #642219",
+"c c #702619",
+"v c #62282c",
+"b c #682423",
+"n c #6f2f22",
+"m c #692b2b",
+"M c #6e2f31",
+"N c #65352f",
+"B c #6f312a",
+"V c #633633",
+"C c #6a3e32",
+"Z c #70272c",
+"A c #7c2523",
+"S c #7a3121",
+"D c #7e3a2f",
+"F c #763832",
+"G c #443e42",
+"H c #47423e",
+"J c #4d4339",
+"K c #764032",
+"L c #444145",
+"P c #474648",
+"I c #4d4745",
+"U c #555354",
+"Y c #5c5a5a",
+"T c #5e5d60",
+"R c #624a4b",
+"E c #635c5e",
+"W c #765049",
+"Q c gray42",
+"! c #757175",
+"~ c #747278",
+"^ c #852e24",
+"/ c #852c28",
+"( c #8e3324",
+") c #913b2a",
+"_ c #983635",
+"` c #9d3830",
+"' c #8a473b",
+"] c #a0473b",
+"[ c #ad4039",
+"{ c #a25031",
+"} c #bc423e",
+"| c #bc513e",
+" . c #a87229",
+".. c #bc653b",
+"X. c #855850",
+"o. c #9e4f48",
+"O. c #826c6f",
+"+. c #81797e",
+"@. c #8e7c7e",
+"#. c #947170",
+"$. c #bc4d41",
+"%. c #b25242",
+"&. c #bd6b57",
+"*. c #b37367",
+"=. c #b77c75",
+"-. c #d57d3d",
+";. c #c35044",
+":. c #c2514a",
+">. c #ca5d51",
+",. c #c67c70",
+"<. c #887d82",
+"1. c #be8676",
+"2. c #b0aa71",
+"3. c #cb981f",
+"4. c #cfb039",
+"5. c #e19538",
+"6. c #c78079",
+"7. c #d7ab4b",
+"8. c #d2b076",
+"9. c #ecc719",
+"0. c #ebd829",
+"q. c #848285",
+"w. c #8b8183",
+"e. c #8e8b8c",
+"r. c #868a9e",
+"t. c #918788",
+"y. c #939491",
+"u. c #979d93",
+"i. c #9b9496",
+"p. c #a49893",
+"a. c gray65",
+"s. c #b1adb1",
+"d. c #d4a3a3",
+"f. c #d6adaa",
+"g. c #d9b3af",
+"h. c #ccc7ab",
+"j. c #d4c0bf",
+"k. c #d1c0c3",
+"l. c #dbcac9",
+"z. c #d9d0cf",
+"x. c #dcd4d3",
+"c. c #e5dee0",
+"v. c #e9e3e5",
+"b. c #eae5e9",
+"n. c #f0ecf3",
+"m. c #f5f1f7",
+"M. c None",
+/* pixels */
+"x.Y q.<.! O.Q Q Q E R R L w 8 + ",
+"Y 4 G L w w r w 8 0 w t g P - O ",
+"<.2 s.p.#.X.N i h V M m k b % o ",
+"w.7 b.l.d.6.F ; a z n c z A > O ",
+"t.8 v.j.d.1.K d : p v Z b A < $ ",
+"p.t n.z.g.=.D a k : $ = u ^ > & ",
+"u.t m.x.f.*.%.{ ) S c x l ` < & ",
+"i.H v.l.d.,.&.>.:.;.| $.( [ < & ",
+"y.J @.2.4.0.C .3.9.B W s } 4 $ ",
+"e.g k.h.8.7.' ..-.5.] o./ _ 2 @ ",
+"<.g y I t q e e e 0 5 0 g L 4 X ",
+"! * 4 0 r f f e f 0 6 7 - * O . ",
+"M.M.M.M.r.2 1 a.M.M.M.M.",
+"M.M.M.M.M.~ 1 5 5 5 ! M.M.M.M.M.",
+"M.M.5 * U 0 8 0 0 0 0 Y * 1 M.M.",
+"M.M.5 * 5 & & & * * * 5 * 5 M.M."
+};
Added: kde-extras/kvdr/trunk/debian/menu
===================================================================
--- kde-extras/kvdr/trunk/debian/menu (rev 0)
+++ kde-extras/kvdr/trunk/debian/menu 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,2 @@
+?package(kvdr):needs="X11" section="Applications/Video"\
+ title="kvdr" command="/usr/bin/kvdr" longtitle="Digital TV viewer and recorder" icon="/usr/share/icons/hicolor/16x16/apps/kvdr.xpm"
Added: kde-extras/kvdr/trunk/debian/patches/05_amd64_fixes.patch
===================================================================
--- kde-extras/kvdr/trunk/debian/patches/05_amd64_fixes.patch (rev 0)
+++ kde-extras/kvdr/trunk/debian/patches/05_amd64_fixes.patch 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,54 @@
+diff -urN tmp/kvdr/kvdr.cpp kvdr/kvdr/kvdr.cpp
+--- tmp/kvdr/kvdr.cpp 2005-02-09 08:27:26.809587000 +0100
++++ kvdr/kvdr/kvdr.cpp 2005-02-09 08:30:08.838138229 +0100
+@@ -418,7 +418,7 @@
+ )
+ {
+ fprintf(stderr,"kvdr and v4l-conf disagree about the framebuffer geometry\noverlay will not be shown\n");
+- fprintf(stderr,"kvdr: FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",(unsigned int)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
++ fprintf(stderr,"kvdr: FbAddr=%lx Bpp=%d height=%d width=%d bps=%d\n",(unsigned long)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
+ fprintf(stderr,"v4l : FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);
+ ovlFbSet = ovlGeoSet = false;
+ ovlClipCount = 0;
+diff -ruN kvdr-old/kvdr/ckvdrcfg.cpp kvdr/kvdr/ckvdrcfg.cpp
+--- kvdr-old/kvdr/ckvdrcfg.cpp 2004-02-22 19:40:51.000000000 +0000
++++ kvdr/kvdr/ckvdrcfg.cpp 2005-02-07 19:37:03.153118464 +0000
+@@ -421,7 +421,7 @@
+ if(-1!=((Kvdr*)p)->video_fd.handle())
+ {
+ ((Kvdr*)p)->OvlF(((Kvdr*)p)->display_width,((Kvdr*)p)->display_height,
+- (int)((Kvdr*)p)->base,((Kvdr*)p)->bpp,((Kvdr*)p)->palette);
++ (long)((Kvdr*)p)->base,((Kvdr*)p)->bpp,((Kvdr*)p)->palette);
+ ((Kvdr*)p)->OvlP(((Kvdr*)p)->brightness,((Kvdr*)p)->colour,
+ ((Kvdr*)p)->hue,((Kvdr*)p)->contrast);
+ ((Kvdr*)p)->OverlayOnOffSLOT(1);
+diff -ruN kvdr-old/kvdr/kvdr.cpp kvdr/kvdr/kvdr.cpp
+--- kvdr-old/kvdr/kvdr.cpp 2004-08-07 08:55:07.000000000 +0100
++++ kvdr/kvdr/kvdr.cpp 2005-02-07 19:37:03.154118312 +0000
+@@ -342,7 +342,7 @@
+ //Set the Frambuffer and Image properties:
+ if (!(args->isSet("x")))
+ {
+- OvlF(display_width,display_height,(int)base,bpp,palette);
++ OvlF(display_width,display_height,(long)base,bpp,palette);
+ OvlP(brightness,colour,hue,contrast);
+ ovlstat=true;
+ setMaximumSize(f_size_x,f_size_y);
+@@ -1560,7 +1560,7 @@
+ return;//should never happen anyway: vid_dev taken away below kvdr
+ }
+ }
+- OvlF(display_width,display_height,(int)base,bpp,palette);
++ OvlF(display_width,display_height,(long)base,bpp,palette);
+ OvlP(brightness,colour,hue,contrast);
+ OverlayOnOffSLOT(1);
+ usleep(20000);//not to fast...
+@@ -1966,7 +1966,7 @@
+ video_fd.open(IO_ReadWrite);
+ if( !(args->isSet("x")) )
+ {
+- OvlF(display_width,display_height,(int)base,bpp,palette);
++ OvlF(display_width,display_height,(long)base,bpp,palette);
+ OvlP(brightness,colour,hue,contrast);
+ OverlayOnOffSLOT(1);
+ }
Added: kde-extras/kvdr/trunk/debian/patches/10_bad_pointer_cast.patch
===================================================================
--- kde-extras/kvdr/trunk/debian/patches/10_bad_pointer_cast.patch (rev 0)
+++ kde-extras/kvdr/trunk/debian/patches/10_bad_pointer_cast.patch 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,12 @@
+diff -Nru tmp/kvdr/kvdr.cpp kvdr/kvdr/kvdr.cpp
+--- tmp/kvdr/kvdr.cpp 2007-10-30 22:14:41.000000000 -0400
++++ kvdr/kvdr/kvdr.cpp 2007-10-30 22:15:35.000000000 -0400
+@@ -101,7 +101,7 @@
+ /* guess physical screen format */
+ int width, bank, ram;
+ base = NULL;
+- if(!XF86DGAGetVideoLL(disp,screen,(int*)&base,&width,&bank,&ram))
++ if(!XF86DGAGetVideoLL(disp,screen,(unsigned int*)&base,&width,&bank,&ram))
+ {
+ base=NULL;
+ }
Added: kde-extras/kvdr/trunk/debian/rules
===================================================================
--- kde-extras/kvdr/trunk/debian/rules (rev 0)
+++ kde-extras/kvdr/trunk/debian/rules 2008-06-01 11:47:04 UTC (rev 10821)
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=5
+
+PACKAGE:=kvdr
+VERSION:=0.64
+
+TAR_DIR=$(PACKAGE)
+
+# The DBS rules
+include /usr/share/dbs/dbs-build.mk
+
+build_stamp= $(STAMP_DIR)/build-stamp
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
+INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+$(build_stamp) build: ${patched}
+ dh_testdir
+ # Add here commands to compile the package.
+# Nasty hack to get kde_appsdir to work.!
+ cp /usr/share/misc/config.guess /usr/share/misc/config.sub $(BUILD_TREE)
+ cp /usr/share/misc/config.guess /usr/share/misc/config.sub $(BUILD_TREE)/admin
+ ( cd $(BUILD_TREE) ; kde_appsdir=debian/kvdr/usr/share/applications ./configure --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --disable-rpath \
+ --with-qt-includes=/usr/include/qt3 \
+ --x-includes=/usr/include \
+ --x-libraries=/usr/X11R6/lib \
+ --with-qt-libraries=/usr/lib/ \
+ --enable-mt )
+
+ $(MAKE) -C $(BUILD_TREE)
+ #/usr/bin/docbook-to-man debian/kvdr.sgml > kvdr.1
+ touch $(build_stamp)
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_clean
+ rm -rf $(SOURCE_DIR) $(STAMP_DIR) *.log debian/*~
+
+# Build architecture-independent files here.
+binary-indep:
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: $(build_stamp)
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ $(MAKE) -C $(BUILD_TREE) install prefix=$(CURDIR)/debian/kvdr/usr
+ dh_installdebconf
+ cd debian/kvdr/usr/share/doc && make kde && mv HTML kde && cd kde/HTML && mv default/kvdr/* en/kvdr && rm -rf default
+ dh_installdocs
+ dh_installexamples
+ cp debian/kvdr.xpm debian/kvdr/usr/share/icons/hicolor/16x16/apps/kvdr.xpm
+ dh_installmenu
+ dh_installman debian/kvdr.1
+ dh_installinfo
+ dh_installchangelogs
+ mv debian/kvdr/usr/bin/kvdr debian/kvdr/usr/bin/kvdr.real
+ install -m755 debian/kvdr.sh debian/kvdr/usr/bin/kvdr
+ cd debian/kvdr/usr/share/man/man1 ; ln -s kvdr.1 kvdr.real.1
+ rm -f debian/kvdr/usr/share/doc/kde/HTML/en/kvdr/common
+ ln -s ../common debian/kvdr/usr/share/doc/kde/HTML/en/kvdr/common
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: kde-extras/kvdr/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-kde-commits
mailing list