[mythtv] Re: FYI: Debian packages (CVS version) available

Stefan Frank sfr+lists at 6913304088794.gnuu.de
Sun Feb 2 15:35:15 EST 2003


Hi Matt!

On Sat, 01 Feb 2003, Matt Zimmerman wrote:

> On Sun, Feb 02, 2003 at 03:06:17AM +0100, Stefan Frank wrote:
> 
> > as $SUBJECT says, i created a debian package of the current CVS version.
> 
> It would have been preferable if you had contacted me first...your packages
> are quite incompatible with what I have been preparing for the 0.8 release.
> Some of your additional debconf work looks useful; if you had sent me
> patches I would likely have integrated them into my tree by now.
> 

Here's a patch of the debian sub-directory against your latest debian package (0.7-12).

Note that i added a command to debian/rules to re-generate the top-level Makefile 
after configure. I'm not sure if it's correct, though.

    Bye, Stefan


-------------- next part --------------
diff -urN ./mythtv-0.7/debian/changelog ./mythtv-0.8/debian/changelog
--- ./mythtv-0.7/debian/changelog	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/changelog	2003-02-02 13:12:00.000000000 +0100
@@ -1,3 +1,9 @@
+mythtv (0.8-20030201cvs) unstable; urgency=low
+
+  * Build from CVS
+
+ -- Stefan Frank <sfr at gmx.net>  Fri, 31 Jan 2003 19:55:16 +0100
+
 mythtv (0.7-12) unstable; urgency=low
 
   * Add missing '-c' option in example for running mythtv-setup 
diff -urN ./mythtv-0.7/debian/control ./mythtv-0.8/debian/control
--- ./mythtv-0.7/debian/control	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/control	2003-02-02 13:12:00.000000000 +0100
@@ -1,10 +1,10 @@
 Source: mythtv
 Section: sound
 Priority: optional
-Maintainer: Matt Zimmerman <mdz at debian.org>
+Maintainer: Stefan Frank <sfr at gmx.net>
 Build-Depends: debhelper (>> 3.0.0), libqt3-mt-dev, libmysqlclient-dev, libttf-dev, libvorbis-dev, liblame-dev
 Standards-Version: 3.5.4
-Bugs: mailto:mdz at debian.org
+Bugs: mailto:sfr at gmx.net
 
 Package: mythtv
 Architecture: any
@@ -30,18 +30,18 @@
  reason, this package does not explicitly depend on mysql-server. You must
  install the mysql-server package before installing this package.
 
-Package: libmyth-0.7
+Package: libmyth
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: mythtv (<< 0.7-5)
-Replaces: mythtv (<< 0.7-5)
+Conflicts: mythtv (<< 0.8-20030201cvs)
+Replaces: mythtv (<< 0.8)
 Description: Common library code for MythTV and add-on modules (runtime)
 
-Package: libmyth-0.7-dev
+Package: libmyth-dev
 Architecture: any
 Section: devel
-Depends: libmyth-0.7 (= ${Source-Version})
+Depends: libmyth (= ${Source-Version})
 Provides: libmyth-dev
-Conflicts: libmyth-dev
+Conflicts: libmyth-dev (<< 0.8-20030201cvs)
 Description: Common library code for MythTV and add-on modules (development)
diff -urN ./mythtv-0.7/debian/copyright ./mythtv-0.8/debian/copyright
--- ./mythtv-0.7/debian/copyright	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/copyright	2003-02-02 13:12:00.000000000 +0100
@@ -1,10 +1,52 @@
-This package was debianized by Matt Zimmerman <mdz at debian.org> on
-Wed, 16 Oct 2002 23:20:56 -0400.
+This package was debianized by Stefan Frank <sfr at gmx.net> on
+Fre, 31 Jan 2003 23:20:56 -0400.
 
-It was downloaded from <fill in ftp site>
+It was downloaded from CVS cvs.mythtv.org
 
