diff -Nru mythbuntu-common-0.71/build/lib/mythbuntu_common/installer.py mythbuntu-common-0.72/build/lib/mythbuntu_common/installer.py --- mythbuntu-common-0.71/build/lib/mythbuntu_common/installer.py 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/build/lib/mythbuntu_common/installer.py 2014-04-09 06:19:39.000000000 +0000 @@ -82,7 +82,8 @@ total_list[item]=list[item].get_text() else: model = list[item].get_model() - iterator = list[item].get_active_iter() + row = list[item].get_selection().get_selected_rows()[1] + iterator = model.get_iter(row[0]) active = model.get_value(iterator, 0) total_list[item]=active return total_list diff -Nru mythbuntu-common-0.71/Changelog mythbuntu-common-0.72/Changelog --- mythbuntu-common-0.71/Changelog 2014-01-27 12:09:22.000000000 +0000 +++ mythbuntu-common-0.72/Changelog 2014-04-10 16:27:14.000000000 +0000 @@ -1,3 +1,12 @@ +mythbuntu-common (0.72) trusty; urgency=medium + + * drop system updates plugin. the only real purpose for it was to change + update notifier behavior which can no longer be modified. + * drop some broken mysql code that didn't get ported to python3 in time. + * update to standards 3.9.5. + + -- Mario Limonciello Thu, 10 Apr 2014 11:14:31 -0500 + mythbuntu-common (0.71) trusty; urgency=medium * Make mythbuntu.make call dh_python2/dh_python3, if available. diff -Nru mythbuntu-common-0.71/debian/changelog mythbuntu-common-0.72/debian/changelog --- mythbuntu-common-0.71/debian/changelog 2014-01-27 12:09:22.000000000 +0000 +++ mythbuntu-common-0.72/debian/changelog 2014-04-10 16:27:14.000000000 +0000 @@ -1,3 +1,12 @@ +mythbuntu-common (0.72) trusty; urgency=medium + + * drop system updates plugin. the only real purpose for it was to change + update notifier behavior which can no longer be modified. + * drop some broken mysql code that didn't get ported to python3 in time. + * update to standards 3.9.5. + + -- Mario Limonciello Thu, 10 Apr 2014 11:14:31 -0500 + mythbuntu-common (0.71) trusty; urgency=medium * Make mythbuntu.make call dh_python2/dh_python3, if available. diff -Nru mythbuntu-common-0.71/debian/control mythbuntu-common-0.72/debian/control --- mythbuntu-common-0.71/debian/control 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/debian/control 2014-04-10 16:25:33.000000000 +0000 @@ -6,7 +6,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~mythbuntu-dev/mythbuntu/mythbuntu-common XS-Vcs-Browser: http://codebrowse.launchpad.net/~mythbuntu-dev/mythbuntu/mythbuntu-common XS-Python-Version: current -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Package: mythbuntu-common Architecture: all diff -Nru mythbuntu-common-0.71/mythbuntu_common/installer.py mythbuntu-common-0.72/mythbuntu_common/installer.py --- mythbuntu-common-0.71/mythbuntu_common/installer.py 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/mythbuntu_common/installer.py 2014-04-09 06:19:39.000000000 +0000 @@ -82,7 +82,8 @@ total_list[item]=list[item].get_text() else: model = list[item].get_model() - iterator = list[item].get_active_iter() + row = list[item].get_selection().get_selected_rows()[1] + iterator = model.get_iter(row[0]) active = model.get_value(iterator, 0) total_list[item]=active return total_list diff -Nru mythbuntu-common-0.71/patch mythbuntu-common-0.72/patch --- mythbuntu-common-0.71/patch 1970-01-01 00:00:00.000000000 +0000 +++ mythbuntu-common-0.72/patch 2014-04-10 16:23:49.000000000 +0000 @@ -0,0 +1,35 @@ +diff -Nru mythbuntu-common-0.70/debian/changelog mythbuntu-common-0.71/debian/changelog +--- mythbuntu-common-0.70/debian/changelog 2013-11-13 04:05:21.000000000 +0000 ++++ mythbuntu-common-0.71/debian/changelog 2014-01-27 12:09:22.000000000 +0000 +@@ -1,3 +1,9 @@ ++mythbuntu-common (0.71) trusty; urgency=medium ++ ++ * Make mythbuntu.make call dh_python2/dh_python3, if available. ++ ++ -- Dimitri John Ledkov Mon, 27 Jan 2014 12:09:22 +0000 ++ + mythbuntu-common (0.70) trusty; urgency=low + + * Drop some string.split() calls. +diff -Nru mythbuntu-common-0.70/debian/mythbuntu.make mythbuntu-common-0.71/debian/mythbuntu.make +--- mythbuntu-common-0.70/debian/mythbuntu.make 2013-11-11 18:30:23.000000000 +0000 ++++ mythbuntu-common-0.71/debian/mythbuntu.make 2014-01-27 12:08:43.000000000 +0000 +@@ -1,5 +1,12 @@ + #Common Mythbuntu makefile + ++ifneq (,$(wildcard /usr/bin/dh_python2)) ++py2=python2, ++endif ++ifneq (,$(wildcard /usr/bin/dh_python3sdfsf)) ++py3=python3 ++endif ++ + DEB_SOURCE_PACKAGE+=$(shell egrep '^Source: ' debian/control | cut -f2 -d ' ') + DEB_UPSTREAM_VERSION+=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//') + BZR_BRANCH+=http://bazaar.launchpad.net/~mythbuntu-dev/mythbuntu/$(DEB_SOURCE_PACKAGE) +@@ -11,4 +18,4 @@ + rm -rf $(CURDIR)/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) + + %: +- dh $@ ++ dh $@ --with=$(py2)$(py3) diff -Nru mythbuntu-common-0.71/plugins/python/services.py mythbuntu-common-0.72/plugins/python/services.py --- mythbuntu-common-0.71/plugins/python/services.py 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/plugins/python/services.py 2014-04-09 04:42:21.000000000 +0000 @@ -23,7 +23,6 @@ from MythbuntuControlCentre.plugin import MCCPlugin from mythbuntu_common.dictionaries import get_services_dictionary from mythbuntu_common.vnc import VNCHandler -from mythbuntu_common.mysql import MySQLHandler import re import shutil import os @@ -39,7 +38,6 @@ information["ui"] = "tab_services" MCCPlugin.__init__(self,information) self.vnc=VNCHandler() - self.mysql=MySQLHandler() def captureState(self): """Determines the state of the items on managed by this plugin diff -Nru mythbuntu-common-0.71/plugins/python/system_updates.py mythbuntu-common-0.72/plugins/python/system_updates.py --- mythbuntu-common-0.71/plugins/python/system_updates.py 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/plugins/python/system_updates.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -## -*- coding: utf-8 -*- -# -# «system_updates» - MCC Plugin for administration of updates -# -# Copyright (C) 2009, Mario Limonciello, for Mythbuntu -# -# -# Mythbuntu is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this application; if not, write to the Free Software Foundation, Inc., 51 -# Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -################################################################################## - -from MythbuntuControlCentre.plugin import MCCPlugin -import os -from gi.repository import GConf -from gi.repository import GObject - -UPDATE_NOTIFIER_KEY="/apps/update-notifier/auto_launch" - -class SystemUpdatesPlugin(MCCPlugin): - """A plugin for performing a series of updates""" - - def __init__(self): - #Initialize parent class - information = {} - information["name"] = "System Updates" - information["icon"] = "update-manager" - information["ui"] = "tab_system_updates" - self.user_count=0 - self.gconfclient = GConf.Client.get_default() - MCCPlugin.__init__(self,information) - - def captureState(self): - """Determines the state of the items on managed by this plugin - and stores it into the plugin's own internal structures""" - #Check packages installed for turning on a few buttons - self.software_center=self.query_installed('software-center') - self.updatemanager=self.query_installed('update-manager') - try: - self.update_manager_background = self.gconfclient.get_bool(UPDATE_NOTIFIER_KEY) - except GObject.GError as e: - logging.warning(_("Error pulling gconf status for update notifier")) - self.update_manager_background = True - - def applyStateToGUI(self): - """Takes the current state information and sets the GUI - for this plugin""" - self.software_center_button.set_sensitive(self.software_center) - self.updatemanager_button.set_sensitive(self.updatemanager) - if self.update_manager_background: - self.background_radio.set_active(True) - else: - self.notification_icon_radio.set_active(True) - - def compareState(self): - """Determines what items have been modified on this plugin""" - #Prepare for state capturing - MCCPlugin.clearParentState(self) - - if self.update_manager_background != self.background_radio.get_active(): - self._markReconfigureUser("update_manager_background",self.background_radio.get_active()) - - def launch_app(self,widget): - """Launches an application""" - if widget is not None: - if widget.get_name() == 'updatemanager_button': - MCCPlugin.launch_app(self,widget,"update-manager") - elif widget.get_name() == 'software_center_button': - MCCPlugin.launch_app(self,widget,"software-center") - elif widget.get_name() == 'terminal_button': - MCCPlugin.launch_app(self,widget,"x-terminal-emulator") - - def user_scripted_changes(self,reconfigure): - """Local changes that can be performed by the user account. - This function will be ran by the frontend.""" - for item in reconfigure: - if item == "update_manager_background": - self.gconfclient.set_bool(UPDATE_NOTIFIER_KEY,reconfigure[item]) diff -Nru mythbuntu-common-0.71/plugins/ui/tab_system_updates.ui mythbuntu-common-0.72/plugins/ui/tab_system_updates.ui --- mythbuntu-common-0.71/plugins/ui/tab_system_updates.ui 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/plugins/ui/tab_system_updates.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,359 +0,0 @@ - - - - - True - False - start - start - 6 - - - True - True - 0 - <big><b>System Updates</b></big> - True - True - - - False - False - 0 - - - - - True - False - - - False - False - 6 - 1 - - - - - True - False - 10 - - - 555 - True - False - 0 - These tools can be used for performing updates that are regularly released for Mythbuntu and changing update behaviors. - True - - - False - False - 0 - - - - - True - False - 10 - - - True - False - 0 - <b>System Update Tools</b> - True - - - True - True - 0 - - - - - True - False - 0 - 0 - 25 - - - True - True - True - True - half - - - - True - False - 0.019999999552965164 - 0 - 0 - - - True - False - 2 - - - True - False - update-manager - - - False - False - 0 - - - - - True - False - Update Manager - True - - - False - False - 1 - - - - - - - - - - - True - True - 1 - - - - - True - False - 0 - 0 - 25 - - - True - True - True - True - half - - - - True - False - 0.019999999552965164 - 0 - 0 - - - True - False - 2 - - - True - False - system-upgrade - - - False - False - 0 - - - - - True - False - Software Center - True - - - False - False - 1 - - - - - - - - - - - True - True - 2 - - - - - True - False - 0 - 0 - 25 - - - True - True - True - True - half - - - - True - False - 0.019999999552965164 - 0 - 0 - - - True - False - 2 - - - True - False - gtk-index - - - False - False - 0 - - - - - True - False - Terminal - True - - - False - False - 1 - - - - - - - - - - - True - True - 3 - - - - - False - False - 1 - - - - - True - False - 10 - - - True - False - 0 - <b>Update Manager Behavior</b> - True - - - True - True - 0 - - - - - True - False - 25 - - - Launch in the background - True - True - False - 0.5 - True - notification_icon_radio - - - - - True - True - 1 - - - - - True - False - 25 - - - Notification icon in panel - True - True - False - 0.5 - True - True - - - - - True - True - 2 - - - - - False - False - 2 - - - - - False - False - 6 - 2 - - - - diff -Nru mythbuntu-common-0.71/po/POTFILES.in mythbuntu-common-0.72/po/POTFILES.in --- mythbuntu-common-0.71/po/POTFILES.in 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/po/POTFILES.in 2014-04-10 16:16:43.000000000 +0000 @@ -1,7 +1,6 @@ ./plugins/ui/tab_system_roles.ui ./plugins/ui/tab_proprietary_codecs.ui ./plugins/ui/tab_remote_control.ui -./plugins/ui/tab_system_updates.ui ./plugins/ui/tab_startup_behavior.ui ./plugins/ui/tab_mythexport.ui ./plugins/ui/tab_mysql_configuration.ui @@ -14,5 +13,4 @@ ./plugins/python/plugins.py ./plugins/python/startup_behavior.py ./plugins/python/proprietary_codecs.py -./plugins/python/system_updates.py ./plugins/python/system_roles.py diff -Nru mythbuntu-common-0.71/repos.db mythbuntu-common-0.72/repos.db --- mythbuntu-common-0.71/repos.db 2014-01-27 12:08:31.000000000 +0000 +++ mythbuntu-common-0.72/repos.db 2014-03-25 04:30:24.000000000 +0000 @@ -19,19 +19,29 @@ maverick 0.24 lucid 0.24 quantal 0.25 +nadia 0.25 precise 0.25 +maya 0.25 oneiric 0.25 natty 0.25 lucid 0.25 -saucy 0.26 raring 0.26 +olivia 0.26 quantal 0.26 +nadia 0.26 precise 0.26 +maya 0.26 +trusty 0.27 saucy 0.27 +petra 0.27 raring 0.27 -quantal 0.27 +olivia 0.27 precise 0.27 -saucy 0.27 -precise 0.28 -raring 0.28 +maya 0.27 +trusty 0.28 saucy 0.28 +petra 0.28 +raring 0.28 +olivia 0.28 +precise 0.28 +maya 0.28