Reworked: overlay-scrollbar-bzr is no longer a metapackage, but a config package for both gtk3 and gtk2 versions

4 files changed, 43 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 781e26bb9d6e..eba25e3314b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 # Generated by mksrcinfo v8
-# Sun Oct 23 12:20:19 UTC 2016
+# Mon Jul 17 17:40:25 UTC 2017
 pkgbase = overlay-scrollbar-bzr
 	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate.
 	pkgver = r391
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launchpad.net/ayatana-scrollbar
 	arch = i686
 	arch = x86_64
 	groups = unity
 	license = LGPL
-	makedepends = gtk3
 	options = !emptydirs
 	source = bzr+lp:overlay-scrollbar#revision=391
 	sha512sums = SKIP
@@ -18,16 +17,28 @@ pkgname = overlay-scrollbar-bzr
 	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate.Configuration and metapackage
 	install = overlay-scrollbar.install
 	depends = dconf
-	depends = liboverlay-scrollbar-gtk2
-	depends = liboverlay-scrollbar-gtk3
 	provides = overlay-scrollbar=r391
 	provides = overlay-scrollbar-bzr=r391
 	conflicts = overlay-scrollbar
 
+pkgname = liboverlay-scrollbar-gtk2-bzr
+	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate. gtk2
+	install = overlay-scrollbar.install
+	depends = gtk2-ubuntu
+	depends = overlay-scrollbar-bzr
+	provides = liboverlay-scrollbar=r391
+	provides = liboverlay-scrollbar-bzr=r391
+	provides = liboverlay-scrollbar-gtk2=r391
+	provides = liboverlay-scrollbar-gtk2-bzr=r391
+	conflicts = liboverlay-scrollbar
+
 pkgname = liboverlay-scrollbar-gtk3-bzr
 	pkgdesc = Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate. gtk3
+	install = overlay-scrollbar.install
 	depends = cairo
 	depends = gtk3
+	depends = dconf
+	depends = overlay-scrollbar-bzr
 	provides = liboverlay-scrollbar3=r391
 	provides = liboverlay-scrollbar3-bzr=r391
 	provides = liboverlay-scrollbar-gtk3=r391
diff --git a/.gitignore b/.gitignore
index 2690c2483abc..72e8ffc0db8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,57 +1 @@
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
- 
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.xz
-
-# Archlinux Packaging #
-#######################
-*.tar
-*.tar.*
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-pkg/
-src/
- 
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
- 
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-*~
-
-# Particulars #
-###############
-overlay-scrollbar/
-PKGBUILD.gtk2
-PKGBUILD.gtk3
+*
diff --git a/PKGBUILD b/PKGBUILD
index 6df6e83f37a8..e9b3b9d829a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,20 @@
 # Maintainer: quequotion <quequotion@bugmenot.com>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
-pkgname=({overlay-scrollbar,liboverlay-scrollbar-gtk3}-bzr)
+pkgname=({overlay-scrollbar,liboverlay-scrollbar-gtk{2,3}}-bzr)
 pkgbase=overlay-scrollbar-bzr
 pkgver=r391
-pkgrel=1
+pkgrel=2
 pkgdesc="Ayatana Scrollbars, pointer-triggered overlay scrollbars to save screen real-estate."
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ayatana-scrollbar"
 license=('LGPL')
 groups=('unity')
-makedepends=('gtk3')
 options=('!emptydirs')
 extrafiles=('overlay-scrollbar.install')
 source=('bzr+lp:overlay-scrollbar#revision=391')
 sha512sums=('SKIP')
 
