diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/check-and-fix/libka/defaultconfig/defaultrc kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/check-and-fix/libka/defaultconfig/defaultrc --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/check-and-fix/libka/defaultconfig/defaultrc 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/check-and-fix/libka/defaultconfig/defaultrc 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/conf/defaultrc kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/conf/defaultrc --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/conf/defaultrc 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/conf/defaultrc 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/debian/changelog kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/debian/changelog --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/debian/changelog 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/debian/changelog 2022-06-12 18:58:39.000000000 +0000 @@ -1,4 +1,12 @@ -kubuntu-automation (2.5~beta1~ubuntu22.04~ppa4) jammy; urgency=medium +kubuntu-automation (2.5~rc1~ubuntu22.04~ppa1) jammy; urgency=medium + + * Prepare conf/defaultrc for knietic: + - set "ubuntu-unstable-name" to "kinetic" + - set "default-branch" to "kubuntu_kinetic_staging" + + -- José Manuel Santamaría Lema Sun, 12 Jun 2022 20:58:39 +0200 + +kubuntu-automation (2.5~beta1) jammy; urgency=medium * Fix build source failure when applications packages have four numbers (e.g. dolphin 21.12.2.1) diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/debug/libka/defaultconfig/defaultrc kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/debug/libka/defaultconfig/defaultrc --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/debug/libka/defaultconfig/defaultrc 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/debug/libka/defaultconfig/defaultrc 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/etc/kubuntu-automation.conf kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/etc/kubuntu-automation.conf --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/etc/kubuntu-automation.conf 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/etc/kubuntu-automation.conf 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/gbp-plugins/scripts/libka/defaultconfig/defaultrc kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/gbp-plugins/scripts/libka/defaultconfig/defaultrc --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/gbp-plugins/scripts/libka/defaultconfig/defaultrc 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/gbp-plugins/scripts/libka/defaultconfig/defaultrc 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/libka/defaultconfig/defaultrc kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/libka/defaultconfig/defaultrc --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/libka/defaultconfig/defaultrc 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/libka/defaultconfig/defaultrc 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/setup.py kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/setup.py --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/setup.py 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/setup.py 2022-06-12 18:58:39.000000000 +0000 @@ -39,6 +39,26 @@ ]), ] +INSTALL_REQUIRES=[ + 'JSMin', + 'TermColor', + 'Colorama', + 'python-debian', + 'chardet', #needed for python-debian + 'GitPython', + 'LaunchpadLib', + 'Requests', + 'Jinja2', + 'urllib3', + 'certifi', + 'Psycopg2', #needed for tritemio + 'pyyaml', #needed for ExcusesYAMLPaser + 'numcodecs', #needed for ExcusesYAMLPaser + 'Click'] + +# PyGraphviz makes readthedocs.io builds fail at the moment +if not ON_RTD: + INSTALL_REQUIRES.append('PyGraphviz') setup( name='Kubuntu Automation', @@ -123,23 +143,7 @@ 'libka.ironhand', 'libka.excuses', 'libka.utils'], - install_requires=[ - 'JSMin', - 'TermColor', - 'Colorama', - 'python-debian', - 'chardet', #needed for python-debian - 'GitPython', - 'LaunchpadLib', - 'Requests', - 'PyGraphviz', - 'Jinja2', - 'urllib3', - 'certifi', - 'Psycopg2', #needed for tritemio - 'pyyaml', #needed for ExcusesYAMLPaser - 'numcodecs', #needed for ExcusesYAMLPaser - 'Click'], + install_requires=INSTALL_REQUIRES, include_package_data=True, package_data={ 'libka':[ diff -Nru kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/tritemio-build-status/libka/defaultconfig/defaultrc kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/tritemio-build-status/libka/defaultconfig/defaultrc --- kubuntu-automation-2.5~beta1~ubuntu22.04~ppa4/tritemio-build-status/libka/defaultconfig/defaultrc 2022-02-11 23:07:39.000000000 +0000 +++ kubuntu-automation-2.5~rc1~ubuntu22.04~ppa1/tritemio-build-status/libka/defaultconfig/defaultrc 2022-06-12 18:58:39.000000000 +0000 @@ -3,7 +3,7 @@ [global] # Name of Ubuntu unstable version -ubuntu-unstable-name = jammy +ubuntu-unstable-name = kinetic # Package metadata path ka-metatadata-path = ~/ka-metadata # Some KA programs have colored output, set this to off if you want to disable @@ -63,7 +63,7 @@ extra-remotes = git-anon-neon,git-anon-debian clone-this-one-qt = git-ssh-kubuntu # This branch will be the current for newly created clones -default-branch = kubuntu_jammy_staging +default-branch = kubuntu_kinetic_staging default-branch-qt = kubuntu_bionic_backports # Kubuntu remotes git-ssh-kubuntu = git+ssh://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/%(repo)s