-Upstream Author(s): <put author(s) name and email here>
+Upstream Author(s):
+
+Main Author: 
+    Isaac Richards <ijr at po.cwru.edu>
+
+Original NuppelVideo version: 
+    Roman HOCHLEITNER <roman at mars.tuwien.ac.at>
+libavcodec, from ffmpeg.sf.net:
+    Fabrice Bellard <fabrice.bellard at free.fr>
+Rewritten player class and improved a/v sync code:
+    John Coiner <jcoiner at stanfordalumni.org>
+TangoBlue theme:
+    Forrest Walter - www.forrestwalter.com
+LiquidTV theme:
+    jer warren <>
+Selectable GUI sizes:
+    thor at lamedomainname.com
+Video Filters:
+    Richard Jones <richard at earthmen.com>
+Misc changes:
+    Grant Taylor <gtaylor at picante.com>
+Colorize the EPG:
+    skrpub <skrpub at earthlink.net>
+Bugfixes, EPG updates, more UK friendly database filling, lots of other things:
+    Andrew M. Bishop <amb at gedanken.demon.co.uk>
+Non-integer channel fixes, customizable date displays:
+    Jens Lohmann-Hansen <JensLH at adslhome.dk>
+Modifyable install prefix, recording/scheduler improvements, mono support, more:
+    Jim Radford <jim at blackbean.org>
+Keybinding to toggle fullscreen playback, EPG speedups:
+    Erik Arendse <erik.arendse at bigfoot.com>
+EPG/filldatabase enhancements:
+    Christian Hoenig <me at christianhoenig.de>
+Setup enhancements:
+    Dan Schwarz <dschwarz at bellatlantic.net>
+Large amount of documentation:
+    Robert Kulagowski <rkulagowski at thrupoint.net>
+Alternative EPG layout:
+    John Danner <johndanner at psu.edu>
+Graphical setup UI, database backend for configuration, initial direct rendering support
+    Matt Zimmerman <mdz at debian.org>
 
 Copyright:
 
-<Must follow here>
+MythTV is distributed under the terms of the GPL, version 2 only.
+If you don't have a copy of the GPL, get one at:
+     http://www.gnu.org/licenses/gpl.txt
diff -urN ./mythtv-0.7/debian/libmyth-0.7-dev.files ./mythtv-0.8/debian/libmyth-0.7-dev.files
--- ./mythtv-0.7/debian/libmyth-0.7-dev.files	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/libmyth-0.7-dev.files	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/libmyth*.so
-usr/include/mythtv
diff -urN ./mythtv-0.7/debian/libmyth-0.7.files ./mythtv-0.8/debian/libmyth-0.7.files
--- ./mythtv-0.7/debian/libmyth-0.7.files	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/libmyth-0.7.files	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/libmyth*.so.*
diff -urN ./mythtv-0.7/debian/libmyth-dev.files ./mythtv-0.8/debian/libmyth-dev.files
--- ./mythtv-0.7/debian/libmyth-dev.files	1970-01-01 01:00:00.000000000 +0100
+++ ./mythtv-0.8/debian/libmyth-dev.files	2003-02-02 13:12:00.000000000 +0100
@@ -0,0 +1,2 @@
+usr/lib/libmyth*.so
+usr/include/mythtv
diff -urN ./mythtv-0.7/debian/libmyth.files ./mythtv-0.8/debian/libmyth.files
--- ./mythtv-0.7/debian/libmyth.files	1970-01-01 01:00:00.000000000 +0100
+++ ./mythtv-0.8/debian/libmyth.files	2003-02-02 13:12:00.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/libmyth*.so.*
diff -urN ./mythtv-0.7/debian/mythtv.config ./mythtv-0.8/debian/mythtv.config
--- ./mythtv-0.7/debian/mythtv.config	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/mythtv.config	2003-02-02 13:12:00.000000000 +0100
@@ -10,25 +10,46 @@
     db_set mythtv/mysql_host "`sed -n -e 's/^str DBHostName=\(.*\)$/\1/gp;' $CONFIG`"
 fi
 
-CONFIG=/etc/mythtv/settings.txt
+CONFIG=/etc/mythtv/backend_settings.txt
 if [ -e $CONFIG ]; then
