diff -u blogtk-1.1/debian/changelog blogtk-1.1/debian/changelog --- blogtk-1.1/debian/changelog +++ blogtk-1.1/debian/changelog @@ -1,3 +1,15 @@ +blogtk (1.1-2ubuntu2.9.04) jaunty; urgency=low + + * REGRESSION - BloGTK crashes on startup (LP: #364745) + - debian/patches/fix-deprecated-zzconfig + - Python 2.6 Rev 60976 has deprecated usage of the "Default" section + in ConfigParser + - Updated source to use "Default Server" instead of "Default" + - Patch file has conflict with earlier non numbered patches so prefixed + with "zz" to ensure it is applied last + + -- Ralph Taylor Sun, 21 Jun 2009 14:48:31 +0100 + blogtk (1.1-2ubuntu2) hardy; urgency=low * debian/install: only in patch2: unchanged: --- blogtk-1.1.orig/debian/patches/zz-fix-deprecated-configparser-options.patch +++ blogtk-1.1/debian/patches/zz-fix-deprecated-configparser-options.patch @@ -0,0 +1,145 @@ +diff -Nur -x '*.orig' -x '*~' blogtk-1.1/src/BloGTK.py blogtk-1.1.new/src/BloGTK.py +--- blogtk-1.1/src/BloGTK.py 2009-06-21 14:48:09.265055677 +0100 ++++ blogtk-1.1.new/src/BloGTK.py 2009-06-21 14:48:21.636081631 +0100 +@@ -317,7 +317,7 @@ + self.blogNameLabel = self.mainGlade.get_widget('blogNameLabel') + + if self.blogNameLabel.get_text() == "": +- self.blogNameLabel.set_text("Default") ++ self.blogNameLabel.set_text("Default Server") + else: + pass + +@@ -333,7 +333,7 @@ + + for item in self.sections: + if item == "server": +- self.conf.add_section("Default") ++ self.conf.add_section("Default Server") + self.url = self.conf.get("server", "server") + self.user = self.conf.get("server", "user") + self.passwd = self.conf.get("server", "pass") +@@ -345,11 +345,11 @@ + except ConfigParser.NoOptionError, error: + self.font = "Sans 12" + +- self.conf.set("Default", "server", self.url) +- self.conf.set("Default", "user", self.user) +- self.conf.set("Default", "pass", self.passwd) +- self.conf.set("Default", "system", self.system) +- self.conf.set("Default", "font", self.font) ++ self.conf.set("Default Server", "server", self.url) ++ self.conf.set("Default Server", "user", self.user) ++ self.conf.set("Default Server", "pass", self.passwd) ++ self.conf.set("Default Server", "system", self.system) ++ self.conf.set("Default Server", "font", self.font) + + self.conf.remove_option("server", "server") + self.conf.remove_option("server", "user") +@@ -399,9 +399,9 @@ + # set yet. Therefore we'll now have to set them to their default values. + + try: +- self.useUTF = self.conf.get("Default", "useUTF") +- self.defaultPublish = self.conf.get("Default", "defaultPublish") +- self.retrievalNumber = self.conf.get("Default", "retrievalNumber") ++ self.useUTF = self.conf.get("Default Server", "useUTF") ++ self.defaultPublish = self.conf.get("Default Server", "defaultPublish") ++ self.retrievalNumber = self.conf.get("Default Server", "retrievalNumber") + + if self.defaultPublish == "1": + self.publishCheck.set_active(True) +@@ -412,9 +412,9 @@ + + print "Creating general settings configuration..." + +- self.conf.set("Default", "useUTF", "0") +- self.conf.set("Default", "defaultPublish", "0") +- self.conf.set("Default", "retrievalNumber", "10") ++ self.conf.set("Default Server", "useUTF", "0") ++ self.conf.set("Default Server", "defaultPublish", "0") ++ self.conf.set("Default Server", "retrievalNumber", "10") + conf_file = open(self.configDir + "/BloGTK.conf", 'w+') + self.conf.write(conf_file) + conf_file.close() +diff -Nur -x '*.orig' -x '*~' blogtk-1.1/src/config.py blogtk-1.1.new/src/config.py +--- blogtk-1.1/src/config.py 2009-06-21 14:48:09.233055315 +0100 ++++ blogtk-1.1.new/src/config.py 2009-06-21 14:48:24.085080465 +0100 +@@ -85,18 +85,18 @@ + self.parser = ConfigParser.ConfigParser() + self.file = open(self.configFile, "w") + +- self.parser.add_section("Default") ++ self.parser.add_section("Default Server") + self.parser.write(self.file) + +- self.parser.set("Default", "server", "http://www.yoursite.com/blog/blog.cgi") +- self.parser.set("Default", "user", "username") +- self.parser.set("Default", "pass", "password") +- self.parser.set("Default", "system", "blogger") +- self.parser.set("Default", "font", "Sans 12") ++ self.parser.set("Default Server", "server", "http://www.yoursite.com/blog/blog.cgi") ++ self.parser.set("Default Server", "user", "username") ++ self.parser.set("Default Server", "pass", "password") ++ self.parser.set("Default Server", "system", "blogger") ++ self.parser.set("Default Server", "font", "Sans 12") + +- self.parser.set("Default", "Publish", "FALSE") +- self.parser.set("Default", "useUTF", "0") +- self.parser.set("Default", "retrievalNumber", "10") ++ self.parser.set("Default Server", "Publish", "FALSE") ++ self.parser.set("Default Server", "useUTF", "0") ++ self.parser.set("Default Server", "retrievalNumber", "10") + + self.parser.write(self.file) + self.blogs = self.parser.sections() +@@ -169,9 +169,9 @@ + self.system = self.parser.get(self.section, "system") + + # 0.9 - We need to pull our General Settings from the config as well... +- self.defaultPublish = self.parser.get("Default", "defaultPublish") +- self.useUTF = self.parser.get("Default", "useutf") +- self.retrievalNumber = self.parser.get("Default", "retrievalNumber") ++ self.defaultPublish = self.parser.get("Default Server", "defaultPublish") ++ self.useUTF = self.parser.get("Default Server", "useutf") ++ self.retrievalNumber = self.parser.get("Default Server", "retrievalNumber") + + except ConfigParser.NoSectionError: + pass +@@ -292,22 +292,22 @@ + # 0.9 - Each time we save the form, we want to also save our general settings as well... + + if self.defaultPublishCheck.get_active() == True: +- self.parser.set("Default", "defaultPublish", "1") ++ self.parser.set("Default Server", "defaultPublish", "1") + self.defaultMainCheck.set_active(True) + else: +- self.parser.set("Default", "defaultPublish", "0") ++ self.parser.set("Default Server", "defaultPublish", "0") + self.defaultMainCheck.set_active(False) + + if self.useUTF8Check.get_active() == True: +- self.parser.set("Default", "useUTF", "1") ++ self.parser.set("Default Server", "useUTF", "1") + else: +- self.parser.set("Default", "useUTF", "0") ++ self.parser.set("Default Server", "useUTF", "0") + + number = self.retrievalSpin.get_value() + + num_string = str(number) + +- self.parser.set("Default", "retrievalNumber", num_string) ++ self.parser.set("Default Server", "retrievalNumber", num_string) + + self.writeFile = open(self.configFile, "w") + self.parser.write(self.writeFile) +@@ -325,7 +325,7 @@ + + self.section = self.accountsCombo.entry.get_text() + +- if self.section == "Default": ++ if self.section == "Default Server": + errDialog = gtk.Dialog(title="Error", parent=self.accountsWindow, flags=0) + button2 = gtk.Button(stock=gtk.STOCK_OK) + button2.connect_object("clicked", gtk.Widget.destroy, errDialog)