Update of /cvsroot/freevo/freevo/contrib/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv20266
Modified Files:
control freevo.postinst rules
Added Files:
freevo.config freevo.templates
Log Message:
Added initial debconf support to the package.
What does this mean?
When you install the package, it will ask you questions about your display,
resolution, TV norm, and channel list and automatically generate a freevo.conf
file.
Currently, it will not touch the file if freevo.conf exists. In the future,
it should be able to figure out whether freevo.conf was made with debconf or
not and decide based on that.
--- NEW FILE: freevo.config ---
#!/bin/sh -e
. /usr/share/debconf/confmodule
db_version 2.0
db_capb backup
db_beginblock
db_input high freevo/display || true
db_input high freevo/geometry || true
db_input high freevo/norm || true
db_input high freevo/chanlist || true
db_endblock
db_go || true
--- NEW FILE: freevo.templates ---
Template: freevo/display
Type: select
Choices: x11, fbdev, dxr3, mga, dfbmga, dga
Description: Video output
Choose the output method to use for Freevo
Template: freevo/geometry
Type: select
Choices: 800x600, 768x576, 640x480
Description: Output resolution
Choose the resolution to display Freevo at. Most Televisions should
be configured as 768x576 (NTSC or PAL)
Template: freevo/norm
Type: select
Choices: ntsc, pal, secam
Description: TV Standard
Please choose your TV standard. North Americans should choose NTSC,
most Europeans will choose PAL.
Template: freevo/chanlist
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
Description: Channel List
Set the channel list (set of tuning frequencies) that most closely
matches yours.
Index: control
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** control 5 Oct 2003 15:12:30 -0000 1.2
--- control 25 Oct 2003 14:26:28 -0000 1.3
***************
*** 8,12 ****
Package: freevo
Architecture: all
! Depends: ${python:Depends}, python2.3-pygame, xmltv-util, libxmltv-perl,
python2.3-xml, python2.3-imaging, mplayer, mplayer-fonts, python2.3-pylirc,
python2.3-twisted, python2.3-mmpython, python2.3-fchksum, cdparanoia, freevo-media
Recommends: fbset, matrox-tools, xine-ui, flac, vorbis-tools, lame
Description: A Python based PVR/DVR Framework for Music and Movies
--- 8,12 ----
Package: freevo
Architecture: all
! Depends: ${python:Depends}, ${misc:Depends}, python2.3-pygame, xmltv-util,
libxmltv-perl, python2.3-xml, python2.3-imaging, mplayer, mplayer-fonts,
python2.3-pylirc, python2.3-twisted, python2.3-mmpython, python2.3-fchksum,
cdparanoia, freevo-media, debconf
Recommends: fbset, matrox-tools, xine-ui, flac, vorbis-tools, lame
Description: A Python based PVR/DVR Framework for Music and Movies
Index: freevo.postinst
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/debian/freevo.postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** freevo.postinst 22 Oct 2003 21:19:27 -0000 1.1
--- freevo.postinst 25 Oct 2003 14:26:28 -0000 1.2
***************
*** 1,13 ****
! #!/bin/sh
! #
CONFIG_FILE=/etc/freevo/local_conf.py
SYSTEM_CONF=/etc/freevo/freevo.conf
LIRCRC=/etc/freevo/lircrc
case "$1" in
configure)
if [ ! -f $CONFIG_FILE ] ; then cp
/usr/share/doc/freevo/local_conf.py.example $CONFIG_FILE; fi
! if [ ! -f $SYSTEM_CONF ] ; then echo "Make sure you run 'freevo setup' after
the package is installed"; fi
if [ ! -f $LIRCRC ]; then echo "Make sure you run 'freevo makelircrc'
after the package is installed"; fi
;;
--- 1,36 ----
! #!/bin/sh -e
+ action="$1"
CONFIG_FILE=/etc/freevo/local_conf.py
SYSTEM_CONF=/etc/freevo/freevo.conf
LIRCRC=/etc/freevo/lircrc
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+
+
+ write_freevoconf() {
+ db_get freevo/display
+ display="$RET"
+ db_get freevo/geometry
+ geometry="$RET"
+ db_get freevo/norm
+ norm="$RET"
+ db_get freevo/chanlist
+ chanlist="$RET"
+ freevo setup --geometry="$geometry" --display="$display" --tv="$norm"
--chanlist="$chanlist" --sysfirst > /dev/null
+
+ }
+
case "$1" in
configure)
if [ ! -f $CONFIG_FILE ] ; then cp
/usr/share/doc/freevo/local_conf.py.example $CONFIG_FILE; fi
! if [ ! -f $SYSTEM_CONF ] ; then
! echo "No configuration file found, using debconf answers"
! write_freevoconf
! echo "If your system changes, you can reconfigure freevo by typing:"
! echo "dpkg-reconfigure freevo"
! echo "(as root)"
! fi
if [ ! -f $LIRCRC ]; then echo "Make sure you run 'freevo makelircrc'
after the package is installed"; fi
;;
Index: rules
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/debian/rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rules 24 Oct 2003 16:11:37 -0000 1.8
--- rules 25 Oct 2003 14:26:28 -0000 1.9
***************
*** 24,28 ****
dh_testroot
rm -f build-stamp configure-stamp
! mkdir `pwd`/Docs/howto
-python2.3 setup.py clean
rm -f `find . | grep freevo.mo`
--- 24,28 ----
dh_testroot
rm -f build-stamp configure-stamp
! mkdir `pwd`/Docs/howto || true
-python2.3 setup.py clean
rm -f `find . | grep freevo.mo`
***************
*** 50,54 ****
cp `pwd`/boot/webserver_init
`pwd`/debian/freevo/usr/share/freevo/init/
cp `pwd`/boot/recordserver_init
`pwd`/debian/freevo/usr/share/freevo/init/
! echo 'FREEVO_HOME="/usr/bin"' > `pwd`/debian/freevo/etc/freevo/
# Build architecture-independent files here.
--- 50,54 ----
cp `pwd`/boot/webserver_init
`pwd`/debian/freevo/usr/share/freevo/init/
cp `pwd`/boot/recordserver_init
`pwd`/debian/freevo/usr/share/freevo/init/
! echo 'FREEVO_HOME="/usr/bin"' >
`pwd`/debian/freevo/etc/freevo/boot_config
# Build architecture-independent files here.
***************
*** 69,72 ****
--- 69,73 ----
dh_installmenu
dh_installchangelogs
+ db_installdebconf
dh_python
dh_link
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
