diff --git a/maintenance_scripts/show_recent_history.sh b/maintenance_scripts/show_recent_history.sh index 705cb932f..0856f4236 100755 --- a/maintenance_scripts/show_recent_history.sh +++ b/maintenance_scripts/show_recent_history.sh @@ -2,7 +2,7 @@ filter=cat if [[ "${1:-}" = '-c' ]] ; then - filter="grep -v -i -E -e (typing|typehint|coverage|travis|docker) -e actionless.*(chore|test|style|doc|Revert|Merge)" + filter="grep -v -i -E -e (typing|typehint|coverage|travis|docker) -e actionless.*(chore|test|style|doc|Revert|Merge|readme)" shift fi diff --git a/maintenance_scripts/tag_release.sh b/maintenance_scripts/tag_release.sh index e259ef997..0f933ce68 100755 --- a/maintenance_scripts/tag_release.sh +++ b/maintenance_scripts/tag_release.sh @@ -28,7 +28,7 @@ if [[ $(git status --porcelain 2>/dev/null| grep -c "^ [MD]") -gt 0 ]] ; then answer= fi -./maintenance_scripts/show_recent_history.sh -c +./maintenance_scripts/show_recent_history.sh -c || true echo @@ -50,7 +50,7 @@ echo -n "> " read -r answer echo if [[ "${answer}" = "y" ]] ; then - git commit -am "chore: bump version to ${new_version}" + git commit -am "chore: bump version to ${new_version}" || true git tag -a "${new_version}" git push origin HEAD git push origin "${new_version}" @@ -65,7 +65,7 @@ echo "** Updating AUR dev PKBUILD... **" echo "***************************************" echo ./maintenance_scripts/changelog.sh > "${aur_dev_repo_dir}"/CHANGELOG -cp PKGBUILD "${aur_dev_repo_dir}"/PKGBUILD +cp ./packaging/arch/PKGBUILD "${aur_dev_repo_dir}"/PKGBUILD cd "${aur_dev_repo_dir}" makepkg --printsrcinfo > .SRCINFO diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 76a794800..55dbc2db7 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,8 +2,8 @@ # Upstream URL: https://github.com/themix-project/oomox pkgname=oomox-git -pkgver=1.6.2.1 -pkgrel=2 +pkgver=1.7 +pkgrel=1 pkgdesc="Graphical application for generating different color variations of Oomox(Numix-based), Materia (ex-Flat-Plat) and Arc themes (GTK2, GTK3, Cinnamon, GNOME, Openbox, Xfwm), diff --git a/packaging/flatpak/com.github.themix_project.Oomox.json b/packaging/flatpak/com.github.themix_project.Oomox.json index daa2d9006..3081100fb 100644 --- a/packaging/flatpak/com.github.themix_project.Oomox.json +++ b/packaging/flatpak/com.github.themix_project.Oomox.json @@ -107,7 +107,7 @@ { "type": "git", "url": "https://github.com/themix-project/oomox.git", - "tag": "1.6.2.1" + "tag": "1.7" } ] } diff --git a/packaging/ubuntu/control b/packaging/ubuntu/control index 434a5e575..97889e01f 100644 --- a/packaging/ubuntu/control +++ b/packaging/ubuntu/control @@ -1,5 +1,5 @@ Package: oomox -Version: 1.6.2.1-1~themixproject~zesty +Version: 1.7-1~themixproject~zesty Architecture: all Maintainer: Yauheni Kirylau Depends: python3-gi, libglib2.0-bin, libgdk-pixbuf2.0-dev, libxml2-utils, x11-xserver-utils, gir1.2-gtk-3.0, gir1.2-glib-2.0, gir1.2-pango-1.0, gir1.2-gdkpixbuf-2.0, gtk2-engines, gtk2-engines-murrine, gtk2-engines-pixbuf, bash, bc, sed, grep, parallel, sassc (>=3.4), libsass0 (>=3.4), imagemagick, optipng, librsvg2-bin, inkscape, python3-pillow