mintbackup/arch.patch

   1 diff -Naur mintbackup.orig/usr/bin/mintbackup mintbackup/usr/bin/mintbackup
   2 --- mintbackup.orig/usr/bin/mintbackup  2011-03-07 22:44:30.000000000 +0100
   3 +++ mintbackup/usr/bin/mintbackup       2011-03-07 23:47:19.403907618 +0100
   4 @@ -1,10 +1,6 @@
   5  #!/usr/bin/python
   6
   7  import os
   8 -import sys
   9 -import commands
  10
  11 -launcher = commands.getoutput("/usr/lib/linuxmint/common/mint-which-launcher.py")
  12 -command = "%s /usr/lib/linuxmint/mintBackup/mintBackup.py" % (launcher)
  13 -os.system(command)
  14 +os.system("/usr/lib/linuxmint/mintBackup/mintBackup.py")
  15
  16 diff -Naur mintbackup.orig/usr/lib/linuxmint/mintBackup/mintBackup.glade mintbackup/usr/lib/linuxmint/mintBackup/mintBackup.glade
  17 --- mintbackup.orig/usr/lib/linuxmint/mintBackup/mintBackup.glade       2011-03-07 22:44:30.000000000 +0100
  18 +++ mintbackup/usr/lib/linuxmint/mintBackup/mintBackup.glade    2011-03-07 23:37:40.339124747 +0100
  19 @@ -123,7 +123,7 @@
  20                          <property name="y_padding">3</property>
  21                        </packing>
  22                      </child>
  23 -                    <child>
  24 +<!--                    <child>
  25                        <widget class="GtkButton" id="button_backup_packages">
  26                          <property name="visible">True</property>
  27                          <property name="can_focus">True</property>
  28 @@ -185,7 +185,7 @@
  29                          <property name="x_padding">6</property>
  30                          <property name="y_padding">3</property>
  31                        </packing>
  32 -                    </child>
  33 +                    </child>-->
  34                      <child>
  35                        <widget class="GtkButton" id="button_restore_files">
  36                          <property name="visible">True</property>
  37 @@ -250,7 +250,7 @@
  38                          <property name="y_padding">3</property>
  39                        </packing>
  40                      </child>
  41 -                    <child>
  42 +<!--                    <child>
  43                        <widget class="GtkButton" id="button_restore_packages">
  44                          <property name="visible">True</property>
  45                          <property name="can_focus">True</property>
  46 @@ -314,7 +314,7 @@
  47                          <property name="x_padding">6</property>
  48                          <property name="y_padding">3</property>
  49                        </packing>
  50 -                    </child>
  51 +                    </child>-->
  52                    </widget>
  53                    <packing>
  54                      <property name="position">1</property>
  55 diff -Naur mintbackup.orig/usr/lib/linuxmint/mintBackup/mintBackup.py mintbackup/usr/lib/linuxmint/mintBackup/mintBackup.py
  56 --- mintbackup.orig/usr/lib/linuxmint/mintBackup/mintBackup.py  2011-03-07 23:21:00.000000000 +0100
  57 +++ mintbackup/usr/lib/linuxmint/mintBackup/mintBackup.py       2011-03-07 23:41:02.106511118 +0100
  58 @@ -19,7 +19,7 @@
  59         import shutil
  60         import hashlib
  61         from time import strftime, localtime, sleep
  62 -       import apt
  63 +#      import apt
  64         import subprocess
  65         from user import home
  66         import tempfile
  67 @@ -84,7 +84,7 @@
  68                 except:
  69                         pass
  70  ''' Handy. Makes message dialogs easy :D '''
  71 -class MessageDialog(apt.progress.gtk2.GOpProgress):
  72 +class MessageDialog():
  73
  74         def __init__(self, title, message, style):
  75                 self.title = title
  76 @@ -145,8 +145,8 @@
  77                 # page 0
  78                 self.wTree.get_widget("button_backup_files").connect("clicked", self.wizard_buttons_cb, 1)
  79                 self.wTree.get_widget("button_restore_files").connect("clicked", self.wizard_buttons_cb, 6)
  80 -               self.wTree.get_widget("button_backup_packages").connect("clicked", self.wizard_buttons_cb, 10)
  81 -               self.wTree.get_widget("button_restore_packages").connect("clicked", self.wizard_buttons_cb, 14)
  82 +#              self.wTree.get_widget("button_backup_packages").connect("clicked", self.wizard_buttons_cb, 10)
  83 +#              self.wTree.get_widget("button_restore_packages").connect("clicked", self.wizard_buttons_cb, 14)
  84
  85                 # set up backup page 1 (source/dest/options)
  86                 # Displayname, [tarfile mode, file extension]
  87 @@ -281,18 +281,18 @@
  88
  89                 self.wTree.get_widget("label_create_backup").set_text(_("Backup files"))
  90                 self.wTree.get_widget("label_restore_backup").set_text(_("Restore files"))
  91 -               self.wTree.get_widget("label_create_packages").set_text(_("Backup software selection"))
  92 -               self.wTree.get_widget("label_restore_packages").set_text(_("Restore software selection"))
  93 +#              self.wTree.get_widget("label_create_packages").set_text(_("Backup software selection"))
  94 +#              self.wTree.get_widget("label_restore_packages").set_text(_("Restore software selection"))
  95
  96                 self.wTree.get_widget("label_detail1").set_markup("<small>" + _("Make a backup of your files") + "</small>")
  97 -               self.wTree.get_widget("label_detail2").set_markup("<small>" + _("Save the list of installed applications") + "</small>")
  98 +#              self.wTree.get_widget("label_detail2").set_markup("<small>" + _("Save the list of installed applications") + "</small>")
  99                 self.wTree.get_widget("label_detail3").set_markup("<small>" + _("Restore a previous backup") + "</small>")
 100 -               self.wTree.get_widget("label_detail4").set_markup("<small>" + _("Restore previously installed applications") + "</small>")
 101 +#              self.wTree.get_widget("label_detail4").set_markup("<small>" + _("Restore previously installed applications") + "</small>")
 102
 103                 self.wTree.get_widget("image_backup_data").set_from_file("/usr/lib/linuxmint/mintBackup/backup-data.svg")
 104                 self.wTree.get_widget("image_restore_data").set_from_file("/usr/lib/linuxmint/mintBackup/restore-data.svg")
 105 -               self.wTree.get_widget("image_backup_software").set_from_file("/usr/lib/linuxmint/mintBackup/backup-software.svg")
 106 -               self.wTree.get_widget("image_restore_software").set_from_file("/usr/lib/linuxmint/mintBackup/restore-software.svg")
 107 +#              self.wTree.get_widget("image_backup_software").set_from_file("/usr/lib/linuxmint/mintBackup/backup-software.svg")
 108 +#              self.wTree.get_widget("image_restore_software").set_from_file("/usr/lib/linuxmint/mintBackup/restore-software.svg")
 109
 110                 # i18n - Page 1 (choose backup directories)
 111                 self.wTree.get_widget("label_title_destination").set_markup("<big><b>" + _("Backup files") + "</b></big>")
 112 @@ -397,7 +397,7 @@
 113                 dlg.set_program_name("mintBackup")
 114                 dlg.set_comments(_("Backup Tool"))
 115                 try:
 116 -                       h = open('/usr/share/common-licenses/GPL','r')
 117 +                       h = open('/usr/share/licenses/common/GPL/license.txt','r')
 118                         s = h.readlines()
 119                         gpl = ""
 120                         for line in s:
 121 @@ -408,7 +408,7 @@
 122                         print detail
 123                 try:
 124                         version = commands.getoutput("/usr/lib/linuxmint/common/version.py mintbackup")
 125 -                       dlg.set_version(version)
 126 +                       dlg.set_version("2.0.8")
 127                 except Exception, detail:
 128                         print detail
 129