diff -u mythtv-0.20-svn20070122/debian/rules mythtv-0.20-svn20070122/debian/rules --- mythtv-0.20-svn20070122/debian/rules +++ mythtv-0.20-svn20070122/debian/rules @@ -89,6 +89,7 @@ dh_install -pubuntu-mythtv-frontend debian/startmythtv.sh usr/share/mythtv dh_install -pubuntu-mythtv-frontend debian/mythtv-xsession.desktop usr/share/xsessions dh_install -pubuntu-mythtv-frontend debian/dmrc etc/mythtv + dh_install -pubuntu-mythtv-frontend debian/mplayer-config etc/mythtv dh_install -pubuntu-mythtv-frontend debian/background.xpm usr/share/mythtv dh_install -pubuntu-mythtv-frontend debian/openbox-menu.xml etc/mythtv dh_install -pubuntu-mythtv-frontend debian/gdm.conf etc/xdg/mythtv-ubuntu/gdm diff -u mythtv-0.20-svn20070122/debian/changelog mythtv-0.20-svn20070122/debian/changelog --- mythtv-0.20-svn20070122/debian/changelog +++ mythtv-0.20-svn20070122/debian/changelog @@ -1,3 +1,21 @@ +mythtv (0.20-svn20070122-0.0ubuntu5) feisty; urgency=low + + * debian/mythtv-database.config: + - Change priority of questions. User will only get questions + when reconfiguring the package. (LP: #99916) + * debian/mythtv-common.templates & mythtv-common.postinst + - Tell the user about their MySQL password. (LP: #96739) + * debian/ubuntu-mythtv-frontend.postinst & mplayer-config + - Add mplayer config to make sure screensaver off. (LP: #103191) + * Add 07_alsa_default.dpatch to make ALSA default. (LP: #93341) + * debian/mythtv-backend.init: + - unset DISPLAY & SESSION_MANAGER to prevent ominous QT + authentication warnings. (LP: #55827) + * Clarify text of debian/dialog_functions.sh. + * Add 21_changeset12782_hd_homerun.dpatch (LP: #104965) + + -- Mario Limonciello Tue, 10 Apr 2007 03:50:16 -0500 + mythtv (0.20-svn20070122-0.0ubuntu4) feisty; urgency=low * debian/control: diff -u mythtv-0.20-svn20070122/debian/mythtv-common.postinst mythtv-0.20-svn20070122/debian/mythtv-common.postinst --- mythtv-0.20-svn20070122/debian/mythtv-common.postinst +++ mythtv-0.20-svn20070122/debian/mythtv-common.postinst @@ -30,6 +30,10 @@ mythtv_password="$(pwgen -s 8)" set -e db_set mythtv/mysql_mythtv_password "$mythtv_password" + db_get mythtv/mysql_mythtv_password + db_subst mythtv/display_password password "$RET" + db_input high mythtv/display_password || true + db_go fi NEW=$(mktemp -t mysql.txt-XXXXXX) diff -u mythtv-0.20-svn20070122/debian/dialog_functions.sh mythtv-0.20-svn20070122/debian/dialog_functions.sh --- mythtv-0.20-svn20070122/debian/dialog_functions.sh +++ mythtv-0.20-svn20070122/debian/dialog_functions.sh @@ -141,7 +141,7 @@ if [ "$DE" = "kde" ]; then $SU_TYPE adduser `whoami` mythtv else - $SU_TYPE adduser `whoami` mythtv --message "Please enter your password to add `whoami` to the mythtv group." + $SU_TYPE adduser `whoami` mythtv --message "Please enter your current login password to add `whoami` to the mythtv group." fi dialog_question "Log out/in" "For the changes to take effect, your current login session will have to be restarted. Save all work and then press OK to restart your session." LOGOUT_NOT=$? diff -u mythtv-0.20-svn20070122/debian/patches/00list mythtv-0.20-svn20070122/debian/patches/00list --- mythtv-0.20-svn20070122/debian/patches/00list +++ mythtv-0.20-svn20070122/debian/patches/00list @@ -6 +6,3 @@ +07_alsa_default.dpatch 20_backend_crash_without_tuner +21_changeset12782_hd_homerun diff -u mythtv-0.20-svn20070122/debian/ubuntu-mythtv-frontend.postinst mythtv-0.20-svn20070122/debian/ubuntu-mythtv-frontend.postinst --- mythtv-0.20-svn20070122/debian/ubuntu-mythtv-frontend.postinst +++ mythtv-0.20-svn20070122/debian/ubuntu-mythtv-frontend.postinst @@ -11,7 +11,11 @@ cp /etc/mythtv/dmrc "$MYTHHOME"/.dmrc chown mythtv:mythtv "$MYTHHOME"/.dmrc fi - + if [ ! -e "$MYTHHOME"/.mplayer/config ]; then + mkdir -p "$MYTHHOME"/.mplayer + cp /etc/mythtv/mplayer-config "$MYTHHOME"/.mplayer/config + chown -R mythtv:mythtv "$MYTHHOME/.mplayer" + fi #add gdm.conf alternative, make sure higher than 50 so that takes priority over xubuntu if installed on xubuntu update-alternatives --install /etc/gdm/gdm-cdd.conf gdm-config-derivative /etc/xdg/mythtv-ubuntu/gdm/gdm.conf 52 fi diff -u mythtv-0.20-svn20070122/debian/mythtv-database.config mythtv-0.20-svn20070122/debian/mythtv-database.config --- mythtv-0.20-svn20070122/debian/mythtv-database.config +++ mythtv-0.20-svn20070122/debian/mythtv-database.config @@ -1,15 +1,14 @@ #!/bin/sh -e - +#Try and connect to a sane default before +#actually looking for input . /usr/share/debconf/confmodule +db_input low mythtv/mysql_host || true db_input low mythtv/mysql_admin_user || true - db_get mythtv/mysql_admin_user USER="$RET" - db_subst mythtv/mysql_admin_password user "$USER" -db_input high mythtv/mysql_admin_password || true - +db_input medium mythtv/mysql_admin_password || true db_go || true exit 0 diff -u mythtv-0.20-svn20070122/debian/mythtv-backend.init mythtv-0.20-svn20070122/debian/mythtv-backend.init --- mythtv-0.20-svn20070122/debian/mythtv-backend.init +++ mythtv-0.20-svn20070122/debian/mythtv-backend.init @@ -32,6 +32,8 @@ mkdir -p $RUNDIR chown -R $USER $RUNDIR +unset DISPLAY +unset SESSION_MANAGER case "$1" in start) diff -u mythtv-0.20-svn20070122/debian/mythtv-common.templates mythtv-0.20-svn20070122/debian/mythtv-common.templates --- mythtv-0.20-svn20070122/debian/mythtv-common.templates +++ mythtv-0.20-svn20070122/debian/mythtv-common.templates @@ -30,6 +30,17 @@ If you are not in the mythtv group when launching setup, you will be given the opportunity to be automatically added. +Template: mythtv/display_password +Type: note +_Description: The Ubuntu MythTV packages generate a random MySQL password. + The generated password for this machine is '${password}'. If you are + adding this machine to an existing mythtv-network, you will want to update + this password to the one in use by the network after completing installation. + . + This can be done by: 'sudo dpkg-reconfigure mythtv-common'. + . + In case you forget this password, it is also stored in '/etc/mythtv/mysql.txt'. + Template: mythtv/grabber Type: select _Choices: tv_grab_de, tv_grab_na, tv_grab_sn, tv_grab_uk, tv_grab_uk_rt only in patch2: unchanged: --- mythtv-0.20-svn20070122.orig/debian/patches/07_alsa_default.dpatch +++ mythtv-0.20-svn20070122/debian/patches/07_alsa_default.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## alsa-patch.dpatch by Mario Limonciello +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mythtv-0.20-svn20070122~/programs/mythfrontend/globalsettings.cpp mythtv-0.20-svn20070122/programs/mythfrontend/globalsettings.cpp +--- mythtv-0.20-svn20070122~/programs/mythfrontend/globalsettings.cpp 2007-01-22 03:08:36.000000000 -0600 ++++ mythtv-0.20-svn20070122/programs/mythfrontend/globalsettings.cpp 2007-04-08 19:03:44.000000000 -0500 +@@ -26,6 +26,7 @@ + HostComboBox *gc = new HostComboBox("AudioOutputDevice", true); + + gc->setLabel(QObject::tr("Audio output device")); ++ gc->addSelection("ALSA:default"); + QDir dev("/dev", "dsp*", QDir::Name, QDir::System); + gc->fillSelectionsFromDir(dev); + dev.setNameFilter("adsp*"); +@@ -75,6 +76,7 @@ + + gc->setLabel(QObject::tr("Mixer Device")); + QDir dev("/dev", "mixer*", QDir::Name, QDir::System); ++ gc->addSelection("default"); + gc->fillSelectionsFromDir(dev); + + dev.setPath("/dev/sound"); only in patch2: unchanged: --- mythtv-0.20-svn20070122.orig/debian/patches/21_changeset12782_hd_homerun.dpatch +++ mythtv-0.20-svn20070122/debian/patches/21_changeset12782_hd_homerun.dpatch @@ -0,0 +1,111 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## changeset12782_hd_homerun.dpatch by Mario Limonciello +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mythtv-0.20-svn20070122~/libs/libmythtv/mpeg/mpegstreamdata.cpp mythtv-0.20-svn20070122/libs/libmythtv/mpeg/mpegstreamdata.cpp +--- mythtv-0.20-svn20070122~/libs/libmythtv/mpeg/mpegstreamdata.cpp 2007-01-22 03:08:23.000000000 -0600 ++++ mythtv-0.20-svn20070122/libs/libmythtv/mpeg/mpegstreamdata.cpp 2007-04-10 12:58:17.000000000 -0500 +@@ -406,11 +406,11 @@ + pmt.Parse(); + + vector videoPIDs, audioPIDs; +- vector videoTypes, audioTypes; ++ vector videoTypes; + vector pids, types; + + // Video +- uint video_cnt = pmt.FindPIDs(StreamID::AnyVideo, videoPIDs, videoTypes); ++ uint video_cnt = pmt.FindPIDs(StreamID::AnyVideo, videoPIDs, videoTypes, true); + if (video_cnt < _pmt_single_program_num_video) + { + VERBOSE(VB_RECORD, "Only "<& pids) const + { ++ uint pids_start = pids.size(); ++ + if ((StreamID::AnyMask & type) != StreamID::AnyMask) + { + for (uint i=0; i < StreamCount(); i++) +@@ -337,11 +339,14 @@ + * \param type StreamType to match + * \param pids vector pids will be added to + * \param types vector types will be added to ++ * \param normalize if set, types will be normalized + * \return number of items in pids and types lists. + */ + uint ProgramMapTable::FindPIDs(uint type, vector& pids, +- vector& types) const ++ vector& types, bool normalize) const + { ++ uint pids_start = pids.size(); ++ + if ((StreamID::AnyMask & type) != StreamID::AnyMask) + { + for (uint i=0; i < StreamCount(); i++) +@@ -351,6 +356,7 @@ + types.push_back(StreamType(i)); + } + } ++ + else if (StreamID::AnyVideo == type) + { + for (uint i=0; i < StreamCount(); i++) +@@ -370,6 +376,20 @@ + } + } + ++ if (!normalize) ++ return pids.size(); ++ ++ for (uint i = pids_start; i < pids.size(); i++) ++ { ++ int index = FindPID(pids[i]); ++ if (index >= 0) ++ { ++ desc_list_t desc = MPEGDescriptor::Parse( ++ StreamInfo(i), StreamInfoLength(i)); ++ types[i] = StreamID::Normalize(types[i], desc); ++ } ++ } ++ + return pids.size(); + } + +diff -urNad mythtv-0.20-svn20070122~/libs/libmythtv/mpeg/mpegtables.h mythtv-0.20-svn20070122/libs/libmythtv/mpeg/mpegtables.h +--- mythtv-0.20-svn20070122~/libs/libmythtv/mpeg/mpegtables.h 2007-01-22 03:08:23.000000000 -0600 ++++ mythtv-0.20-svn20070122/libs/libmythtv/mpeg/mpegtables.h 2007-04-10 12:58:17.000000000 -0500 +@@ -541,7 +541,7 @@ + QString GetLanguage(uint i) const; + + uint FindPIDs(uint type, vector& pids) const; +- uint FindPIDs(uint type, vector& pids, vector& types) const; ++ uint FindPIDs(uint type, vector& pids, vector& types, bool normalize) const; + + /// \brief Locates stream index of pid. + /// \return stream index if successful, -1 otherwise only in patch2: unchanged: --- mythtv-0.20-svn20070122.orig/debian/mplayer-config +++ mythtv-0.20-svn20070122/debian/mplayer-config @@ -0,0 +1,2 @@ +# Write your default config options here! +stop-xscreensaver=1