-    db_set mythtv/tv_format "`sed -n -e 's/^str TVFormat=\(.*\)$/\1/gp;' $CONFIG`"
-    db_set mythtv/freqtable "`sed -n -e 's/^str FreqTable=\(.*\)$/\1/gp;' $CONFIG`"
-    db_set mythtv/grabber "`sed -n -e 's/^str XMLTVGrab=\(.*\)$/\1/gp;' $CONFIG`"
+    db_set mythtv/server_ip "`sed -n -e 's/^ServerIP=\(.*\)$/\1/gp;' $CONFIG`"
+    db_set mythtv/server_port "`sed -n -e 's/^ServerPort=\(.*\)$/\1/gp;' $CONFIG`"
+    db_set mythtv/status_port "`sed -n -e 's/^StatusPort=\(.*\)$/\1/gp;' $CONFIG`"
+    db_set mythtv/server_mode "`sed -n -e 's/^ServerMode=\(.*\)$/\1/gp;' $CONFIG`"
+    
 fi
 
+db_input high mythtv/unofficial || true
+
 db_input low mythtv/create_v4l_devs || true
 db_input low mythtv/mysql_mythtv_dbname || true
 db_input low mythtv/mysql_mythtv_user || true
 db_input low mythtv/mysql_mythtv_password || true
 
+db_input medium mythtv/mysql_drop_db || true
 db_input medium mythtv/mysql_host || true
 db_input medium mythtv/mysql_admin_user || true
 db_input medium mythtv/mysql_admin_password || true
 
+db_input high mythtv/server_ip || true
+db_input high mythtv/server_port || true
+db_input high mythtv/status_port || true
+db_input high mythtv/server_mode || true
+
+db_input high mythtv/recordings || true
+db_input high mythtv/delete_recordings || true
+db_input high mythtv/livetv_buffer || true
+db_input high mythtv/buffersize || true
+db_input high mythtv/maxbufferfill || true
 db_input high mythtv/tv_format || true
+db_input high mythtv/vbi_format || true
 db_input high mythtv/freqtable || true
-db_input high mythtv/grabber || true
+
+db_input high mythtv/video_device || true
+db_input high mythtv/vbi_device || true
+db_input high mythtv/audio_device || true
+db_input high mythtv/audioratelimit || true
+
 db_input high mythtv/run_setup || true
 
 db_go
diff -urN ./mythtv-0.7/debian/mythtv.postinst ./mythtv-0.8/debian/mythtv.postinst
--- ./mythtv-0.7/debian/mythtv.postinst	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/mythtv.postinst	2003-02-02 13:12:00.000000000 +0100
@@ -51,6 +51,8 @@
             mythtv
         adduser --quiet mythtv video
 
+	db_get mythtv/mysql_drop_db
+	drop_db="$RET"
         db_get mythtv/mysql_admin_user
         admin_username="$RET"
         db_get mythtv/mysql_admin_password
@@ -102,27 +104,89 @@
 EOF
         mv /etc/mythtv/mysql.txt.new /etc/mythtv/mysql.txt
 
-        db_get mythtv/grabber
-        grabber="$RET"
-        db_get mythtv/tv_format
-        tv_format="$RET"
-        db_get mythtv/freqtable
-        freqtable="$RET"
-
-        touch /etc/mythtv/settings.txt.new
-        if [ -e /etc/mythtv/settings.txt ]; then
-            INPUT=/etc/mythtv/settings.txt
+	db_get mythtv/recordings
+	recordings="$RET"
+	db_get mythtv/livetv_buffer
+	livetv_buffer="$RET"
+	db_get mythtv/buffersize
+	buffersize="$RET"
+	db_get mythtv/maxbufferfill
+	maxbufferfill="$RET"
+	db_get mythtv/tv_format
+	tv_format="$RET"
+	db_get mythtv/vbi_format
+	vbi_format="$RET"
+	db_get mythtv/freqtable
+	freqtable="$RET"
+
+	mkdir -p $recordings
+	mkdir -p $livetv_buffer
+
+	chown mythtv:mythtv $recordings
+	chown mythtv:mythtv $livetv_buffer
+       
+	case "$vbi_format" in
+	    PAL_Teletext)
+		vbi_format="PAL Teletext"
+	    ;;
+	    NTSC_CC)
+		vbi_format="NTSC CC"
+	    ;;
+	esac
+
+	DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('LiveBufferDir','$livetv_buffer')"
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('RecordFilePrefix','$recordings')"
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('BufferSize','$buffersize')"
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('MaxBufferFill','$maxbufferfill')"
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('TVFormat','$tv_format')"
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('VbiFormat','$vbi_format')"
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO settings (value,data) VALUES ('FreqTable','$freqtable')"
+
+	db_get mythtv/video_device
+	video_device="$RET"
+	db_get mythtv/vbi_device
+	vbi_device="$RET"
+	db_get mythtv/audio_device
+	audio_device="$RET"
+	db_get mythtv/audioratelimit
+	audioratelimit="$RET"
+
+	my_cardtype="V4L"
+	my_hostname="`hostname`"
+
+        DoSQL "$hostname" "$mythtv_username" "$mythtv_password" "$database" \
+            "INSERT INTO capturecard (videodevice,audiodevice,vbidevice,cardtype,audioratelimit,hostname) VALUES ('$video_device','$audio_device','$vbi_device','$my_cardtype','$audioratelimit','$my_hostname')"
+
+        db_get mythtv/server_ip
+        server_ip="$RET"
+        db_get mythtv/server_port
+        server_port="$RET"
+        db_get mythtv/status_port
+        status_port="$RET"
+	db_get mythtv/server_mode
+	server_mode="$RET"
+
+        touch /etc/mythtv/backend_settings.txt.new
+        if [ -e /etc/mythtv/backend_settings.txt ]; then
+            INPUT=/etc/mythtv/backend_settings.txt
         else
