Merge lp:lubuntu-software-center/stable into lp:lubuntu-software-center

Proposed by MiKRo.MiCsoftware.Com
Status: Needs review
Proposed branch: lp:lubuntu-software-center/stable
Merge into: lp:lubuntu-software-center
Diff against target: 84 lines (+29/-3) (has conflicts)
2 files modified
Makefile.am (+1/-3)
src/main.py (+28/-0)
Text conflict in src/main.py
To merge this branch: bzr merge lp:lubuntu-software-center/stable
Reviewer Review Type Date Requested Status
Walter Lapchynski Disapprove
Review via email: mp+373707@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Walter Lapchynski (wxl) wrote :

As the project has been abandoned by its developers and dropped by Lubuntu, I see no value to this at all. Furthermore, the only version in the Ubuntu archives is in Xenial which is unsupported by Lubuntu as well as every other flavor.

review: Disapprove

Unmerged revisions

124. By Stephen Smally

refixed build

123. By Stephen Smally

fixed build

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2015-02-22 02:43:13 +0000
3+++ Makefile.am 2019-10-06 04:37:36 +0000
4@@ -39,9 +39,7 @@
5
6 lscdatadir = $(datadir)/LSC
7 lscdata_DATA = \
8- data/categories.ini \
9- data/lsc.ui \
10- data/preferences.ui
11+ data/categories.ini
12
13 icon16dir = $(datadir)/icons/hicolor/16x16/apps
14 icon16_DATA = data/icons/16x16/light-software-center.png
15
16=== modified file 'src/main.py'
17--- src/main.py 2015-12-28 22:26:36 +0000
18+++ src/main.py 2019-10-06 04:37:36 +0000
19@@ -581,6 +581,7 @@
20 else:
21 inst = False
22 self.setup_infos(
23+<<<<<<< TREE
24 self.pkg_selected[0],
25 self.ui.pages,
26 self.pkg_selected[2],
27@@ -593,6 +594,18 @@
28 self.candidate.ver_str,
29 self.ui.pages.get_current_page(),
30 inst
31+=======
32+ self.pkg_selected[0],
33+ self.ui.pages,
34+ self.pkg_selected[2],
35+ u"\n".join([self.pkg_selected[1].split("\n")[0], threadingops.getshortdesc(self.pkg_selected[0])]),
36+ threadingops.getdesc(self.pkg_selected[0]).replace("\n ", "\n"),
37+ (apt_pkg.size_to_str(self.candidate.size),
38+ apt_pkg.size_to_str(self.candidate.installed_size)),
39+ self.candidate.ver_str,
40+ self.ui.pages.get_current_page(),
41+ inst
42+>>>>>>> MERGE-SOURCE
43 )
44
45 def app_item_activated(self, widget, path, column, inst_rem):
46@@ -674,6 +687,7 @@
47 description_formatted = description_formatted.replace(
48 title.split("\n")[-1], "")
49 self.ui.appsinfo.desctext.set_text(description_formatted.strip())
50+<<<<<<< TREE
51 self.ui.appsinfo.details.to_download.set_markup(
52 "<b>" + _("Download Size:") + "</b>" + " %s" % size[0])
53 self.ui.appsinfo.details.installed.set_markup(
54@@ -684,6 +698,13 @@
55 "stock_help", Gtk.IconSize.LARGE_TOOLBAR)
56 self.ui.categorie_label.set_text(_(
57 "Info on") + " %s" % title.split("\n")[0])
58+=======
59+ self.ui.appsinfo.details.to_download.set_markup("<b>"+_("Download Size:")+"</b>"+" %s" % size[0])
60+ self.ui.appsinfo.details.installed.set_markup("<b>"+_("Installed Size:")+"</b>"+" %s" % size[1])
61+ self.ui.appsinfo.details.version.set_markup("<b>"+_("Version:")+"</b>"+" %s (%s)" % (version, name))
62+ self.ui.categorie_icon.set_from_icon_name("stock_help", Gtk.IconSize.LARGE_TOOLBAR)
63+ self.ui.categorie_label.set_text(_("Infos about")+u" %s" % title.split("\n")[0])
64+>>>>>>> MERGE-SOURCE
65 self.ui.appsinfo.scrot_button.set_visible(False)
66 if control.controller.show_scrot:
67 threadingops.download_screenshot(
68@@ -773,9 +794,16 @@
69 status_dict[self.pkg_in_cache.current_state],
70 ]
71 model.append(self.item)
72+<<<<<<< TREE
73 self.ui.progressbar.set_fraction(float(cur) / float(tot))
74 except KeyError:
75 pass
76+=======
77+ self.ui.progressbar.set_fraction(float(cur)/float(tot))
78+ while Gtk.events_pending():
79+ Gtk.main_iteration()
80+ except KeyError: pass
81+>>>>>>> MERGE-SOURCE
82
83
84 def lscmain():

Subscribers

People subscribed via source and target branches