debian/changelog

@@ -1,10 +1,3 @@
-lubuntu-update-notifier (0.5) lunar; urgency=medium
-
-  * Add a frontend for config-file-conflict.
-  * Update Standards-version to 4.6.1, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 07 Dec 2022 13:26:39 -0600
-
 lubuntu-update-notifier (0.4) hirsute; urgency=medium
 
   * Added internationalization support.

debian/control

@@ -2,13 +2,13 @@ Source: lubuntu-update-notifier
 Section: admin
 Priority: optional
 Maintainer: Hans P Möller <hmollercl@lubuntu.me>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (=13),
                dh-python,
                gettext,
                python3-all,
                python3-apt,
                python3-setuptools
-Standards-Version: 4.6.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Testsuite: autopkgtest-pkg-python
 

debian/copyright

@@ -2,9 +2,8 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://phab.lubuntu.me/source/lubuntu-update-notifier/
 
 Files: *
-Copyright: 2019-2022 Lubuntu Team <lubuntu-devel@lists.ubuntu.com>
+Copyright: © 2019 Lubuntu Team.
-           2019 Hans P Möller <hmollercl@lubuntu.me>
+           © 2019 Hans P Möller <hmollercl@lubuntu.me>
-           2022 Simon Quigley <tsimonq2@lubuntu.me>
 License: GPL-3+
 
 License: GPL-3+

lubuntu-upgrader

@@ -2,7 +2,6 @@
 # coding=utf-8
 
 # Copyright (C) 2019 Hans P. Möller <hmollercl@lubuntu.me>
-# Copyright (C) 2022 Simon Quigley <tsimonq2@lubuntu.me>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -313,29 +312,6 @@ class DialogUpg(QWidget):
             # print("PTY:" + str(self.slave))
             print("Status Details:" + details)
 
-    def config_file_conflict(self, transaction, cur, new):
-        title = "Conflicting Configuration"
-        text = "Updating the system will result in the following file being "
-        text += "overwritten: " + cur + "\n\nWhat would you like to do?"
-        query = QMessageBox()
-        query.setWindowTitle(title)
-        query.setText(text)
-        query.setIcon(QMessageBox.Question)
-        query.setStandardButtons(QMessageBox.Yes|QMessageBox.No)
-        yes = query.button(QMessageBox.Yes)
-        yes.setText("Overwrite")
-        no = query.button(QMessageBox.No)
-        no.setText("Keep Existing")
-        query.setDefaultButton(no)
-        query.exec_()
-
-        if query.clickedButton() == yes:
-            answer = "replace"
-        elif query.clickedButton() == no:
-            answer = "keep"
-
-        self.trans2.resolve_config_file_conflict(config=cur, answer=answer)
-
     def upgrade(self):
         '''runs upgrade'''
         try:
@@ -351,8 +327,6 @@ class DialogUpg(QWidget):
             self.trans2.connect("status-details-changed",
                                 self.status_details_changed)
             self.trans2.connect("status-changed", self.status_changed)
-            self.trans2.connect("config-file-conflict",
-                                self.config_file_conflict)
 
             # TODO make a terminal work to see more info
             # self.trans2.set_terminal(os.ttyname(self.slave))
@@ -360,6 +334,8 @@ class DialogUpg(QWidget):
             '''
             # TODO implement this
             self.trans2.connect("medium-required", self._on_medium_required)
+            self.trans2.connect("config-file-conflict",
+                                self._on_config_file_conflict)
             remove_obsoleted_depends
             '''
             self.trans2.set_debconf_frontend('kde')