Update to 16.3

4 files changed, 100 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc3c472ebaf3..2a80a82779fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
+# Generated by mksrcinfo v8
+# Mon Jun 20 16:24:04 UTC 2016
 pkgbase = timeshift
 	pkgdesc = A system restore utility for Linux
-	pkgver = 1.7.6~184
+	pkgver = 16.3
 	pkgrel = 1
-	url = https://launchpad.net/~teejee2008/+archive/ubuntu/ppa
-	install = timeshift.install
+	url = https://code.launchpad.net/~teejee2008/timeshift
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = vala
+	makedepends = diffutils
+	makedepends = coreutils
 	depends = gtk3
 	depends = libsoup
 	depends = desktop-file-utils
@@ -16,8 +19,10 @@ pkgbase = timeshift
 	depends = json-glib
 	optdepends = gksu: run timeshift from a menu
 	options = !emptydirs
-	source = https://launchpad.net/~teejee2008/+archive/ubuntu/ppa/+files/timeshift_1.7.6~184~ubuntu14.04.1.tar.gz
-	sha256sums = 391b9716cd54060eb7f7b2058d9ca0486fcd41add4e5e44a568b27b94146e82e
+	source = timeshift_v16.3_r186.tgz::https://bazaar.launchpad.net/~teejee2008/timeshift/trunk/tarball/186
+	source = sha256sums.txt
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = timeshift
 
diff --git a/PKGBUILD b/PKGBUILD
index 908c5bb0144d..e9796c95b343 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,36 +10,52 @@ set -u
 #_ubver='1.7.3~177~ubuntu15.04.1' # not found
 #_ubver='1.7.3~177~ubuntu14.04.1'; _libgee='libgee>=0.18.0'
 #_ubver='1.7.5~180~ubuntu14.04.1'; _libgee='libgee>=0.18.0'
-_ubver='1.7.6~184~ubuntu14.04.1'; _libgee='libgee>=0.18.0'
+#_ubver='1.7.6~184~ubuntu14.04.1'; _libgee='libgee>=0.18.0'
+_ubver='16.3'; _ubrel='186'; _libgee='libgee>=0.18.0'
 pkgname='timeshift'
-pkgver="${_ubver%~*}"
+pkgver="${_ubver}"
 pkgrel='1'
-_srcdir="${pkgname}_${_ubver}"
 pkgdesc='A system restore utility for Linux'
 arch=('i686' 'x86_64')
-url='https://launchpad.net/~teejee2008/+archive/ubuntu/ppa'
+#url='https://launchpad.net/~teejee2008/+archive/ubuntu/ppa'
+url='https://code.launchpad.net/~teejee2008/timeshift'
 license=('GPL')
 _arch_depends=('rsync' 'libgee06' 'json-glib') # from installer/install.sh
 _arch_depends[1]="${_libgee}"
 depends=('gtk3' 'libsoup' 'desktop-file-utils' "${_arch_depends[@]}")
+unset _arch_depends
 optdepends=('gksu: run timeshift from a menu')
-makedepends=('vala')
+makedepends=('vala' 'diffutils' 'coreutils')
 options=('!emptydirs')
