j/calcool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix setup/debian build/version

Browse source
This commit is contained in:
j 2025-01-31 19:27:38 +05:30
commit eeee27a08c
10 changed files with 57 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.quickly
View file

@ -1,4 +0,0 @@
project = calcool
template = ubuntu-application
lp_id = calcool
version = 12.06

2
data/ui/AboutCalcoolDialog.ui
View file

@ -7,7 +7,7 @@
<property name="icon">../media/icon.png</property> <property name="icon">../media/icon.png</property>
<property name="type_hint">normal</property> <property name="type_hint">normal</property>
<property name="program_name">Calcool</property> <property name="program_name">Calcool</property>
<property name="version">12.06</property> <property name="version">25.01</property>
<property name="comments" translatable="yes">Calcool allows you to do calculations in a document, <property name="comments" translatable="yes">Calcool allows you to do calculations in a document,
on the right you have the result for each line. on the right you have the result for each line.
If you ever used bc and wanted to edit a previous If you ever used bc and wanted to edit a previous

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
calcool (25.01) unstable; urgency=low
* migreate to debian
-- Jan Gerber <j@mailb.org> Fri, 31 Jan 2025 19:01:32 +0430
calcool (12.06) precise; urgency=low calcool (12.06) precise; urgency=low
* resolved lines in lines * resolved lines in lines

2
debian/compat vendored
View file

@ -1 +1 @@
6 10

19
debian/control vendored
View file

@ -1,21 +1,14 @@
Source: calcool Source: calcool
Maintainer: Jan Gerber <j@mailb.org>
Section: python Section: python
Priority: extra Priority: optional
Build-Depends: cdbs (>= 0.4.43), Build-Depends: python3-all, python3-distutils-extra, debhelper (>= 7.4.3), dh-python
debhelper (>= 6), Standards-Version: 3.9.1
python (>= 2.6.6-3~),
python-distutils-extra (>= 2.10)
Maintainer: j^ <j@mailb.org>
Standards-Version: 3.8.2
XS-Python-Version: current
Package: calcool Package: calcool
Architecture: all Architecture: all
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python3:Versions}
Depends: ${misc:Depends}, Depends: python3, ${misc:Depends}, ${python3:Depends}, gir1.2-gtksource-4
${python:Depends},
python-gtksourceview2,
python-gtk2
Description: A document based calculator tool Description: A document based calculator tool
Calcool allows you to do calculations in a document, on the right you 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 have the result for each line. If you ever used bc and wanted to edit a

9
debian/copyright vendored
View file

@ -1,13 +1,10 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: calcool Name: calcool
Maintainer: j^ <j@mailb.org> Maintainer: Jan Gerber <j@mailb.org>
Source: https://launchpad.net/calcool Source: https://code.0x2620.org/j/calcool
Files: * Files: *
Copyright: (C) 2010 jan gerber <j@mailb.org> Copyright: (C) 2010-2025 Jan Gerber <j@mailb.org>
Copyright: (C) 2010 jan gerber &lt;j@mailb.org&gt;
Copyright: (C) 2010 jan gerber &lt;j@mailb.org&gt;</property>
Copyright: (C) 2010 jan gerber &lt;j@mailb.org&gt;</property><property name="border_width">5</property>
License: GPL-3 License: GPL-3
The full text of the GPL is distributed in The full text of the GPL is distributed in
/usr/share/common-licenses/GPL-3 on Debian systems. /usr/share/common-licenses/GPL-3 on Debian systems.

2
debian/pycompat vendored
View file

@ -1 +1 @@
2 3

9
debian/rules vendored
View file

@ -1,9 +1,4 @@
#!/usr/bin/make -f #!/usr/bin/make -f
%: %:
ifneq ($(shell dh -l | grep -xF translations),) dh $@ --with python3 --buildsystem=pybuild
dh $@ --with python2,translations
else
dh $@ --with python2
endif

9
po/calcool.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,10 +18,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ../data/ui/AboutCalcoolDialog.ui.h:1 #: ../data/ui/AboutCalcoolDialog.ui.h:1
#: ../debian/calcool/usr/share/calcool/ui/AboutCalcoolDialog.ui.h:1
msgid "Copyright (C) 2010 jan gerber <j@mailb.org>" msgid "Copyright (C) 2010 jan gerber <j@mailb.org>"
msgstr "" msgstr ""
#: ../data/ui/AboutCalcoolDialog.ui.h:2 #: ../data/ui/AboutCalcoolDialog.ui.h:2
#: ../debian/calcool/usr/share/calcool/ui/AboutCalcoolDialog.ui.h:2
msgid "" msgid ""
"Calcool allows you to do calculations in a document,\n" "Calcool allows you to do calculations in a document,\n"
"on the right you have the result for each line.\n" "on the right you have the result for each line.\n"
@ -31,6 +33,7 @@ msgid ""
msgstr "" msgstr ""
#: ../data/ui/AboutCalcoolDialog.ui.h:7 #: ../data/ui/AboutCalcoolDialog.ui.h:7
#: ../debian/calcool/usr/share/calcool/ui/AboutCalcoolDialog.ui.h:7
msgid "" msgid ""
"# Copyright (C) 2010 jan gerber <j@mailb.org>\n" "# Copyright (C) 2010 jan gerber <j@mailb.org>\n"
"# This program is free software: you can redistribute it and/or modify it \n" "# This program is free software: you can redistribute it and/or modify it \n"
@ -48,17 +51,21 @@ msgid ""
msgstr "" msgstr ""
#: ../data/ui/CalcoolWindow.ui.h:1 #: ../data/ui/CalcoolWindow.ui.h:1
#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:1
msgid "Calcool" msgid "Calcool"
msgstr "" msgstr ""
#: ../data/ui/CalcoolWindow.ui.h:2 #: ../data/ui/CalcoolWindow.ui.h:2
#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:2
msgid "_File" msgid "_File"
msgstr "" msgstr ""
#: ../data/ui/CalcoolWindow.ui.h:3 #: ../data/ui/CalcoolWindow.ui.h:3
#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:3
msgid "_Edit" msgid "_Edit"
msgstr "" msgstr ""
#: ../data/ui/CalcoolWindow.ui.h:4 #: ../data/ui/CalcoolWindow.ui.h:4
#: ../debian/calcool/usr/share/calcool/ui/CalcoolWindow.ui.h:4
msgid "_Help" msgid "_Help"
msgstr "" msgstr ""