-            INPUT=/usr/share/mythtv/settings.txt.dist
+            INPUT=/usr/share/mythtv/backend_settings.txt.dist
         fi
 
         cat $INPUT | sed -e "
-s/^\(str XMLTVGrab\)=.*$/\1=$grabber/g;
-s/^\(str TVFormat\)=.*$/\1=$tv_format/g;
-s/^\(str FreqTable\)=.*$/\1=$freqtable/g;
-" > /etc/mythtv/settings.txt.new
-        mv /etc/mythtv/settings.txt.new /etc/mythtv/settings.txt
-
+s/^\(ServerIP\)=.*$/\1=$server_ip/g;
+s/^\(ServerPort\)=.*$/\1=$server_port/g;
+s/^\(StatusPort\)=.*$/\1=$status_port/g;
+" > /etc/mythtv/backend_settings.txt.new
+#s/^\(ServerMode\)=.*$/\1=$server_mode/g;
+        mv /etc/mythtv/backend_settings.txt.new /etc/mythtv/backend_settings.txt
 
         for d in /var/lib/mythtv /var/cache/mythtv /var/log/mythtv; do
             if ! dpkg-statoverride --list $d; then
@@ -131,7 +195,7 @@
             fi
         done
 
-        for configfile in /etc/mythtv/settings.txt /etc/mythtv/theme.txt; do
+        for configfile in /etc/mythtv/backend_settings.txt; do
             if ! dpkg-statoverride --list $configfile; then
                 chown mythtv:mythtv $configfile
                 chmod 664 $configfile
diff -urN ./mythtv-0.7/debian/mythtv.postrm ./mythtv-0.8/debian/mythtv.postrm
--- ./mythtv-0.7/debian/mythtv.postrm	2003-02-01 21:14:48.000000000 +0100
+++ ./mythtv-0.8/debian/mythtv.postrm	2003-02-02 13:12:00.000000000 +0100
@@ -23,22 +23,39 @@
 
         . /usr/share/debconf/confmodule
 
-        db_get mythtv/mysql_admin_user
-        admin_username="$RET"
-        db_get mythtv/mysql_admin_password
-        admin_password="$RET"
-        db_get mythtv/mysql_host
-        hostname="$RET"
-        db_get mythtv/mysql_mythtv_dbname
-        database="$RET"
+	db_get mythtv/mysql_drop_db
+	drop_db="$RET"
+	if [ "$drop_db" = "true" ]; then
+
+	    db_get mythtv/mysql_admin_user
+	    admin_username="$RET"
+	    db_get mythtv/mysql_admin_password
+	    admin_password="$RET"
+	    db_get mythtv/mysql_host
+	    hostname="$RET"
+	    db_get mythtv/mysql_mythtv_dbname
+	    database="$RET"
 