-install="${pkgname}.install"
-source=("${url}/+files/${_srcdir}.tar.gz")
-sha256sums=('391b9716cd54060eb7f7b2058d9ca0486fcd41add4e5e44a568b27b94146e82e')
+_verwatch=("${url//code/bazaar}/trunk/changes" 'v\([0-9\.]\+\)' 't')
+#source=("${url}/+files/${_srcdir}.tar.gz")
+_srcdir='~teejee2008/timeshift/trunk'
+source=("timeshift_v${_ubver}_r${_ubrel}.tgz::${url//code/bazaar}/trunk/tarball/${_ubrel}" 'sha256sums.txt')
+sha256sums=('SKIP' 'SKIP') # bazaar generates the tarball live. It is different every time so we'll check the contents in prepare()
+
+prepare() {
+  set -u
+  cd "${_srcdir}"
+  shopt -s globstar
+  sha256sum ** > "${srcdir}/sha256sums.test" 2>/dev/null || :
+  shopt -u globstar
+  cd "${srcdir}"
+  set +u
+  diff -q sha256sums.{txt,test}
+  rm 'sha256sums.test'
+}
 
 build() {
   set -u
-  cd "${srcdir}/${_srcdir//_/-}"
+  cd "${_srcdir}"
 
-  make -s
+  make -s -j1
   set +u
 }
 
 package() {
   set -u
-  cd "${srcdir}/${_srcdir//_/-}"
+  cd "${_srcdir}"
 
   make DESTDIR="${pkgdir}" install
   set +u
diff --git a/sha256sums.txt b/sha256sums.txt
new file mode 100644
index 000000000000..3981380889f9
--- /dev/null
+++ b/sha256sums.txt
@@ -0,0 +1,63 @@
+3785a9905554db62933d2256e43972af42f2f85c10324bcbcf4cc96002676a9f  AUTHORS
+8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
+96c38d29e1d2ffd52d1d9c1fdd1dacdeeeb28c735741d4f75e66bea1a5f50383  INSTALL
+f944af43098a37f3fafba5b098de7fe12fbcd17cb9276945684730cbe08dff87  README.md
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  THANKS
+f6e9ca1ddbe65b3fd1fc0e57574d6836e8e8dde56f042d0be22d56b9ea610eac  build-deb-for-dist.sh
+b8d4c51cfd20130121be58a92f55745f8b0aebcbb35c2b0a848ba3d1a442b2bd  build-deb.sh
+4d8e2d7b5f042390140af3f11fa2c291f3aacb8ebfc2ac4ca1d518f88fad09a0  build-install.sh
+f02735130a6ea3d21b7da3ee15135c20710174409ad413443f22e2434ae965a3  build-installer.sh
+cf1a3a19a0edf61d91f90f21d4e94d78c93c4c6dc6ea9099c66e4189fcda848a  build-release.sh
+9751923970faaf087332d736775e6cdcf14533664f66b2046139519f0e27eee6  build-source.sh
+6fd9592bbb540f9f8e636513570250f14a55691d6b46d860471e731bf04f5531  build.sh
+7befa0b8b6d5c3ed75a61aaf114303424f6abf2dce9af11295b908736278efac  debian/changelog
+aa67a169b0bba217aa0aa88a65346920c84c42447c36ba5f7ea65f422c1fe5d8  debian/compat
+8276d3ed76e16a229c4201ab018a06f46b1ae1cf7cf0a996d1bd515a12166fd8  debian/control
+0600319e419d3704caa4d80376bcc8f0a2f8246b2fff92be09baf0efa1548d63  debian/copyright
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  debian/docs
+c77dcb62a104ad783679a3b62e67fd0afccd68004b484e9c86c2fa8fda4aee99  debian/rules
+e8e18df40bcd69d6aa404282679186d9b8256ac63a5b4e80d7f081e8a0095a2e  debian/source/format
+e4aa796dfa7bcf2b32b9e4092c0f354b12a8c223748ec225be99c829ecd43297  icons/timeshift-14.png
+b46d863b2ccfe5d7a86d8713c95bf12901f2e5c84e143b34edcb4389f1a301e8  icons/timeshift-192.png
+1ffcece0d1d0669d435e1067c8331fa522958772f9d2254ae58321e0f7d656e4  icons/timeshift-64.png
+8d0e9b02c55ce04e147f1754bbfcec514b547f86f6cc677503eea672621f0be6  installer/install.sh
+1b15dbaf4d6113236b14cd537e2265b6d47335b3a6f2d3c16854237d302be604  makefile
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  man/ChangeLog
+3e99fb63218aed424d6af9683c8be6ae3480231e1fdaa9ead89c6477af142437  man/Makefile.am
+8a2ef7d8812cd37b6ab92f658726eee00f021a879c2b2a01738653c6480c7160  man/Makefile.in
+8416427a1eef07d0f8fcde248b7661e2a7603d1750fec93bc1911fc84aec5c48  man/hello.1
+c94118cfd882a33d4ccab99d0c031c76b6b7f621bbc2ee62023a9c8b10cea046  po/timeshift-fr.po
+244dd80f92cc194b4a3f5cd07c332eccc618984602c7297bb8ff6a300c245711  po/timeshift-it.po
+834d145cb7d26e026b7e1bde78dff0086ec9d335410a75c64886c8f7d993099e  po/timeshift-ko.po
+00444ff5f0af21a88c9c81e73bb6cc74120e22887fc3375cae0890c3fee9e17a  push.sh
+8fcf3bb40a34eb9731f6b762987082e54f86b05e4c581e6026444c5aa273e725  src/AboutWindow.vala
+3d9e053682fa4006b7fca4c7b59dbafee103c130334afaad23a2563e7b617947  src/DonationWindow.vala
+a0c528df636f079bb8b61f5e1124663f5eedbf660659b9d93ae5283554f967fe  src/ExcludeMessageWindow.vala
+f41026ba909f4ba0c4cb67cad3e6ad2cc163ab3ce77d20b6f3077873e4075c57  src/Main.vala
+25263a6d9c6af408af72dfa05614c44f9867d75813556ea96b6ea273b78c4d99  src/MainWindow.vala
+58747fae7c065851c695fc4e6ab875dc79d8235d50b414682f4f6556bd0184b4  src/RestoreWindow.vala
+97f02f16b0dc0781b9f12ebeb6488a9067ac828cc74b02d34a6369b0b2d1cc6d  src/SettingsWindow.vala
+b878d6b77a5097f50960077d37dbc8e3638671cacd0e84e574c21d6e37648653  src/TerminalWindow.vala
+a405e3e93980958ac7c192031a15ca3d46b91eb8fa821ec32fbee135e3f88ac7  src/Utility.vala
+e8040bf9c0b07d8a0def49d60f50e47db60eab0438e09e2cfbc9374f3e7b3085  src/makefile
+2269594a1cc3ad1734cfceeb2dc4c42496173cbeff6db323ff5d7e33f2c5b69c  src/share/pixmaps/timeshift.png
+92b145f0593a683a4bfc49e07ca9dad1d7b70190ecbae5646908fb93016d73dc  src/share/timeshift/images/disk.png
+aa8dcb8a04ca800de9c813b611e8806c4f1f73e3a6f3d2f95b7f7c6a4aaac92c  src/share/timeshift/images/donate.svg
+e5fb924ec5137e6a3e4e188509e2689a66016a6a6c9ad48fa328bf2541a32891  src/share/timeshift/images/exclude.png
+f2505d70784e00049f834067b40ab52ece7c772d6ed6d6f6b0c800ce08320817  src/share/timeshift/images/help-info.svg
+f488fdf5041e0c03a139fb06b24f3fb5f445fc7a31e8c7e46bd40a6a5eb2741c  src/share/timeshift/images/include.png
+62e863cd5fcc76f439039f6a6b837503416759f34cf0a0fbd64374f93dba76f8  src/share/timeshift/images/item-blue.png
+0b33e44a082cb25337d6d48a84dc0e4f8415d35fa0da362da89ceca51f037e59  src/share/timeshift/images/item-gray.png
+e4c230bcccfc79304acd2f0b3f01886bf654778e022726c839a8f2e9e439bb7f  src/share/timeshift/images/item-green.png
+c7fffb09caec94e2370a42fbbd8ee35a4254315d097e0caacf56e7b80847a457  src/share/timeshift/images/item-red.png
+df79a57ac8caacb1dd3bf5ee9bfb1d4e46cbf7923a2d4d3c99f437ae1c3ba25e  src/share/timeshift/images/item-yellow.png
+68476e43951b1e0d9c1bcd9a8c51061b1290a28436f2e045d40e16df9046e5e5  src/share/timeshift/images/locked.svg
+cb09134e329561fd19ebbafb96ebe5a181ee171071e4e7fe7f9731aa7e5e6317  src/share/timeshift/images/progress.gif
+4ee8d9d1c70225df0070535b5943e658a67f37f7c8013d5cad3a1cb1b73af054  src/share/timeshift/images/spinner.gif
+b30f7add4eb2a1549763a7dfd8c6498acadd7c2bdd9b44e172d2672a67cd83fb  src/timeshift-launcher
+6dd96201d6e48f5285332185d5d4183854612c69b39a83a8e662f880f8434caf  src/timeshift-uninstall
+5ef5fd884c0edfd3b74c90a365ef43d1e93a92f91269a881b8c3447aeef42552  src/timeshift.desktop
+592f17b6c7ac7d3e4dbacb8cd18bf0e91632c5ba4d7659f7877255bc4421f7e6  timeshift.geany
+2f4829abf8e7fc2d10be96fee3f90d02531502f00e8ede4d281e89d8b878351b  timeshift.pot
+432ec1b88da0cb0ee0eb175d4e9b09db6603c7baf71d065dea7ef08e3e4e881d  timeshift.xcf
+8dcff588aa89ee915df69167f542df7646ca0440b25b37f4952bde0d74021ed0  upload.sh
diff --git a/timeshift.install b/timeshift.install
deleted file mode 100644
index e111ef946053..000000000000
--- a/timeshift.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}