-
 pkgver() {
   cd overlay-scrollbar
 
@@ -27,48 +25,43 @@ build() {
   cd "${srcdir}/overlay-scrollbar"
 
   autoreconf -vfi
-
   [[ -d ../build-gtk3 ]] || mkdir ../build-gtk3
   pushd ../build-gtk3
   ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --with-gtk=3 --disable-static
   make
   popd
 
-#  bzr update
-#  autoreconf -vfi
-
-#  [[ -d ../build-gtk2 ]] || mkdir ../build-gtk2
-#  pushd ../build-gtk2
-#  ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --disable-static
-#  make
-#  popd
+  [[ -d ../build-gtk2 ]] || mkdir ../build-gtk2
+  pushd ../build-gtk2
+  ../overlay-scrollbar/configure --prefix=/usr --sysconfdir=/etc --with-gtk=2 --disable-static
+  make
+  popd
 
 }
 
 package_overlay-scrollbar-bzr() {
   pkgdesc+="Configuration and metapackage"
-  depends=('dconf' liboverlay-scrollbar-gtk{2,3})
+  depends=('dconf')
   provides=(overlay-scrollbar{,-bzr}="${pkgver}")
   conflicts=(overlay-scrollbar)
   install=overlay-scrollbar.install
 
   cd "${srcdir}/build-gtk3/"
   make DESTDIR="${pkgdir}/" install
-
-  rm -rvf "${pkgdir}/usr/lib/"
-
-  # Put X11 startup script in correct directory
   install -dm755 "${pkgdir}/etc/X11/xinit/xinitrc.d/"
-  mv "${pkgdir}/etc/X11/Xsession.d/81overlay-scrollbar" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+  mv "${pkgdir}"/etc/X11/{Xsession.d/81overlay-scrollbar,xinit/xinitrc.d/}
   chmod 755 "${pkgdir}/etc/X11/xinit/xinitrc.d/81overlay-scrollbar"
+
+  rm -rvf "${pkgdir}/usr/lib/"
 }
 
 package_liboverlay-scrollbar-gtk3-bzr() {
   pkgdesc+=" gtk3"
-  depends=('cairo' 'gtk3')
+  depends=('cairo' 'gtk3' 'dconf' 'overlay-scrollbar-bzr')
+  makedepends=('gtk3')
   provides=(liboverlay-scrollbar{3,-gtk3}{,-bzr}="${pkgver}")
   conflicts=('liboverlay-scrollbar3')
+  install=overlay-scrollbar.install
 
   cd "${srcdir}/build-gtk3/"
   make DESTDIR="${pkgdir}/" install
@@ -77,16 +70,18 @@ package_liboverlay-scrollbar-gtk3-bzr() {
   rm -rvf "${pkgdir}/usr/share/glib-2.0/"
 }
 
-#package_liboverlay-scrollbar-bzr() {
-#  pkgdesc+=" gtk2"
-#  depends=('gtk2-ubuntu')
-#  provides=(liboverlay-scrollbar{,-gtk2}{,-bzr}="${pkgver}")
-#  conflicts=('liboverlay-scrollbar')
+package_liboverlay-scrollbar-gtk2-bzr() {
+  pkgdesc+=" gtk2"
+  depends=('gtk2-ubuntu' 'overlay-scrollbar-bzr')
+  makedepends=('gtk2-ubuntu')
+  provides=(liboverlay-scrollbar{,-gtk2}{,-bzr}="${pkgver}")
+  conflicts=('liboverlay-scrollbar')
+  install=overlay-scrollbar.install
 
-#  cd "${srcdir}/build-gtk2/"
-#  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/build-gtk2/"
+  make DESTDIR="${pkgdir}/" install
 
-#  rm -rvf "${pkgdir}/etc/"
-#  rm -rvf "${pkgdir}/usr/share/glib-2.0/"
-#}
+  rm -rvf "${pkgdir}/etc/"
+  rm -rvf "${pkgdir}/usr/share/glib-2.0/"
+}
 
diff --git a/compare_versions.sh b/compare_versions.sh
deleted file mode 100755
index 1795729e393d..000000000000
--- a/compare_versions.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-source "$(dirname ${0})/PKGBUILD"
-source "$(dirname ${0})/../version_checker.sh"
-
-echo -e "PKGBUILD version: ${_actual_ver}${_extra_ver} ${_ubuntu_rel}"
-echo -e "Upstream version: $(get_launchpad_version ${pkgbase})"
-echo -e "Ubuntu version:   $(get_ubuntu_version ${pkgbase} ${1:-trusty})"