-      cat <<EOF | perl -e "use DBI;chomp(\$password=<>);DBI->connect('dbi:mysql:host=$hostname', '$admin_username', \$password)->do('DROP DATABASE IF EXISTS $database');" || true
-$admin_password
+	  cat <<EOF | perl -e "use DBI;chomp(\$password=<>);DBI->connect('dbi:mysql:host=$hostname', '$admin_username', \$password)->do('DROP DATABASE IF EXISTS $database');" || true
+    $admin_password
 EOF
 
-      rm -f /etc/mythtv/mysql.txt
-      rm -f /etc/mythtv/backend_settings.txt
-      rmdir --ignore-fail-on-non-empty /etc/mythtv
+	fi
+
+	db_get mythtv/delete_recordings
+	delete_recordings="$RET"
+	if [ "$delete_recordings" = "true" ]; then
+	    db_get mythtv/recordings
+	    recordings="$RET"
+	    rm -r -f $recordings
+	fi
+
+	db_get mythtv/livetv_buffer
+	livetv_buffer="$RET"
+	rm -f /etc/mythtv/mysql.txt
+	rm -f /etc/mythtv/backend_settings.txt
+	rm -f $livetv_buffer/ringbuf*.nuv
+	rmdir --ignore-fail-on-non-empty /etc/mythtv $livetv_buffer
 
         ;;
        remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff -urN ./mythtv-0.7/debian/mythtv.templates ./mythtv-0.8/debian/mythtv.templates
--- ./mythtv-0.7/debian/mythtv.templates	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/mythtv.templates	2003-02-02 13:12:00.000000000 +0100
@@ -1,3 +1,23 @@
+Template: mythtv/unofficial
+Type: note
+Description: Please read this note carefully!
+ This is an UNOFFICAL package made by me just for fun. I don't take
+ responsibility for any damage this package might cause to your system.
+ .
+ Do NOT report bugs to the official Debian BTS, instead send them to me.
+
+Template: mythtv/mysql_drop_db
+Type: boolean
+Default: false
+Description: Should the mysql database be deleted when MythTV is being purged?
+
+Template: mythtv/delete_recordings
+Type: boolean
+Default: false
+Description: Should the recordings directory be removed when MythTV is being purged?
+ WARNING: If you say yes here, all your recorded shows will be deleted
+ when the package is being purged. You have been warned!
+
 Template: mythtv/mysql_mythtv_dbname
 Type: string
 Default: mythconverg
@@ -50,16 +70,27 @@
 Default: true
 Description: Is it OK to create the video4linux device nodes?
 
-Template: mythtv/grabber
+Template: mythtv/server_ip
+Type: string
+Default: localhost
+Description: What is the IP address of the MythTV server?
+
+Template: mythtv/server_port
+Type: string
+Default: 6543
+Description: Please enter the port number the MythTV server should use.
+
+Template: mythtv/status_port
+Type: string
+Default: 6544
+Description: Please enter the port number used for MythTV status.
+
+Template: mythtv/server_mode
 Type: select
-Choices: tv_grab_de, tv_grab_na, tv_grab_sn, tv_grab_uk, tv_grab_uk_rt
-Default: tv_grab_na
-Description: Which XMLTV grabber should be used to retrieve program listings?
-  - tv_grab_na retrieves listings for North America (US and Canada)
-  - tv_grab_de retrieves listings for Germany and Austria
-  - tv_grab_sn retrieves listings for Sweden or Norway
-  - tv_grab_uk retrieves listings for the United Kingdom
-  - tv_grab_uk_rt retrieves listings for the United Kingdom (alternate)
+Choices: Master, Slave
+Default: Master
+Description: In which mode should MythTV work as?
+ NOTE: This option is not in use yet. Leave as is.
 
 Template: mythtv/tv_format
 Type: select
@@ -67,8 +98,71 @@
 Default: NTSC
 Description: Which television standard should be used by MythTV?
 
+Template: mythtv/vbi_format
+Type: select
+Choices: None, PAL_Teletext, NTSC_CC
+Default: None
+Description: Which vbi standard should be used by MythTV?
+
 Template: mythtv/freqtable
 Type: select
 Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast, southafrica, argentina, canada-cable, australia-optus
 Default: us-cable
 Description: Which channel frequency table should be used by MythTV?