70
setup.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
### BEGIN LICENSE ### BEGIN LICENSE
# Copyright (C) 2010 jan gerber <j@mailb.org> # Copyright (C) 2010 jan gerber <j@mailb.org>
@ -17,12 +17,7 @@
###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ###################### ###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
try: import DistUtilsExtra.auto
import DistUtilsExtra.auto
except ImportError:
import sys
print >> sys.stderr, 'To build calcool you need https://launchpad.net/python-distutils-extra'
sys.exit(1)
assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto >= 2.10' assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto >= 2.10'
import os import os
@ -31,25 +26,21 @@ import os
def update_data_path(prefix, oldvalue=None): def update_data_path(prefix, oldvalue=None):
try: try:
fin = file('calcool/calcoolconfig.py', 'r') with open('calcool/calcoolconfig.py', 'r') as fin:
fout = file(fin.name + '.new', 'w') with open(fin.name + '.new', 'w') as fout:
for line in fin:
for line in fin: fields = line.split(' = ') # Separate variable from value
fields = line.split(' = ') # Separate variable from value if fields[0] == '__calcool_data_directory__':
if fields[0] == '__calcool_data_directory__': # update to prefix, store oldvalue
# update to prefix, store oldvalue if not oldvalue:
if not oldvalue: oldvalue = fields[1]
oldvalue = fields[1] line = "%s = '%s'\n" % (fields[0], prefix)
line = "%s = '%s'\n" % (fields[0], prefix) else: # restore oldvalue
else: # restore oldvalue line = "%s = %s" % (fields[0], oldvalue)
line = "%s = %s" % (fields[0], oldvalue) fout.write(line)
fout.write(line) fout.flush()
fout.flush()
fout.close()
fin.close()
os.rename(fout.name, fin.name) os.rename(fout.name, fin.name)
except (OSError, IOError), e: except (OSError, IOError) as e:
print ("ERROR: Can't find calcool/calcoolconfig.py") print ("ERROR: Can't find calcool/calcoolconfig.py")
sys.exit(1) sys.exit(1)
return oldvalue return oldvalue
@ -58,18 +49,15 @@ def update_data_path(prefix, oldvalue=None):
def update_desktop_file(datadir): def update_desktop_file(datadir):
try: try:
fin = file('calcool.desktop.in', 'r') with open('calcool.desktop.in', 'r') as fin:
fout = file(fin.name + '.new', 'w') with open(fin.name + '.new', 'w') as fout:
for line in fin:
for line in fin: if 'Icon=' in line:
if 'Icon=' in line: line = "Icon=%s\n" % (datadir + 'media/logo.png')
line = "Icon=%s\n" % (datadir + 'media/logo.png') fout.write(line)
fout.write(line) fout.flush()
fout.flush()
fout.close()
fin.close()
os.rename(fout.name, fin.name) os.rename(fout.name, fin.name)
except (OSError, IOError), e: except (OSError, IOError) as e:
print ("ERROR: Can't find calcool.desktop.in") print ("ERROR: Can't find calcool.desktop.in")
sys.exit(1) sys.exit(1)
@ -77,9 +65,9 @@ def update_desktop_file(datadir):
class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
def run(self): def run(self):
if self.root or self.home: 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 " \ "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/') previous_value = update_data_path(self.prefix + '/share/calcool/')
update_desktop_file(self.prefix + '/share/calcool/') update_desktop_file(self.prefix + '/share/calcool/')
DistUtilsExtra.auto.install_auto.run(self) DistUtilsExtra.auto.install_auto.run(self)
@ -93,13 +81,13 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
DistUtilsExtra.auto.setup( DistUtilsExtra.auto.setup(
name='calcool', name='calcool',
version='12.06', version='25.01',
license='GPL-3', license='GPL-3',
author='j^', author='Jan Gerber',
author_email='j@mailb.org', author_email='j@mailb.org',
description='A document based calculator tool', 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.', 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}, cmdclass={'install': InstallAndUpdateDataDirectory},
data_files=[ data_files=[
('share/mime/packages', ['calcool.xml']), ('share/mime/packages', ['calcool.xml']),