diff --git a/.quickly b/.quickly deleted file mode 100644 index 93de0e2..0000000 --- a/.quickly +++ /dev/null @@ -1,4 +0,0 @@ -project = calcool -template = ubuntu-application -lp_id = calcool -version = 12.06 diff --git a/data/ui/AboutCalcoolDialog.ui b/data/ui/AboutCalcoolDialog.ui index 1d7656c..73977d6 100644 --- a/data/ui/AboutCalcoolDialog.ui +++ b/data/ui/AboutCalcoolDialog.ui @@ -7,7 +7,7 @@ ../media/icon.png normal Calcool - 12.06 + 25.01 Calcool allows you to do calculations in a document, on the right you have the result for each line. If you ever used bc and wanted to edit a previous diff --git a/debian/changelog b/debian/changelog index 0be1e0e..f42fde3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calcool (25.01) unstable; urgency=low + + * migreate to debian + + -- Jan Gerber Fri, 31 Jan 2025 19:01:32 +0430 + calcool (12.06) precise; urgency=low * resolved lines in lines diff --git a/debian/compat b/debian/compat index 1e8b314..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +10 diff --git a/debian/control b/debian/control index bb2e48a..b9da5db 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,14 @@ Source: calcool +Maintainer: Jan Gerber Section: python -Priority: extra -Build-Depends: cdbs (>= 0.4.43), - debhelper (>= 6), - python (>= 2.6.6-3~), - python-distutils-extra (>= 2.10) -Maintainer: j^ -Standards-Version: 3.8.2 -XS-Python-Version: current +Priority: optional +Build-Depends: python3-all, python3-distutils-extra, debhelper (>= 7.4.3), dh-python +Standards-Version: 3.9.1 Package: calcool Architecture: all -XB-Python-Version: ${python:Versions} -Depends: ${misc:Depends}, - ${python:Depends}, - python-gtksourceview2, - python-gtk2 +XB-Python-Version: ${python3:Versions} +Depends: python3, ${misc:Depends}, ${python3:Depends}, gir1.2-gtksource-4 Description: A document based calculator tool Calcool allows you to do calculations in a document, on the right you have the result for each line. If you ever used bc and wanted to edit a diff --git a/debian/copyright b/debian/copyright index 9dfe699..251df20 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,10 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Name: calcool -Maintainer: j^ -Source: https://launchpad.net/calcool +Maintainer: Jan Gerber +Source: https://code.0x2620.org/j/calcool Files: * -Copyright: (C) 2010 jan gerber -Copyright: (C) 2010 jan gerber <j@mailb.org> -Copyright: (C) 2010 jan gerber <j@mailb.org> -Copyright: (C) 2010 jan gerber <j@mailb.org>5 +Copyright: (C) 2010-2025 Jan Gerber License: GPL-3 The full text of the GPL is distributed in /usr/share/common-licenses/GPL-3 on Debian systems. diff --git a/debian/pycompat b/debian/pycompat index 0cfbf08..00750ed 100644 --- a/debian/pycompat +++ b/debian/pycompat @@ -1 +1 @@ -2 +3 diff --git a/debian/rules b/debian/rules index 2c0fe5e..641186e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,4 @@ #!/usr/bin/make -f + %: -ifneq ($(shell dh -l | grep -xF translations),) - dh $@ --with python2,translations -else - dh $@ --with python2 -endif - - + dh $@ --with python3 --buildsystem=pybuild diff --git a/po/calcool.pot b/po/calcool.pot index f7f9116..66a01fc 100644 --- a/po/calcool.pot +++ b/po/calcool.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-24 22:20+0200\n" +"POT-Creation-Date: 2025-01-31 19:23+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,10 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../data/ui/AboutCalcoolDialog.ui.h:1 +#: ../debian/calcool/usr/share/calcool/ui/AboutCalcoolDialog.ui.h:1 msgid "Copyright (C) 2010 jan gerber " msgstr "" #: ../data/ui/AboutCalcoolDialog.ui.h:2 +#: ../debian/calcool/usr/share/calcool/ui/AboutCalcoolDialog.ui.h:2 msgid "" "Calcool allows you to do calculations in a document,\n" "on the right you have the result for each line.\n" @@ -31,6 +33,7 @@ msgid "" msgstr "" #: ../data/ui/AboutCalcoolDialog.ui.h:7 +#: ../debian/calcool/usr/share/calcool/ui/AboutCalcoolDialog.ui.h:7 msgid "" "# Copyright (C) 2010 jan gerber \n" "# This program is free software: you can redistribute it and/or modify it \n" @@ -48,17 +51,21 @@ msgid "" msgstr "" #: ../data/ui/CalcoolWindow.ui.h:1 +#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:1 msgid "Calcool" msgstr "" #: ../data/ui/CalcoolWindow.ui.h:2 +#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:2 msgid "_File" msgstr "" #: ../data/ui/CalcoolWindow.ui.h:3 +#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:3 msgid "_Edit" msgstr "" #: ../data/ui/CalcoolWindow.ui.h:4 +#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:4 msgid "_Help" msgstr "" diff --git a/setup.py b/setup.py index 1b8d823..dba02c3 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- ### BEGIN LICENSE # Copyright (C) 2010 jan gerber @@ -17,12 +17,7 @@ ###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ###################### -try: - import DistUtilsExtra.auto -except ImportError: - import sys - print >> sys.stderr, 'To build calcool you need https://launchpad.net/python-distutils-extra' - sys.exit(1) +import DistUtilsExtra.auto assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto >= 2.10' import os @@ -31,25 +26,21 @@ import os def update_data_path(prefix, oldvalue=None): try: - fin = file('calcool/calcoolconfig.py', 'r') - fout = file(fin.name + '.new', 'w') - - for line in fin: - fields = line.split(' = ') # Separate variable from value - if fields[0] == '__calcool_data_directory__': - # update to prefix, store oldvalue - if not oldvalue: - oldvalue = fields[1] - line = "%s = '%s'\n" % (fields[0], prefix) - else: # restore oldvalue - line = "%s = %s" % (fields[0], oldvalue) - fout.write(line) - - fout.flush() - fout.close() - fin.close() + with open('calcool/calcoolconfig.py', 'r') as fin: + with open(fin.name + '.new', 'w') as fout: + for line in fin: + fields = line.split(' = ') # Separate variable from value + if fields[0] == '__calcool_data_directory__': + # update to prefix, store oldvalue + if not oldvalue: + oldvalue = fields[1] + line = "%s = '%s'\n" % (fields[0], prefix) + else: # restore oldvalue + line = "%s = %s" % (fields[0], oldvalue) + fout.write(line) + fout.flush() os.rename(fout.name, fin.name) - except (OSError, IOError), e: + except (OSError, IOError) as e: print ("ERROR: Can't find calcool/calcoolconfig.py") sys.exit(1) return oldvalue @@ -58,18 +49,15 @@ def update_data_path(prefix, oldvalue=None): def update_desktop_file(datadir): try: - fin = file('calcool.desktop.in', 'r') - fout = file(fin.name + '.new', 'w') - - for line in fin: - if 'Icon=' in line: - line = "Icon=%s\n" % (datadir + 'media/logo.png') - fout.write(line) - fout.flush() - fout.close() - fin.close() + with open('calcool.desktop.in', 'r') as fin: + with open(fin.name + '.new', 'w') as fout: + for line in fin: + if 'Icon=' in line: + line = "Icon=%s\n" % (datadir + 'media/logo.png') + fout.write(line) + fout.flush() os.rename(fout.name, fin.name) - except (OSError, IOError), e: + except (OSError, IOError) as e: print ("ERROR: Can't find calcool.desktop.in") sys.exit(1) @@ -77,9 +65,9 @@ def update_desktop_file(datadir): class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): def run(self): if self.root or self.home: - print "WARNING: You don't use a standard --prefix installation, take care that you eventually " \ + print("WARNING: You don't use a standard --prefix installation, take care that you eventually " \ "need to update quickly/quicklyconfig.py file to adjust __quickly_data_directory__. You can " \ - "ignore this warning if you are packaging and uses --prefix." + "ignore this warning if you are packaging and uses --prefix.") previous_value = update_data_path(self.prefix + '/share/calcool/') update_desktop_file(self.prefix + '/share/calcool/') DistUtilsExtra.auto.install_auto.run(self) @@ -93,13 +81,13 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): DistUtilsExtra.auto.setup( name='calcool', - version='12.06', + version='25.01', license='GPL-3', - author='j^', + author='Jan Gerber', author_email='j@mailb.org', description='A document based calculator tool', long_description='Calcool allows you to do calculations in a document, on the right you have the result for each line. If you ever used bc and wanted to edit a previous line or tried to reference the result of line 3, calcool might be what you are looking for.', - url='https://launchpad.net/calcool', + url='https://code.0x2620.org/j/calcool', cmdclass={'install': InstallAndUpdateDataDirectory}, data_files=[ ('share/mime/packages', ['calcool.xml']),