I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.
diff -Nru cappuccino-0.5.1/cappuccino cappuccino-0.5.1/cappuccino
--- cappuccino-0.5.1/cappuccino 2023-10-02 22:47:33.000000000 +0200
+++ cappuccino-0.5.1/cappuccino 2006-11-01 01:09:03.000000000 +0100
@@ -1,17 +1,13 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
# -*- python -*-
#
-# Copyright (C) 2000-2016 Christopher R. Gabriel <cgabr...@cgabriel.org>
+# Copyright (C) 2000-2006 Christopher R. Gabriel <cgabr...@cgabriel.org>
#
# 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
# the Free Software Foundation; either version 2 of the License.
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk, GObject, GdkPixbuf
-
-import sys, os, os.path, random
+import sys, gtk, os, gobject, os.path, glob, random
# FIXME: change with something based on the setup script
try:
@@ -19,29 +15,22 @@
PLUGIN_DIR = "./"
except OSError:
PLUGIN_DIR = "/usr/share/cappuccino/"
-
-# text to see if polygen is available
-if not os.access("/usr/games/polygen",os.X_OK):
- print ("Error: polygen must be installed")
- print ("See http://www.polygen.org";)
- sys.exit(1)
-
+
# to be discussed
pipe_command = 'polygen %s' % os.path.join(PLUGIN_DIR, 'cappuccino.grm')
-class CappuccinoSplash(Gtk.Window):
+class CappuccinoSplash(gtk.Window):
def __init__(self):
- Gtk.Window.__init__(self)
- image = Gtk.Image()
- pixbuf =
GdkPixbuf.Pixbuf.new_from_file(os.path.join(PLUGIN_DIR,\
- 'cappuccino.jpg'))
+ gtk.Window.__init__(self)
+ image = gtk.Image()
+ pixbuf =
gtk.gdk.pixbuf_new_from_file(os.path.join(PLUGIN_DIR,'cappuccino.jpg'))
image.set_from_pixbuf(pixbuf)
self.add(image)
-
-
-class Cappuccino(Gtk.Window):
+
+
+class Cappuccino(gtk.Window):
def __init__(self,title,speed=400):
- Gtk.Window.__init__(self)
+ gtk.Window.__init__(self)
# our data
self.cur_position = 0.0
self.speed = speed
@@ -53,26 +42,25 @@
self.set_title = title
#window's widgets
- self.w_vbox = Gtk.VBox()
+ self.w_vbox = gtk.VBox()
-
- self.w_label = Gtk.Label()
+
+ self.w_label = gtk.Label()
self.w_vbox.pack_start(self.w_label,True,True,40)
- self.w_scroll = Gtk.ScrolledWindow()
- self.w_scroll.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
- self.w_scroll.set_policy(Gtk.PolicyType.AUTOMATIC,
Gtk.PolicyType.AUTOMATIC)
+ self.w_scroll = gtk.ScrolledWindow()
+ self.w_scroll.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+ self.w_scroll.set_policy(gtk.POLICY_AUTOMATIC,
gtk.POLICY_AUTOMATIC)
self.w_vbox.pack_start(self.w_scroll, True, True,100)
-
- self.w_text = Gtk.TextView()
+
+ self.w_text = gtk.TextView()
self.w_text.set_editable(False)
self.w_scroll.add(self.w_text)
+
+ self.w_align = gtk.Alignment(0.5,0.5,0.5,0.0)
+ self.w_vbox.pack_start(self.w_align, True, True)
- self.w_align = Gtk.Alignment()
- self.w_align.set(0.5,0.5,0.5,0.0)
- self.w_vbox.pack_start(self.w_align, True, True, 0)
-
- self.progressbar = Gtk.ProgressBar()
+ self.progressbar = gtk.ProgressBar()
# the bar is reset upon startup
self.progressbar.set_fraction(0.0)
self.w_align.add(self.progressbar)
@@ -81,9 +69,9 @@
self.get_log_data()
self.add(self.w_vbox)
# timeout that starts it all
- self.timeouter = GObject.timeout_add(self.speed, self.update)
- self.log_timeouter = GObject.timeout_add(1000, self.update_log)
-
+ self.timeouter = gobject.timeout_add(self.speed, self.update)
+ self.log_timeouter = gobject.timeout_add(1000, self.update_log)
+
# event handling. Add some key press events handlers!!
self.connect("delete_event", self.delete_handler)
self.connect("destroy_event", self.delete_handler)
@@ -91,15 +79,15 @@
def delete_handler(self,obj,param):
# remove the timeout upon delete or destroy event!
- GObject.source_remove(self.timeouter)
+ gobject.source_remove(self.timeouter)
def get_log_data(self):
p = os.popen("polygen -X 50 %s" %
os.path.join(PLUGIN_DIR,"compileline.grm"))
self.log = p.readlines()
p.close()
-
+
def update_log(self):
-
+
# do the log!
if len(self.log) < 1:
self.get_log_data()
@@ -107,15 +95,15 @@
buf.insert_at_cursor(self.log.pop())
self.w_text.set_buffer(buf)
ha = self.w_scroll.get_vadjustment()
- ha.set_value(ha.get_upper())
+ ha.set_value(ha.upper)
self.w_scroll.set_vadjustment(ha)
return True
-
+
def update(self):
-
+
self.cur_position += random.random() / 5.0
-
+
if self.cur_position > 1.2:
self.cur_position = 0.0
self.current_message = self.new_phrase()
@@ -136,14 +124,17 @@
def startup(par):
par.destroy()
app = Cappuccino(sys.argv[0])
- app.connect("delete_event", Gtk.main_quit)
- app.connect("destroy_event", Gtk.main_quit)
+ app.connect("delete_event", gtk.main_quit)
+ app.connect("destroy_event", gtk.main_quit)
app.show_all()
-
-
+
+
if __name__ == "__main__":
- Gtk.init_check()
splash = CappuccinoSplash()
splash.show_all()
- t = GObject.timeout_add(3000, startup, splash)
- Gtk.main()
+ t = gobject.timeout_add(3000, startup, splash)
+ gtk.main()
+
+
+
+
diff -Nru cappuccino-0.5.1/debian/changelog cappuccino-0.5.1/debian/changelog
--- cappuccino-0.5.1/debian/changelog 2023-10-02 22:47:33.000000000 +0200
+++ cappuccino-0.5.1/debian/changelog 2023-10-02 22:40:34.000000000 +0200
@@ -1,3 +1,10 @@
+cappuccino (0.5.1-10.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format. Closes: #1043080
+
+ -- Bastian Germann <b...@debian.org> Mon, 02 Oct 2023 22:40:34 +0200
+
cappuccino (0.5.1-10.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru cappuccino-0.5.1/debian/copyright cappuccino-0.5.1/debian/copyright
--- cappuccino-0.5.1/debian/copyright 2006-11-01 01:09:01.000000000 +0100
+++ cappuccino-0.5.1/debian/copyright 2023-10-02 22:40:34.000000000 +0200
@@ -5,7 +5,7 @@
Upstream Author: Christopher R. Gabriel <cgabr...@cgabriel.org>
-Copyright: (c) 2000-2006 Christopher R. Gabriel
+Copyright: (c) 2000-2016 Christopher R. Gabriel
Its license is GPLv2, which, on debian systems, is available at:
/usr/share/common-licenses/GPL.
diff -Nru cappuccino-0.5.1/debian/patches/debian.patch
cappuccino-0.5.1/debian/patches/debian.patch
--- cappuccino-0.5.1/debian/patches/debian.patch 1970-01-01
01:00:00.000000000 +0100
+++ cappuccino-0.5.1/debian/patches/debian.patch 2023-10-02
22:40:34.000000000 +0200
@@ -0,0 +1,177 @@
+--- cappuccino-0.5.1.orig/cappuccino
++++ cappuccino-0.5.1/cappuccino
+@@ -1,13 +1,17 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- python -*-
+ #
+ # Copyright (C) 2000-2006 Christopher R. Gabriel <cgabr...@cgabriel.org>
+ #
+ # 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
+ # the Free Software Foundation; either version 2 of the License.
+
+-import sys, gtk, os, gobject, os.path, glob, random
++import gi
++gi.require_version('Gtk', '3.0')
++from gi.repository import Gtk, GObject, GdkPixbuf
++
++import sys, os, os.path, random
+
+ # FIXME: change with something based on the setup script
+ try:
+@@ -15,22 +19,29 @@ try:
+ PLUGIN_DIR = "./"
+ except OSError:
+ PLUGIN_DIR = "/usr/share/cappuccino/"
+-
++
++# text to see if polygen is available
++if not os.access("/usr/games/polygen",os.X_OK):
++ print ("Error: polygen must be installed")
++ print ("See http://www.polygen.org";)
++ sys.exit(1)
++
+ # to be discussed
+ pipe_command = 'polygen %s' % os.path.join(PLUGIN_DIR, 'cappuccino.grm')
+
+-class CappuccinoSplash(gtk.Window):
++class CappuccinoSplash(Gtk.Window):
+ def __init__(self):
+- gtk.Window.__init__(self)
+- image = gtk.Image()
+- pixbuf =
gtk.gdk.pixbuf_new_from_file(os.path.join(PLUGIN_DIR,'cappuccino.jpg'))
++ Gtk.Window.__init__(self)
++ image = Gtk.Image()
++ pixbuf =
GdkPixbuf.Pixbuf.new_from_file(os.path.join(PLUGIN_DIR,\
++ 'cappuccino.jpg'))
+ image.set_from_pixbuf(pixbuf)
+ self.add(image)
+-
+-
+-class Cappuccino(gtk.Window):
++
++
++class Cappuccino(Gtk.Window):
+ def __init__(self,title,speed=400):
+- gtk.Window.__init__(self)
++ Gtk.Window.__init__(self)
+ # our data
+ self.cur_position = 0.0
+ self.speed = speed
+@@ -42,25 +53,26 @@ class Cappuccino(gtk.Window):
+ self.set_title = title
+
+ #window's widgets
+- self.w_vbox = gtk.VBox()
++ self.w_vbox = Gtk.VBox()
+
+-
+- self.w_label = gtk.Label()
++
++ self.w_label = Gtk.Label()
+ self.w_vbox.pack_start(self.w_label,True,True,40)
+
+- self.w_scroll = gtk.ScrolledWindow()
+- self.w_scroll.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+- self.w_scroll.set_policy(gtk.POLICY_AUTOMATIC,
gtk.POLICY_AUTOMATIC)
++ self.w_scroll = Gtk.ScrolledWindow()
++ self.w_scroll.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
++ self.w_scroll.set_policy(Gtk.PolicyType.AUTOMATIC,
Gtk.PolicyType.AUTOMATIC)
+ self.w_vbox.pack_start(self.w_scroll, True, True,100)
+-
+- self.w_text = gtk.TextView()
++
++ self.w_text = Gtk.TextView()
+ self.w_text.set_editable(False)
+ self.w_scroll.add(self.w_text)
+-
+- self.w_align = gtk.Alignment(0.5,0.5,0.5,0.0)
+- self.w_vbox.pack_start(self.w_align, True, True)
+
+- self.progressbar = gtk.ProgressBar()
++ self.w_align = Gtk.Alignment()
++ self.w_align.set(0.5,0.5,0.5,0.0)
++ self.w_vbox.pack_start(self.w_align, True, True, 0)
++
++ self.progressbar = Gtk.ProgressBar()
+ # the bar is reset upon startup
+ self.progressbar.set_fraction(0.0)
+ self.w_align.add(self.progressbar)
+@@ -69,9 +81,9 @@ class Cappuccino(gtk.Window):
+ self.get_log_data()
+ self.add(self.w_vbox)
+ # timeout that starts it all
+- self.timeouter = gobject.timeout_add(self.speed, self.update)
+- self.log_timeouter = gobject.timeout_add(1000, self.update_log)
+-
++ self.timeouter = GObject.timeout_add(self.speed, self.update)
++ self.log_timeouter = GObject.timeout_add(1000, self.update_log)
++
+ # event handling. Add some key press events handlers!!
+ self.connect("delete_event", self.delete_handler)
+ self.connect("destroy_event", self.delete_handler)
+@@ -79,15 +91,15 @@ class Cappuccino(gtk.Window):
+
+ def delete_handler(self,obj,param):
+ # remove the timeout upon delete or destroy event!
+- gobject.source_remove(self.timeouter)
++ GObject.source_remove(self.timeouter)
+
+ def get_log_data(self):
+ p = os.popen("polygen -X 50 %s" %
os.path.join(PLUGIN_DIR,"compileline.grm"))
+ self.log = p.readlines()
+ p.close()
+-
++
+ def update_log(self):
+-
++
+ # do the log!
+ if len(self.log) < 1:
+ self.get_log_data()
+@@ -95,15 +107,15 @@ class Cappuccino(gtk.Window):
+ buf.insert_at_cursor(self.log.pop())
+ self.w_text.set_buffer(buf)
+ ha = self.w_scroll.get_vadjustment()
+- ha.set_value(ha.upper)
++ ha.set_value(ha.get_upper())
+ self.w_scroll.set_vadjustment(ha)
+ return True
+-
++
+ def update(self):
+-
++
+ self.cur_position += random.random() / 5.0
+
+-
++
+ if self.cur_position > 1.2:
+ self.cur_position = 0.0
+ self.current_message = self.new_phrase()
+@@ -124,17 +136,14 @@ class Cappuccino(gtk.Window):
+ def startup(par):
+ par.destroy()
+ app = Cappuccino(sys.argv[0])
+- app.connect("delete_event", gtk.main_quit)
+- app.connect("destroy_event", gtk.main_quit)
++ app.connect("delete_event", Gtk.main_quit)
++ app.connect("destroy_event", Gtk.main_quit)
+ app.show_all()
+-
+-
++
++
+ if __name__ == "__main__":
++ Gtk.init_check()
+ splash = CappuccinoSplash()
+ splash.show_all()
+- t = gobject.timeout_add(3000, startup, splash)
+- gtk.main()
+-
+-
+-
+-
++ t = GObject.timeout_add(3000, startup, splash)
++ Gtk.main()
diff -Nru cappuccino-0.5.1/debian/patches/series
cappuccino-0.5.1/debian/patches/series
--- cappuccino-0.5.1/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ cappuccino-0.5.1/debian/patches/series 2023-10-02 22:40:34.000000000
+0200
@@ -0,0 +1 @@
+debian.patch
diff -Nru cappuccino-0.5.1/debian/source/format
cappuccino-0.5.1/debian/source/format
--- cappuccino-0.5.1/debian/source/format 1970-01-01 01:00:00.000000000
+0100
+++ cappuccino-0.5.1/debian/source/format 2023-10-02 22:40:34.000000000
+0200
@@ -0,0 +1 @@
+3.0 (quilt)