+
+Template: mythtv/recordings
+Type: string
+Default: /var/cache/mythtv/recordings/
+Description: Where should recorded shows be stored?
+ Be sure to have plenty of disc space available.
+
+Template: mythtv/livetv_buffer
+Type: string
+Default: /var/cache/mythtv/cache/
+Description: Where should the live TV buffer be stored?
+
+Template: mythtv/buffersize
+Type: string
+Default: 5
+Description: Maximum size (in GB) of the live TV buffer?
+
+Template: mythtv/maxbufferfill
+Type: string
+Default: 50
+Description: How full is the live TV buffer allowed to grow before forcing an unpause?
+
+Template: mythtv/video_device
+Type: select
+Choices: /dev/video, /dev/video0, /dev/video1, /dev/video2
+Default: /dev/video
+Description: Which video device file should be used?
+
+Template: mythtv/vbi_device
+Type: select
+Choices: /dev/vbi, /dev/vbi0, /dev/vbi1, /dev/vbi2
+Default: /dev/vbi
+Description: Which vbi device file should be used?
+
+Template: mythtv/audio_device
+Type: select
+Choices: /dev/dsp, /dev/dsp0, /dev/dsp1, /dev/dsp2
+Default: /dev/dsp
+Description: Which audio device file should be used?
+
+Template: mythtv/audioratelimit
+Type: select
+Choices: 0, 32000, 44100, 48000
+Default: 0
+Description: What is the maximum sample rate your soundcard can handle?
+ Select 0 for no limit.
+
+Template: mythtv/grabber
+Type: select
+Choices: tv_grab_de, tv_grab_na, tv_grab_sn, tv_grab_uk, tv_grab_uk_rt
+Default: tv_grab_na
+Description: Which XMLTV grabber should be used to retrieve program listings?
+  - tv_grab_na retrieves listings for North America (US and Canada)
+  - tv_grab_de retrieves listings for Germany and Austria
+  - tv_grab_sn retrieves listings for Sweden or Norway
+  - tv_grab_uk retrieves listings for the United Kingdom
+  - tv_grab_uk_rt retrieves listings for the United Kingdom (alternate)
diff -urN ./mythtv-0.7/debian/rules ./mythtv-0.8/debian/rules
--- ./mythtv-0.7/debian/rules	2003-01-31 18:46:44.000000000 +0100
+++ ./mythtv-0.8/debian/rules	2003-02-02 13:13:20.000000000 +0100
@@ -16,12 +16,14 @@
 # XXX, enable debugging
 endif
 
+export QMAKESPEC=linux-g++
 export QTDIR=/usr/share/qt
 
 config.mak: configure
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure --prefix=/usr
+	qmake -o Makefile mythtv.pro
 
 build-arch:  config.mak build-arch-stamp
 build-arch-stamp:
@@ -67,16 +69,17 @@
 
 	# Autogenerated
 	for cf in debian/mythtv/usr/share/mythtv/mysql.txt \
-		debian/mythtv/usr/share/mythtv/settings.txt; do \
+		debian/mythtv/usr/share/mythtv/backend_settings.txt; \
+		do \
 		mv $$cf $$cf.dist; \
 		ln -s /etc/mythtv/`basename $$cf` $$cf; \
 	done
 
 	# Conffiles
-	for cf in debian/mythtv/usr/share/mythtv/theme.txt; do \
-		mv $$cf debian/mythtv/etc/mythtv/`basename $$cf`; \
-		ln -s /etc/mythtv/`basename $$cf` $$cf; \
-	done
+	#for cf in debian/mythtv/usr/share/mythtv/theme.txt; do \
+	#	mv $$cf debian/mythtv/etc/mythtv/`basename $$cf`; \
+	#	ln -s /etc/mythtv/`basename $$cf` $$cf; \
+	#done
 
 	dh_movefiles --sourcedir=debian/mythtv
 
@@ -134,8 +137,8 @@
 	dh_installdeb -a
 #	dh_perl -a
 	# Don't use dh_shlibdeps just yet, so we can build on woody easily
-	cp debian/libmyth-0.7/DEBIAN/shlibs debian/shlibs.local
-	dh_shlibdeps -a -ldebian/libmyth-0.7/usr/lib
+	cp debian/libmyth/DEBIAN/shlibs debian/shlibs.local
+	dh_shlibdeps -a -ldebian/libmyth/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a


More information about the mythtv-dev mailing list