Update source URL

Add python-dulwich for Git support
Remove .install file
Install license first

3 files changed, 10 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2896df9adad8..0093c4b9385e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = indicator-weather-bzr
 	pkgdesc = Comprehensive weather notification system, implemented using the indicator applet API (Canonical Ayatana Project)
 	pkgver = r358
-	pkgrel = 3
+	pkgrel = 4
 	url = https://launchpad.net/weather-indicator
-	install = indicator-weather-bzr.install
 	arch = any
 	license = GPL3
 	makedepends = bzr
 	makedepends = python2-distutils-extra
+	makedepends = python-dulwich
 	depends = libappindicator-gtk3
 	depends = libgweather
 	depends = python2-pywapi
@@ -15,7 +15,7 @@ pkgbase = indicator-weather-bzr
 	optdepends = python2-unidecode: for ASCII transliterations of Unicode text
 	provides = indicator-weather
 	conflicts = indicator-weather
-	source = indicator-weather-bzr::bzr+http://bazaar.launchpad.net/~weather-indicator-team/weather-indicator/rainy
+	source = indicator-weather-bzr::bzr+lp:weather-indicator
 	md5sums = SKIP
 
 pkgname = indicator-weather-bzr
diff --git a/PKGBUILD b/PKGBUILD
index 98b7113f611d..d866efa0478c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # Maintainer: willemw <willemw12@gmail.com>
 
-_pkgname=indicator-weather
-pkgname=$_pkgname-bzr
+pkgname=indicator-weather-bzr
 pkgver=r358
-pkgrel=3
+pkgrel=4
 pkgdesc="Comprehensive weather notification system, implemented using the indicator applet API (Canonical Ayatana Project)"
 arch=('any')
 url="https://launchpad.net/weather-indicator"
 license=('GPL3')
 depends=('libappindicator-gtk3' 'libgweather' 'python2-pywapi' 'python2-pytz')
 optdepends=('python2-unidecode: for ASCII transliterations of Unicode text')
-makedepends=('bzr' 'python2-distutils-extra')
-provides=($_pkgname)
-conflicts=($_pkgname)
-install=$pkgname.install
-source=($pkgname::bzr+http://bazaar.launchpad.net/~weather-indicator-team/weather-indicator/rainy)  # Series 2.0
+makedepends=('bzr' 'python2-distutils-extra' 'python-dulwich')
+provides=("${pkgname%-bzr}")
+conflicts=("${pkgname%-bzr}")
+source=($pkgname::bzr+lp:weather-indicator)
 md5sums=('SKIP')
 
 pkgver() {
@@ -34,7 +32,7 @@ build() {
 
 package() {
   cd $pkgname
+  install -Dm644 AUTHORS "$pkgdir/usr/share/doc/indicator-weather/AUTHORS"
   python2 setup.py install --root="$pkgdir" --optimize=1
-  install -D -m644 AUTHORS "$pkgdir/usr/share/doc/indicator-weather/AUTHORS"
 }
 
diff --git a/indicator-weather-bzr.install b/indicator-weather-bzr.install
deleted file mode 100644
index f1e02f6b2d52..000000000000
--- a/indicator-weather-bzr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
-