makedeb


i3-gaps-git 18447a9b2022.03.28-2


A fork of i3wm tiling window manager (development branch) with more features, including gaps

Click here to go back to the commit logs for i3-gaps-git.

Commit:


Hash: f5f00299d399ec127a676994c3ef4d4f2cf32714

Message: minor fix

Diff


diff --git a/.SRCINFO b/.SRCINFO
index b400d1a..5d904bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,48 +1,73 @@
-generated-by = makedeb-makepkg
-
-pkgbase = i3-gaps-git
-	pkgdesc = A fork of i3wm tiling window manager (development branch) with more features, including gaps
-	pkgver = 81664.20.7.gb154e79d2021.10.22
-	pkgrel = 2
-	url = https://github.com/Airblader/i3/tree/gaps-next
-	arch = i686
-	arch = x86_64
-	license = BSD
-	makedepends = git
-	makedepends = bison
-	makedepends = flex
-	makedepends = asciidoc
-	makedepends = xmlto
-	makedepends = meson
-	makedepends = libxcb-keysyms1-dev
-	makedepends = libpango1.0-dev
-	makedepends = libxcb-util0-dev
-	makedepends = libxcb1-dev
-	makedepends = libxcb-icccm4-dev
-	makedepends = libyajl-dev
-	makedepends = libev-dev
-	makedepends = libxcb-xkb-dev
-	makedepends = libxcb-cursor-dev
-	makedepends = libxkbcommon-dev
-	makedepends = libxcb-xinerama0-dev
-	makedepends = libxkbcommon-x11-dev
-	makedepends = libstartup-notification0-dev
-	makedepends = libxcb-randr0-dev
-	makedepends = libxcb-xrm-dev
-	makedepends = libxcb-shape0-dev
-	depends = meson
-	depends = dh-autoreconf
-	depends = xcb
-	depends = libxcb-xrm0
-	depends = libxcb-shape0
-	optdepends = rxvt-unicode: The terminal emulator used in the default config.
-	optdepends = dmenu: As menu.
-	optdepends = i3lock: For locking your screen.
-	optdepends = i3lock-fancy: For locking your screen.
-	optdepends = i3status: To display system information with a bar.
-	provides = i3-wm
-	conflicts = i3-wm
-	source = git://github.com/Airblader/i3#branch=gaps-next
-	sha512sums = SKIP
-
+generated-by = makedeb
 pkgname = i3-gaps-git
+pkgbase = i3-gaps-git
+pkgdesc = A fork of i3wm tiling window manager (development branch) with more features, including gaps
+pkgrel = 2
+pkgver = 18447a9b2022.03.28
+url = https://github.com/Airblader/i3/tree/gaps-next
+arch = i686
+arch = amd64
+conflicts = i3-wm
+depends = meson
+depends = dh-autoreconf
+depends = xcb
+depends = libxcb-xrm0
+depends = libxcb-shape0
+license = BSD
+makedepends = git
+makedepends = bison
+makedepends = flex
+makedepends = asciidoc
+makedepends = xmlto
+makedepends = meson
+makedepends = libxcb-keysyms1-dev
+makedepends = libpango1.0-dev
+makedepends = libxcb-util0-dev
+makedepends = libxcb1-dev
+makedepends = libxcb-icccm4-dev
+makedepends = libyajl-dev
+makedepends = libev-dev
+makedepends = libxcb-xkb-dev
+makedepends = libxcb-cursor-dev
+makedepends = libxkbcommon-dev
+makedepends = libxcb-xinerama0-dev
+makedepends = libxkbcommon-x11-dev
+makedepends = libstartup-notification0-dev
+makedepends = libxcb-randr0-dev
+makedepends = libxcb-xrm-dev
+makedepends = libxcb-shape0-dev
+optdepends = rxvt-unicode: The terminal emulator used in the default config.
+optdepends = dmenu: As menu.
+optdepends = i3lock: For locking your screen.
+optdepends = i3lock-fancy: For locking your screen.
+optdepends = i3status: To display system information with a bar.
+provides = i3-wm
+source = i3::git+https://github.com/Airblader/i3#branch=gaps-next
+sha512sums = SKIP
+makedepends = git
+makedepends = bison
+makedepends = flex
+makedepends = asciidoc
+makedepends = xmlto
+makedepends = meson
+makedepends = libxcb-keysyms1-dev
+makedepends = libpango1.0-dev
+makedepends = libxcb-util0-dev
+makedepends = libxcb1-dev
+makedepends = libxcb-icccm4-dev
+makedepends = libyajl-dev
+makedepends = libev-dev
+makedepends = libxcb-xkb-dev
+makedepends = libxcb-cursor-dev
+makedepends = libxkbcommon-dev
+makedepends = libxcb-xinerama0-dev
+makedepends = libxkbcommon-x11-dev
+makedepends = libstartup-notification0-dev
+makedepends = libxcb-randr0-dev
+makedepends = libxcb-xrm-dev
+makedepends = libxcb-shape0-dev
+optdepends = rxvt-unicode: The terminal emulator used in the default config.
+optdepends = dmenu: As menu.
+optdepends = i3lock: For locking your screen.
+optdepends = i3lock-fancy: For locking your screen.
+optdepends = i3status: To display system information with a bar.
diff --git a/PKGBUILD b/PKGBUILD
index cd1a71b..ccf761f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: only_vip <onlyme_vip@protonmail.com>
 pkgname=i3-gaps-git
-pkgver=81664.20.7.gb154e79d2021.10.22
+_pkgname=i3
+pkgver=18447a9b2022.03.28
 pkgrel=2
 pkgdesc='A fork of i3wm tiling window manager (development branch) with more features, including gaps'
-arch=('i686' 'x86_64')
+arch=('i686' 'amd64')
 url='https://github.com/Airblader/i3/tree/gaps-next'
 license=('BSD')
 provides=('i3-wm')
@@ -15,15 +16,15 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'i3lock: For locking your screen.'
             'i3lock-fancy: For locking your screen.'
             'i3status: To display system information with a bar.')
-source=('git://github.com/Airblader/i3#branch=gaps-next')
+source=("${_pkgname}::git+https://github.com/Airblader/i3#branch=gaps-next")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/i3"
-    _tag=$(git describe --tags | sed -e 's:-:.:g' -e 's:vNext::') # tag is mobile, and switches between numbers and letters, can't use it for versioning
+    cd "${srcdir}/${_pkgname}"
+    _always=$(git describe --always | sed -e 's:-:.:g' -e 's:vNext::') # always is mobile, and switches between numbers and letters, can't use it for versioning
     _commits=$(git rev-list --count HEAD | sed 's:-:.:g') # total commits is the most sane way of getting incremental pkgver
     _date=$(git log -1 --date=short --pretty=format:%cd)
-    printf "%s%s%s\n" "${_commits}" "${_tag}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
+    printf "%s%s%s\n" "${_commits}" "${_always}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
 }
 
 build() {