Merge lp:~mterry/ubuntu/maverick/apturl/gtkbuilder into lp:apturl
- Maverick (10.10)
- gtkbuilder
- Merge into ubuntu
Proposed by
Michael Terry
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 100 | ||||
| Proposed branch: | lp:~mterry/ubuntu/maverick/apturl/gtkbuilder | ||||
| Merge into: | lp:apturl | ||||
| Diff against target: |
377 lines (+67/-65) 9 files modified
AptUrl/gtk/GtkUI.py (+9/-10) AptUrl/kde/KdeUI.py (+1/-1) data/apturl-gtk.ui (+46/-48) debian/apturl-kde.install (+1/-1) debian/apturl.install (+1/-1) debian/changelog (+6/-0) debian/control (+1/-2) po/POTFILES.in (+1/-1) setup.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp:~mterry/ubuntu/maverick/apturl/gtkbuilder | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'AptUrl/gtk/GtkUI.py' | |||
| 2 | --- AptUrl/gtk/GtkUI.py 2010-03-08 16:17:34 +0000 | |||
| 3 | +++ AptUrl/gtk/GtkUI.py 2010-10-05 15:16:15 +0000 | |||
| 4 | @@ -2,7 +2,6 @@ | |||
| 5 | 2 | import pygtk | 2 | import pygtk |
| 6 | 3 | pygtk.require("2.0") | 3 | pygtk.require("2.0") |
| 7 | 4 | import gtk | 4 | import gtk |
| 8 | 5 | import gtk.glade | ||
| 9 | 6 | import gobject | 5 | import gobject |
| 10 | 7 | gobject.threads_init() | 6 | gobject.threads_init() |
| 11 | 8 | import subprocess | 7 | import subprocess |
| 12 | @@ -24,10 +23,10 @@ | |||
| 13 | 24 | def __init__(self): | 23 | def __init__(self): |
| 14 | 25 | gtk.init_check() | 24 | gtk.init_check() |
| 15 | 26 | # create empty dialog | 25 | # create empty dialog |
| 20 | 27 | self.dia_xml = gtk.glade.XML('/usr/share/apturl/apturl.glade', | 26 | self.dia_xml = gtk.Builder() |
| 21 | 28 | 'confirmation_dialog', | 27 | self.dia_xml.set_translation_domain("apturl") |
| 22 | 29 | "apturl") | 28 | self.dia_xml.add_from_file('/usr/share/apturl/apturl-gtk.ui') |
| 23 | 30 | self.dia = self.dia_xml.get_widget('confirmation_dialog') | 29 | self.dia = self.dia_xml.get_object('confirmation_dialog') |
| 24 | 31 | self.dia.realize() | 30 | self.dia.realize() |
| 25 | 32 | 31 | ||
| 26 | 33 | # generic dialogs | 32 | # generic dialogs |
| 27 | @@ -139,11 +138,11 @@ | |||
| 28 | 139 | body = _("Do you want to install package '%s'?") % package | 138 | body = _("Do you want to install package '%s'?") % package |
| 29 | 140 | dia.set_keep_above(True) | 139 | dia.set_keep_above(True) |
| 30 | 141 | dia.set_title('') | 140 | dia.set_title('') |
| 32 | 142 | header_label = dia_xml.get_widget('header_label') | 141 | header_label = dia_xml.get_object('header_label') |
| 33 | 143 | header_label.set_markup("<b><big>%s</big></b>" % header) | 142 | header_label.set_markup("<b><big>%s</big></b>" % header) |
| 35 | 144 | body_label = dia_xml.get_widget('body_label') | 143 | body_label = dia_xml.get_object('body_label') |
| 36 | 145 | body_label.set_label(body) | 144 | body_label.set_label(body) |
| 38 | 146 | description_text_view = dia_xml.get_widget('description_text_view') | 145 | description_text_view = dia_xml.get_object('description_text_view') |
| 39 | 147 | tbuf = gtk.TextBuffer() | 146 | tbuf = gtk.TextBuffer() |
| 40 | 148 | desc = "%s\n\n%s" % (summary, Helpers.format_description(description)) | 147 | desc = "%s\n\n%s" % (summary, Helpers.format_description(description)) |
| 41 | 149 | tbuf.set_text(desc) | 148 | tbuf.set_text(desc) |
| 42 | @@ -156,8 +155,8 @@ | |||
| 43 | 156 | # be locked via apt_pkg.GetLock() | 155 | # be locked via apt_pkg.GetLock() |
| 44 | 157 | # - but that needs to run as root | 156 | # - but that needs to run as root |
| 45 | 158 | # - a dbus helper might be the best answer here | 157 | # - a dbus helper might be the best answer here |
| 48 | 159 | #args = (update_button_status, dia_xml.get_widget("yes_button"), | 158 | #args = (update_button_status, dia_xml.get_object("yes_button"), |
| 49 | 160 | # dia_xml.get_widget("infolabel")) | 159 | # dia_xml.get_object("infolabel")) |
| 50 | 161 | #args[0](*args[1:]) | 160 | #args[0](*args[1:]) |
| 51 | 162 | #timer_id = gobject.timeout_add(750, *args ) | 161 | #timer_id = gobject.timeout_add(750, *args ) |
| 52 | 163 | 162 | ||
| 53 | 164 | 163 | ||
| 54 | === modified file 'AptUrl/kde/KdeUI.py' | |||
| 55 | --- AptUrl/kde/KdeUI.py 2010-08-07 03:11:07 +0000 | |||
| 56 | +++ AptUrl/kde/KdeUI.py 2010-10-05 15:16:15 +0000 | |||
| 57 | @@ -39,7 +39,7 @@ | |||
| 58 | 39 | self.d = QWidget(self.dialog) | 39 | self.d = QWidget(self.dialog) |
| 59 | 40 | self.dialog.setMainWidget(self.d) | 40 | self.dialog.setMainWidget(self.d) |
| 60 | 41 | 41 | ||
| 62 | 42 | uic.loadUi('/usr/share/apturl/apturl.ui', self.d) | 42 | uic.loadUi('/usr/share/apturl/apturl-qt.ui', self.d) |
| 63 | 43 | self.d.image_label.setPixmap(KIcon("application-x-deb").pixmap(64,64)) | 43 | self.d.image_label.setPixmap(KIcon("application-x-deb").pixmap(64,64)) |
| 64 | 44 | 44 | ||
| 65 | 45 | # generic dialogs | 45 | # generic dialogs |
| 66 | 46 | 46 | ||
| 67 | === renamed file 'data/apturl.glade' => 'data/apturl-gtk.ui' | |||
| 68 | --- data/apturl.glade 2009-01-08 19:46:00 +0000 | |||
| 69 | +++ data/apturl-gtk.ui 2010-10-05 15:16:15 +0000 | |||
| 70 | @@ -1,8 +1,7 @@ | |||
| 73 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0"?> |
| 72 | 2 | <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> | ||
| 74 | 3 | <!--*- mode: xml -*--> | 2 | <!--*- mode: xml -*--> |
| 77 | 4 | <glade-interface> | 3 | <interface> |
| 78 | 5 | <widget class="GtkDialog" id="confirmation_dialog"> | 4 | <object class="GtkDialog" id="confirmation_dialog"> |
| 79 | 6 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 5 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
| 80 | 7 | <property name="border_width">5</property> | 6 | <property name="border_width">5</property> |
| 81 | 8 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> | 7 | <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> |
| 82 | @@ -10,61 +9,61 @@ | |||
| 83 | 10 | <property name="skip_taskbar_hint">True</property> | 9 | <property name="skip_taskbar_hint">True</property> |
| 84 | 11 | <property name="has_separator">False</property> | 10 | <property name="has_separator">False</property> |
| 85 | 12 | <child internal-child="vbox"> | 11 | <child internal-child="vbox"> |
| 87 | 13 | <widget class="GtkVBox" id="dialog-vbox1"> | 12 | <object class="GtkVBox" id="dialog-vbox1"> |
| 88 | 14 | <property name="visible">True</property> | 13 | <property name="visible">True</property> |
| 89 | 15 | <property name="spacing">2</property> | 14 | <property name="spacing">2</property> |
| 90 | 16 | <child> | 15 | <child> |
| 92 | 17 | <widget class="GtkHBox" id="hbox1"> | 16 | <object class="GtkHBox" id="hbox1"> |
| 93 | 18 | <property name="visible">True</property> | 17 | <property name="visible">True</property> |
| 94 | 19 | <property name="spacing">10</property> | 18 | <property name="spacing">10</property> |
| 95 | 20 | <child> | 19 | <child> |
| 97 | 21 | <widget class="GtkImage" id="dialog_image"> | 20 | <object class="GtkImage" id="dialog_image"> |
| 98 | 22 | <property name="visible">True</property> | 21 | <property name="visible">True</property> |
| 99 | 23 | <property name="yalign">0</property> | 22 | <property name="yalign">0</property> |
| 100 | 24 | <property name="stock">gtk-dialog-question</property> | 23 | <property name="stock">gtk-dialog-question</property> |
| 101 | 25 | <property name="icon_size">6</property> | 24 | <property name="icon_size">6</property> |
| 103 | 26 | </widget> | 25 | </object> |
| 104 | 27 | <packing> | 26 | <packing> |
| 105 | 28 | <property name="expand">False</property> | 27 | <property name="expand">False</property> |
| 106 | 29 | </packing> | 28 | </packing> |
| 107 | 30 | </child> | 29 | </child> |
| 108 | 31 | <child> | 30 | <child> |
| 110 | 32 | <widget class="GtkVBox" id="vbox1"> | 31 | <object class="GtkVBox" id="vbox1"> |
| 111 | 33 | <property name="visible">True</property> | 32 | <property name="visible">True</property> |
| 112 | 34 | <property name="spacing">12</property> | 33 | <property name="spacing">12</property> |
| 113 | 35 | <child> | 34 | <child> |
| 115 | 36 | <widget class="GtkLabel" id="header_label"> | 35 | <object class="GtkLabel" id="header_label"> |
| 116 | 37 | <property name="visible">True</property> | 36 | <property name="visible">True</property> |
| 117 | 38 | <property name="xalign">0</property> | 37 | <property name="xalign">0</property> |
| 118 | 39 | <property name="use_markup">True</property> | 38 | <property name="use_markup">True</property> |
| 120 | 40 | </widget> | 39 | </object> |
| 121 | 41 | <packing> | 40 | <packing> |
| 122 | 42 | <property name="expand">False</property> | 41 | <property name="expand">False</property> |
| 123 | 43 | </packing> | 42 | </packing> |
| 124 | 44 | </child> | 43 | </child> |
| 125 | 45 | <child> | 44 | <child> |
| 127 | 46 | <widget class="GtkLabel" id="body_label"> | 45 | <object class="GtkLabel" id="body_label"> |
| 128 | 47 | <property name="visible">True</property> | 46 | <property name="visible">True</property> |
| 129 | 48 | <property name="xalign">0</property> | 47 | <property name="xalign">0</property> |
| 131 | 49 | </widget> | 48 | </object> |
| 132 | 50 | <packing> | 49 | <packing> |
| 133 | 51 | <property name="expand">False</property> | 50 | <property name="expand">False</property> |
| 134 | 52 | <property name="position">1</property> | 51 | <property name="position">1</property> |
| 135 | 53 | </packing> | 52 | </packing> |
| 136 | 54 | </child> | 53 | </child> |
| 137 | 55 | <child> | 54 | <child> |
| 139 | 56 | <widget class="GtkExpander" id="description_expander"> | 55 | <object class="GtkExpander" id="description_expander"> |
| 140 | 57 | <property name="visible">True</property> | 56 | <property name="visible">True</property> |
| 141 | 58 | <property name="can_focus">True</property> | 57 | <property name="can_focus">True</property> |
| 142 | 59 | <child> | 58 | <child> |
| 144 | 60 | <widget class="GtkScrolledWindow" id="scrolledwindow1"> | 59 | <object class="GtkScrolledWindow" id="scrolledwindow1"> |
| 145 | 61 | <property name="visible">True</property> | 60 | <property name="visible">True</property> |
| 146 | 62 | <property name="can_focus">True</property> | 61 | <property name="can_focus">True</property> |
| 147 | 63 | <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> | 62 | <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> |
| 148 | 64 | <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | 63 | <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> |
| 149 | 65 | <property name="shadow_type">GTK_SHADOW_OUT</property> | 64 | <property name="shadow_type">GTK_SHADOW_OUT</property> |
| 150 | 66 | <child> | 65 | <child> |
| 152 | 67 | <widget class="GtkTextView" id="description_text_view"> | 66 | <object class="GtkTextView" id="description_text_view"> |
| 153 | 68 | <property name="width_request">400</property> | 67 | <property name="width_request">400</property> |
| 154 | 69 | <property name="height_request">200</property> | 68 | <property name="height_request">200</property> |
| 155 | 70 | <property name="visible">True</property> | 69 | <property name="visible">True</property> |
| 156 | @@ -74,42 +73,39 @@ | |||
| 157 | 74 | <property name="wrap_mode">GTK_WRAP_WORD</property> | 73 | <property name="wrap_mode">GTK_WRAP_WORD</property> |
| 158 | 75 | <property name="left_margin">5</property> | 74 | <property name="left_margin">5</property> |
| 159 | 76 | <property name="right_margin">5</property> | 75 | <property name="right_margin">5</property> |
| 161 | 77 | </widget> | 76 | </object> |
| 162 | 78 | </child> | 77 | </child> |
| 164 | 79 | </widget> | 78 | </object> |
| 165 | 80 | </child> | 79 | </child> |
| 168 | 81 | <child> | 80 | <child type="label"> |
| 169 | 82 | <widget class="GtkLabel" id="description_label"> | 81 | <object class="GtkLabel" id="description_label"> |
| 170 | 83 | <property name="visible">True</property> | 82 | <property name="visible">True</property> |
| 171 | 84 | <property name="label" translatable="yes">Description</property> | 83 | <property name="label" translatable="yes">Description</property> |
| 176 | 85 | </widget> | 84 | </object> |
| 173 | 86 | <packing> | ||
| 174 | 87 | <property name="type">label_item</property> | ||
| 175 | 88 | </packing> | ||
| 177 | 89 | </child> | 85 | </child> |
| 179 | 90 | </widget> | 86 | </object> |
| 180 | 91 | <packing> | 87 | <packing> |
| 181 | 92 | <property name="position">2</property> | 88 | <property name="position">2</property> |
| 182 | 93 | </packing> | 89 | </packing> |
| 183 | 94 | </child> | 90 | </child> |
| 185 | 95 | </widget> | 91 | </object> |
| 186 | 96 | <packing> | 92 | <packing> |
| 187 | 97 | <property name="position">1</property> | 93 | <property name="position">1</property> |
| 188 | 98 | </packing> | 94 | </packing> |
| 189 | 99 | </child> | 95 | </child> |
| 191 | 100 | </widget> | 96 | </object> |
| 192 | 101 | <packing> | 97 | <packing> |
| 193 | 102 | <property name="padding">5</property> | 98 | <property name="padding">5</property> |
| 194 | 103 | <property name="position">1</property> | 99 | <property name="position">1</property> |
| 195 | 104 | </packing> | 100 | </packing> |
| 196 | 105 | </child> | 101 | </child> |
| 197 | 106 | <child> | 102 | <child> |
| 199 | 107 | <widget class="GtkLabel" id="infolabel"> | 103 | <object class="GtkLabel" id="infolabel"> |
| 200 | 108 | <property name="visible">True</property> | 104 | <property name="visible">True</property> |
| 201 | 109 | <property name="xalign">1</property> | 105 | <property name="xalign">1</property> |
| 202 | 110 | <property name="use_markup">True</property> | 106 | <property name="use_markup">True</property> |
| 203 | 111 | <property name="justify">GTK_JUSTIFY_RIGHT</property> | 107 | <property name="justify">GTK_JUSTIFY_RIGHT</property> |
| 205 | 112 | </widget> | 108 | </object> |
| 206 | 113 | <packing> | 109 | <packing> |
| 207 | 114 | <property name="expand">False</property> | 110 | <property name="expand">False</property> |
| 208 | 115 | <property name="fill">False</property> | 111 | <property name="fill">False</property> |
| 209 | @@ -117,11 +113,11 @@ | |||
| 210 | 117 | </packing> | 113 | </packing> |
| 211 | 118 | </child> | 114 | </child> |
| 212 | 119 | <child internal-child="action_area"> | 115 | <child internal-child="action_area"> |
| 214 | 120 | <widget class="GtkHButtonBox" id="dialog-action_area1"> | 116 | <object class="GtkHButtonBox" id="dialog-action_area1"> |
| 215 | 121 | <property name="visible">True</property> | 117 | <property name="visible">True</property> |
| 216 | 122 | <property name="layout_style">GTK_BUTTONBOX_END</property> | 118 | <property name="layout_style">GTK_BUTTONBOX_END</property> |
| 217 | 123 | <child> | 119 | <child> |
| 219 | 124 | <widget class="GtkButton" id="no_button"> | 120 | <object class="GtkButton" id="no_button"> |
| 220 | 125 | <property name="visible">True</property> | 121 | <property name="visible">True</property> |
| 221 | 126 | <property name="can_focus">True</property> | 122 | <property name="can_focus">True</property> |
| 222 | 127 | <property name="has_focus">True</property> | 123 | <property name="has_focus">True</property> |
| 223 | @@ -129,61 +125,63 @@ | |||
| 224 | 129 | <property name="has_default">True</property> | 125 | <property name="has_default">True</property> |
| 225 | 130 | <property name="label">gtk-cancel</property> | 126 | <property name="label">gtk-cancel</property> |
| 226 | 131 | <property name="use_stock">True</property> | 127 | <property name="use_stock">True</property> |
| 229 | 132 | <property name="response_id">0</property> | 128 | </object> |
| 228 | 133 | </widget> | ||
| 230 | 134 | </child> | 129 | </child> |
| 231 | 135 | <child> | 130 | <child> |
| 233 | 136 | <widget class="GtkButton" id="yes_button"> | 131 | <object class="GtkButton" id="yes_button"> |
| 234 | 137 | <property name="visible">True</property> | 132 | <property name="visible">True</property> |
| 235 | 138 | <property name="can_focus">True</property> | 133 | <property name="can_focus">True</property> |
| 236 | 139 | <property name="response_id">-8</property> | ||
| 237 | 140 | <child> | 134 | <child> |
| 239 | 141 | <widget class="GtkAlignment" id="alignment1"> | 135 | <object class="GtkAlignment" id="alignment1"> |
| 240 | 142 | <property name="visible">True</property> | 136 | <property name="visible">True</property> |
| 241 | 143 | <property name="xscale">0</property> | 137 | <property name="xscale">0</property> |
| 242 | 144 | <property name="yscale">0</property> | 138 | <property name="yscale">0</property> |
| 243 | 145 | <child> | 139 | <child> |
| 245 | 146 | <widget class="GtkHBox" id="hbox2"> | 140 | <object class="GtkHBox" id="hbox2"> |
| 246 | 147 | <property name="visible">True</property> | 141 | <property name="visible">True</property> |
| 247 | 148 | <property name="spacing">2</property> | 142 | <property name="spacing">2</property> |
| 248 | 149 | <child> | 143 | <child> |
| 250 | 150 | <widget class="GtkImage" id="image1"> | 144 | <object class="GtkImage" id="image1"> |
| 251 | 151 | <property name="visible">True</property> | 145 | <property name="visible">True</property> |
| 252 | 152 | <property name="stock">gtk-save</property> | 146 | <property name="stock">gtk-save</property> |
| 254 | 153 | </widget> | 147 | </object> |
| 255 | 154 | <packing> | 148 | <packing> |
| 256 | 155 | <property name="expand">False</property> | 149 | <property name="expand">False</property> |
| 257 | 156 | <property name="fill">False</property> | 150 | <property name="fill">False</property> |
| 258 | 157 | </packing> | 151 | </packing> |
| 259 | 158 | </child> | 152 | </child> |
| 260 | 159 | <child> | 153 | <child> |
| 262 | 160 | <widget class="GtkLabel" id="label1"> | 154 | <object class="GtkLabel" id="label1"> |
| 263 | 161 | <property name="visible">True</property> | 155 | <property name="visible">True</property> |
| 264 | 162 | <property name="label" translatable="yes">_Install</property> | 156 | <property name="label" translatable="yes">_Install</property> |
| 265 | 163 | <property name="use_underline">True</property> | 157 | <property name="use_underline">True</property> |
| 267 | 164 | </widget> | 158 | </object> |
| 268 | 165 | <packing> | 159 | <packing> |
| 269 | 166 | <property name="expand">False</property> | 160 | <property name="expand">False</property> |
| 270 | 167 | <property name="fill">False</property> | 161 | <property name="fill">False</property> |
| 271 | 168 | <property name="position">1</property> | 162 | <property name="position">1</property> |
| 272 | 169 | </packing> | 163 | </packing> |
| 273 | 170 | </child> | 164 | </child> |
| 275 | 171 | </widget> | 165 | </object> |
| 276 | 172 | </child> | 166 | </child> |
| 278 | 173 | </widget> | 167 | </object> |
| 279 | 174 | </child> | 168 | </child> |
| 281 | 175 | </widget> | 169 | </object> |
| 282 | 176 | <packing> | 170 | <packing> |
| 283 | 177 | <property name="position">1</property> | 171 | <property name="position">1</property> |
| 284 | 178 | </packing> | 172 | </packing> |
| 285 | 179 | </child> | 173 | </child> |
| 287 | 180 | </widget> | 174 | </object> |
| 288 | 181 | <packing> | 175 | <packing> |
| 289 | 182 | <property name="expand">False</property> | 176 | <property name="expand">False</property> |
| 290 | 183 | <property name="pack_type">GTK_PACK_END</property> | 177 | <property name="pack_type">GTK_PACK_END</property> |
| 291 | 184 | </packing> | 178 | </packing> |
| 292 | 185 | </child> | 179 | </child> |
| 294 | 186 | </widget> | 180 | </object> |
| 295 | 187 | </child> | 181 | </child> |
| 298 | 188 | </widget> | 182 | <action-widgets> |
| 299 | 189 | </glade-interface> | 183 | <action-widget response="0">no_button</action-widget> |
| 300 | 184 | <action-widget response="-8">yes_button</action-widget> | ||
| 301 | 185 | </action-widgets> | ||
| 302 | 186 | </object> | ||
| 303 | 187 | </interface> | ||
| 304 | 190 | 188 | ||
| 305 | === renamed file 'data/apturl.ui' => 'data/apturl-qt.ui' | |||
| 306 | === modified file 'debian/apturl-kde.install' | |||
| 307 | --- debian/apturl-kde.install 2009-09-01 19:09:49 +0000 | |||
| 308 | +++ debian/apturl-kde.install 2010-10-05 15:16:15 +0000 | |||
| 309 | @@ -1,3 +1,3 @@ | |||
| 310 | 1 | usr/bin/apturl-kde | 1 | usr/bin/apturl-kde |
| 311 | 2 | usr/lib/python2.6/site-packages/AptUrl/kde/*py* | 2 | usr/lib/python2.6/site-packages/AptUrl/kde/*py* |
| 313 | 3 | usr/share/apturl/*ui | 3 | usr/share/apturl/*-qt.ui |
| 314 | 4 | 4 | ||
| 315 | === modified file 'debian/apturl.install' | |||
| 316 | --- debian/apturl.install 2009-09-01 19:09:49 +0000 | |||
| 317 | +++ debian/apturl.install 2010-10-05 15:16:15 +0000 | |||
| 318 | @@ -1,4 +1,4 @@ | |||
| 319 | 1 | usr/bin/apturl-gtk | 1 | usr/bin/apturl-gtk |
| 320 | 2 | usr/lib/python2.6/site-packages/AptUrl/gtk/*py* | 2 | usr/lib/python2.6/site-packages/AptUrl/gtk/*py* |
| 322 | 3 | usr/share/apturl/*glade | 3 | usr/share/apturl/*-gtk.ui |
| 323 | 4 | usr/share/gconf | 4 | usr/share/gconf |
| 324 | 5 | 5 | ||
| 325 | === modified file 'debian/changelog' | |||
| 326 | --- debian/changelog 2010-09-07 15:40:47 +0000 | |||
| 327 | +++ debian/changelog 2010-10-05 15:16:15 +0000 | |||
| 328 | @@ -1,3 +1,9 @@ | |||
| 329 | 1 | apturl (0.4.1ubuntu8) UNRELEASED; urgency=low | ||
| 330 | 2 | |||
| 331 | 3 | * Switch from glade to GtkBuilder (LP: #403533) | ||
| 332 | 4 | |||
| 333 | 5 | -- Michael Terry <mterry@ubuntu.com> Tue, 05 Oct 2010 11:06:24 -0400 | ||
| 334 | 6 | |||
| 335 | 1 | apturl (0.4.1ubuntu7) maverick; urgency=low | 7 | apturl (0.4.1ubuntu7) maverick; urgency=low |
| 336 | 2 | 8 | ||
| 337 | 3 | * Fix KDE protocol files to enlist in the local protocol class | 9 | * Fix KDE protocol files to enlist in the local protocol class |
| 338 | 4 | 10 | ||
| 339 | === modified file 'debian/control' | |||
| 340 | --- debian/control 2010-09-07 15:40:47 +0000 | |||
| 341 | +++ debian/control 2010-10-05 15:16:15 +0000 | |||
| 342 | @@ -38,9 +38,8 @@ | |||
| 343 | 38 | gconf2, | 38 | gconf2, |
| 344 | 39 | gksu (>= 2.0.0-1ubuntu3), | 39 | gksu (>= 2.0.0-1ubuntu3), |
| 345 | 40 | gnome-icon-theme (>= 2.14.0-1), | 40 | gnome-icon-theme (>= 2.14.0-1), |
| 346 | 41 | python-glade2 (>= 2.6.3-2), | ||
| 347 | 42 | python-gobject, | 41 | python-gobject, |
| 349 | 43 | python-gtk2 (>= 2.6.3-2), | 42 | python-gtk2 (>= 2.12), |
| 350 | 44 | python-webkit, | 43 | python-webkit, |
| 351 | 45 | python-vte (>= 1:0.11.15-4), | 44 | python-vte (>= 1:0.11.15-4), |
| 352 | 46 | software-properties-gtk, | 45 | software-properties-gtk, |
| 353 | 47 | 46 | ||
| 354 | === modified file 'po/POTFILES.in' | |||
| 355 | --- po/POTFILES.in 2009-08-26 14:09:53 +0000 | |||
| 356 | +++ po/POTFILES.in 2010-10-05 15:16:15 +0000 | |||
| 357 | @@ -6,6 +6,6 @@ | |||
| 358 | 6 | AptUrl/UI.py | 6 | AptUrl/UI.py |
| 359 | 7 | AptUrl/gtk/GtkUI.py | 7 | AptUrl/gtk/GtkUI.py |
| 360 | 8 | AptUrl/kde/KdeUI.py | 8 | AptUrl/kde/KdeUI.py |
| 362 | 9 | data/apturl.glade | 9 | [type: gettext/glade] data/apturl-gtk.ui |
| 363 | 10 | data/apturl.schemas.in | 10 | data/apturl.schemas.in |
| 364 | 11 | 11 | ||
| 365 | 12 | 12 | ||
| 366 | === modified file 'setup.py' | |||
| 367 | --- setup.py 2010-07-27 12:43:56 +0000 | |||
| 368 | +++ setup.py 2010-10-05 15:16:15 +0000 | |||
| 369 | @@ -29,7 +29,7 @@ | |||
| 370 | 29 | packages=['AptUrl','AptUrl.gtk','AptUrl.kde'], | 29 | packages=['AptUrl','AptUrl.gtk','AptUrl.kde'], |
| 371 | 30 | scripts=['apturl','apturl-gtk','apturl-kde'], | 30 | scripts=['apturl','apturl-gtk','apturl-kde'], |
| 372 | 31 | data_files=[('share/apturl/', | 31 | data_files=[('share/apturl/', |
| 374 | 32 | ["data/apturl.glade","data/apturl.ui"]), | 32 | ["data/apturl-gtk.ui","data/apturl-qt.ui"]), |
| 375 | 33 | ('../etc/firefox/pref/', | 33 | ('../etc/firefox/pref/', |
| 376 | 34 | ["data/apturl.js"]), | 34 | ["data/apturl.js"]), |
| 377 | 35 | ('share/kde4/services/', | 35 | ('share/kde4/services/', |
