diff --git a/PKGBUILD b/PKGBUILD index ae35191..7a5d39e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.2.28 +pkgver=2.1.2.29 pkgrel=1 pkgdesc="A basic Python AUR helper/library." arch=('any') @@ -9,7 +9,7 @@ license=('BSD') depends=('python' 'pyalpm>=0.5.1-1' 'python-pyparsing' 'pacman>=4.0.0-1') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('71cc5b2e2ba71e7a4096ded7ecc892e2') +md5sums=('1dda25a99cf570094765201a916fc910') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/README b/README index 2aee09d..a4d7f81 100644 --- a/README +++ b/README @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-10-26 -:Version: 2.1.2.27 +:Date: 2012-07-14 +:Version: 2.1.2.29 PKGBUILDer. A Python AUR helper/library. ========================================= @@ -31,9 +31,6 @@ The -S (DS.pacman) parameter adds pacman wrapper compatibility. For more info, refer to the pkgbuilder(8) man page or HTML docs in docs/html. -Development of the PKGBUILDer is stalled. However, patches are welcome -all the time at GitHub. - COPYRIGHT --------- Copyright (C) 2011, Kwpolska diff --git a/README.rst b/README.rst index 1a59c48..a4d7f81 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2012-07-14 -:Version: 2.1.2.28 +:Version: 2.1.2.29 PKGBUILDer. A Python AUR helper/library. ========================================= @@ -31,9 +31,6 @@ The -S (DS.pacman) parameter adds pacman wrapper compatibility. For more info, refer to the pkgbuilder(8) man page or HTML docs in docs/html. -Development of the PKGBUILDer is stalled. However, patches are welcome -all the time at GitHub. - COPYRIGHT --------- Copyright (C) 2011, Kwpolska diff --git a/Rakefile b/Rakefile index ddf834a..029a403 100644 --- a/Rakefile +++ b/Rakefile @@ -40,8 +40,9 @@ task :prepare, :ver do |t, args| sh "sed \"s/:Date: .*/:Date: #{date}/\" docs/*.rst -i" sh "sed \"s/:Date: .*/:Date: #{date}/\" README.rst -i" - sh "cp README.rst ../README" - sh "cp README.rst ../README.rst" + + sh "cp README.rst README" + sh "cp README.rst docs/README.rst" end task :docshtml do diff --git a/dist/pkgbuilder-2.1.2.29.tar.gz b/dist/pkgbuilder-2.1.2.29.tar.gz new file mode 100644 index 0000000..0ab52e2 Binary files /dev/null and b/dist/pkgbuilder-2.1.2.29.tar.gz differ diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 08b8725..6cf11fd 100644 --- a/docs/LICENSE.rst +++ b/docs/LICENSE.rst @@ -4,7 +4,7 @@ Appendix B. License for PKGBUILDer :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska :Date: 2012-07-14 -:Version: 2.1.2.28 +:Version: 2.1.2.29 Copyright (C) 2011, Kwpolska All rights reserved. diff --git a/docs/README.rst b/docs/README.rst index 1a59c48..a4d7f81 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2012-07-14 -:Version: 2.1.2.28 +:Version: 2.1.2.29 PKGBUILDer. A Python AUR helper/library. ========================================= @@ -31,9 +31,6 @@ The -S (DS.pacman) parameter adds pacman wrapper compatibility. For more info, refer to the pkgbuilder(8) man page or HTML docs in docs/html. -Development of the PKGBUILDer is stalled. However, patches are welcome -all the time at GitHub. - COPYRIGHT --------- Copyright (C) 2011, Kwpolska diff --git a/docs/classes.rst b/docs/classes.rst index 6724e16..82a8b68 100644 --- a/docs/classes.rst +++ b/docs/classes.rst @@ -5,7 +5,7 @@ Classes in PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-07-14 -:Version: 2.1.2.28 +:Version: 2.1.2.29 .. index:: classes .. module:: PKGBUILDer diff --git a/docs/conf.py b/docs/conf.py index 243f9fe..9ce2ac4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.1.2.28' +release = '2.1.2.29' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/index.rst b/docs/index.rst index 62d8d01..0f744ee 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -16,9 +16,6 @@ much as possible. Since version 2.1.0, PKGBUILDer provides modules that can be used in other scripts. -Development of the PKGBUILDer is stalled. However, patches are welcome -all the time at GitHub. - For standalone use, see the :doc:`PKGBUILDer man page `. Reading the appendices (:doc:`README` and :doc:`Message codes `) is also a good idea. diff --git a/docs/messagecodes.rst b/docs/messagecodes.rst index 1a7a4ca..bf95710 100644 --- a/docs/messagecodes.rst +++ b/docs/messagecodes.rst @@ -4,7 +4,7 @@ Appendix A. PKGBUILDer message numbers list :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska :Date: 2012-07-14 -:Version: 2.1.2.28 +:Version: 2.1.2.29 In order to help debugging, messages are numbered. Each message number has four digits: the first one is the diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index 30bccff..14a5cf8 100644 Binary files a/docs/pkgbuilder.8.gz and b/docs/pkgbuilder.8.gz differ diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index 1c2429f..d7cdb7c 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -5,7 +5,7 @@ PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-07-14 -:Version: 2.1.2.28 +:Version: 2.1.2.29 :Manual section: 8 :Manual group: PKGBUILDer manual @@ -25,9 +25,6 @@ much as possible. Since version 2.1.0, PKGBUILDer provides modules that can be used in other scripts. -Development of the PKGBUILDer is stalled. However, patches are welcome -all the time at GitHub. - OPERATIONS ========== diff --git a/locale/en/LC_MESSAGES/pkgbuilder.mo b/locale/en/LC_MESSAGES/pkgbuilder.mo index 4560fa6..e6bae68 100644 Binary files a/locale/en/LC_MESSAGES/pkgbuilder.mo and b/locale/en/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/en/LC_MESSAGES/pkgbuilder.po b/locale/en/LC_MESSAGES/pkgbuilder.po index 019e1dc..15252ac 100644 --- a/locale/en/LC_MESSAGES/pkgbuilder.po +++ b/locale/en/LC_MESSAGES/pkgbuilder.po @@ -13,7 +13,7 @@ msgstr "" "Language-Team: Kwpolska \n" "Language: en\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: pkgbuilder.py:88 @@ -136,8 +136,8 @@ msgid "Gathering data about packages…" msgstr "Gathering data about packages…" #: pkgbuilder.py:763 -msgid "Targets ({0}):" -msgstr "Targets ({0}):" +msgid "Targets ({0}): " +msgstr "Targets ({0}): " #: pkgbuilder.py:765 msgid "{0} upgradeable packages found:" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index 62f96bc..4ee191e 100644 Binary files a/locale/pl/LC_MESSAGES/pkgbuilder.mo and b/locale/pl/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.po b/locale/pl/LC_MESSAGES/pkgbuilder.po index d8306c7..4c0945f 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -14,7 +14,7 @@ msgstr "" "Language-Team: Kwpolska \n" "Language: pl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: pkgbuilder.py:88 @@ -137,8 +137,8 @@ msgid "Gathering data about packages…" msgstr "Zbieranie informacji o pakietach…" #: pkgbuilder.py:763 -msgid "Targets ({0}):" -msgstr "Cele ({0}):" +msgid "Targets ({0}): " +msgstr "Cele ({0}): " #: pkgbuilder.py:765 msgid "{0} upgradeable packages found:" diff --git a/messages.pot b/messages.pot index 3c860d2..cb9f8af 100644 --- a/messages.pot +++ b/messages.pot @@ -14,70 +14,70 @@ msgstr "" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: pkgbuilder.py:88 +#: pkgbuilder.py:89 msgid "[ERR5001] Aborted by user! Exiting…" msgstr "" -#: pkgbuilder.py:181 +#: pkgbuilder.py:182 msgid "WARNING:" msgstr "" -#: pkgbuilder.py:195 +#: pkgbuilder.py:196 msgid "ERROR:" msgstr "" -#: pkgbuilder.py:369 +#: pkgbuilder.py:370 msgid " [installed: {0}]" msgstr "" -#: pkgbuilder.py:371 +#: pkgbuilder.py:372 msgid " [installed]" msgstr "" -#: pkgbuilder.py:374 +#: pkgbuilder.py:375 msgid "[out of date]" msgstr "" -#: pkgbuilder.py:380 pkgbuilder.py:383 +#: pkgbuilder.py:381 pkgbuilder.py:384 msgid "votes" msgstr "" -#: pkgbuilder.py:424 +#: pkgbuilder.py:425 msgid "The build function reported a proper build." msgstr "" -#: pkgbuilder.py:433 +#: pkgbuilder.py:434 msgid "[ERR3451] validation: NOT installed" msgstr "" -#: pkgbuilder.py:437 +#: pkgbuilder.py:438 msgid "[ERR3452] validation: outdated {0}" msgstr "" -#: pkgbuilder.py:440 +#: pkgbuilder.py:441 msgid "[INF3450] validation: installed {0}" msgstr "" -#: pkgbuilder.py:444 +#: pkgbuilder.py:445 msgid "[ERR3301] makepkg returned 1." msgstr "" -#: pkgbuilder.py:449 +#: pkgbuilder.py:450 msgid "[ERR3401] Building more AUR packages is required." msgstr "" -#: pkgbuilder.py:478 +#: pkgbuilder.py:479 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "" -#: pkgbuilder.py:495 +#: pkgbuilder.py:496 msgid "[ERR3151] extract: no files extracted" msgstr "" -#: pkgbuilder.py:583 pkgbuilder.py:645 +#: pkgbuilder.py:584 pkgbuilder.py:645 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "" @@ -137,7 +137,7 @@ msgid "Gathering data about packages…" msgstr "" #: pkgbuilder.py:763 -msgid "Targets ({0}):" +msgid "Targets ({0}): " msgstr "" #: pkgbuilder.py:765 @@ -148,64 +148,64 @@ msgstr "" msgid "there is nothing to do" msgstr "" -#: pkgbuilder.py:778 +#: pkgbuilder.py:776 pkgbuilder.py:780 msgid "Proceed with installation? [Y/n] " msgstr "" -#: pkgbuilder.py:802 -msgid "A python3 AUR helper. Wrapper-friendly (pacman-like output.)" +#: pkgbuilder.py:805 +msgid "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" msgstr "" -#: pkgbuilder.py:803 +#: pkgbuilder.py:806 msgid "You can use pacman syntax if you want to." msgstr "" -#: pkgbuilder.py:809 +#: pkgbuilder.py:812 msgid "packages to build" msgstr "" -#: pkgbuilder.py:814 +#: pkgbuilder.py:817 msgid "don't use colors in output" msgstr "" -#: pkgbuilder.py:817 +#: pkgbuilder.py:820 msgid "don't check dependencies (may break makepkg)" msgstr "" -#: pkgbuilder.py:820 +#: pkgbuilder.py:823 msgid "don't install packages after building" msgstr "" -#: pkgbuilder.py:824 +#: pkgbuilder.py:826 msgid "" "don't check if packages were installed after build" msgstr "" -#: pkgbuilder.py:828 +#: pkgbuilder.py:830 msgid "pacman syntax compatiblity" msgstr "" -#: pkgbuilder.py:830 +#: pkgbuilder.py:832 msgid "pacman syntax compatiblity" msgstr "" -#: pkgbuilder.py:834 +#: pkgbuilder.py:836 msgid "view package information" msgstr "" -#: pkgbuilder.py:836 +#: pkgbuilder.py:838 msgid "search the AUR for matching strings" msgstr "" -#: pkgbuilder.py:840 +#: pkgbuilder.py:842 msgid "upgrade installed AUR packages" msgstr "" -#: pkgbuilder.py:861 +#: pkgbuilder.py:863 msgid "Package {0} not found." msgstr "" -#: pkgbuilder.py:865 +#: pkgbuilder.py:867 msgid "" "Category : {cat}\n" "Name : {nme}\n" @@ -220,86 +220,22 @@ msgid "" "Description : {dsc}\n" msgstr "" -#: pkgbuilder.py:883 +#: pkgbuilder.py:885 msgid "yes" msgstr "" -#: pkgbuilder.py:884 +#: pkgbuilder.py:886 msgid "no" msgstr "" -#: pkgbuilder.py:899 +#: pkgbuilder.py:901 msgid "[ERR5002] search string too short, API limitation" msgstr "" -#: pkgbuilder.py:901 +#: pkgbuilder.py:903 msgid "Searching for exact match…" msgstr "" -#: pkgbuilder.py:904 +#: pkgbuilder.py:906 msgid "not found" msgstr "" - -#: INSTALL.py:53 -msgid "" -"Hello!\n" -"\n" -"PKGBUILDer is now available as an AUR package. It is the suggested\n" -"way of installing PKGBUILDer. This script will download the AUR\n" -"package and install it. If you will have problems, please download\n" -"and compile the package manually.\n" -"\n" -msgstr "" - -#: INSTALL.py:62 -msgid "Hit Enter/Return to continue. " -msgstr "" - -#: INSTALL.py:87 -msgid "" -"\n" -"\n" -"Something went wrong. Please read makepkg's output and try again.\n" -"You can also try to debug the work of this script yourself.\n" -"All the files this script was working on are placed in\n" -" {0}\n" -"(the number is random).\n" -"\n" -"If I am wrong, though, congratulations!\n" -msgstr "" - -#: INSTALL.py:98 -msgid "" -"\n" -"\n" -"Read the above output. If the script had any problems, run it\n" -"again. You can also try to debug the work of this script yourself.\n" -"All the files this script was working on are placed in\n" -" {0}\n" -"(the number is random).\n" -"\n" -"If everything went fine, though, congratulations! You can now use\n" -"PKGBUILDer. For standalone usage, type `pkgbuilder` into the prompt\n" -"(zsh users: hash -r, other shells may need another command). For\n" -"python module usage, type `import pkgbuilder` into the python prompt.\n" -msgstr "" - -#: INSTALL.py:114 -msgid "" -"It looks like you want to quit. Okay then, goodbye.\n" -"No work has been started yet.\n" -"\n" -"If that's what you want to do, go for it. If it isn't, run this\n" -"script again." -msgstr "" - -#: INSTALL.py:120 -msgid "" -"It looks like you want to quit. Okay then, goodbye.\n" -"All the files this script was working on are placed in\n" -" {0}\n" -"(the number is random).\n" -"\n" -"If that's what you want to do, go for it. If it isn't, run this\n" -"script again." -msgstr "" diff --git a/pkgbuilder.py b/pkgbuilder.py index c6e20a8..d2b1754 100755 --- a/pkgbuilder.py +++ b/pkgbuilder.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 -# PKGBUILDer v2.1.2.28 +# -*- encoding: utf-8 -*- +# PKGBUILDer v2.1.2.29 # A Python AUR helper/library. # Copyright (C) 2011-2012, Kwpolska. # All rights reserved. @@ -51,7 +52,7 @@ import gettext import functools -VERSION = '2.1.2.28' +VERSION = '2.1.2.29' T = gettext.translation('pkgbuilder', '/usr/share/locale', fallback='C') _ = T.gettext @@ -759,7 +760,7 @@ def auto_upgrade(self): upgradeable = self.list_upgradeable(foreign.keys()) upglen = len(upgradeable) if DS.pacman: - print(_('Targets ({0}):').format(upglen), end='') + print(_('Targets ({0}): ').format(upglen), end='') else: fancy_msg(_('{0} upgradeable packages found:').format(upglen)) diff --git a/setup.py b/setup.py index 85b3c31..5ddf42d 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.2.28', + version='2.1.2.29', description='An AUR helper (and library) in python3', author='Kwpolska', author_email='kwpolska@kwpolska.tk',