Fix dir and md5sums, pkgrel to 2

4 files changed, 23 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c963bd26ea7e..b1ce780eaefe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@
 pkgbase = douane-dkms-git
 	pkgdesc = Douane Firewall Kernel Module (DKMS)
 	pkgver = 1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://douaneapp.com/
 	install = douane-dkms-git.install
 	arch = i686
@@ -14,7 +14,6 @@ pkgbase = douane-dkms-git
 	source = git+https://github.com/Douane/douane-dkms.git
 	source = douane-dkms-git.install
 	md5sums = SKIP
-	md5sums = ab6d49e4449e5647ca5c58021674ae82
+	md5sums = 3754DB1C07F0F21AB3A3A167138DD791
 
 pkgname = douane-dkms-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 671397e98d53..871459614a8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=douane-dkms-git
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Douane Firewall Kernel Module (DKMS)"
 arch=('i686' 'x86_64')
 url="http://douaneapp.com/"
@@ -11,10 +11,10 @@ install=${pkgname}.install
 source=('git+https://github.com/Douane/douane-dkms.git'
         "${pkgname}.install")
 md5sums=('SKIP'
-         'ab6d49e4449e5647ca5c58021674ae82')
+         '3754DB1C07F0F21AB3A3A167138DD791')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/douane-dkms"
   # Use the tag of the last commit
   git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
 }
@@ -22,16 +22,16 @@ pkgver() {
 
 package() {
   # Install
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/douane-dkms"
   # Copy dkms.conf
   install -Dm644 dkms.conf "${pkgdir}"/usr/src/${pkgname}-${pkgver}/dkms.conf
 
-  # Set name and version
+  # Set name and versionz
   sed -e "s/@_PKGBASE@/${_pkgbase}/" \
       -e "s/@PKGVER@/${pkgver}/" \
       -i "${pkgdir}"/usr/src/${pkgname}-${pkgver}/dkms.conf
 
-for i in "${srcdir}/${pkgname}/"{Makefile,douane.c,network_activity_message.h}; do
+  for i in "${srcdir}/douane-dkms/"{Makefile,douane.c,network_activity_message.h}; do
     install -D -m644 "${i}" "${pkgdir}/usr/src/${pkgname}-${pkgver}/"
   done
 }
diff --git a/douane-dkms-git.install b/douane-dkms-git.install
index 881825df91f3..efdeb0e2126b 120000..100644
--- a/douane-dkms-git.install
+++ b/douane-dkms-git.install
@@ -1 +1,15 @@
-douane-dkms.install
\ No newline at end of file
+post_install() {
+ dkms install -m douane -v ${1%%-*}
+}
+pre_upgrade() {
+ local curver=${2%%-*}
+ # $2 is unset due to a bug. Query current version using pacman as fallback
+ [ -n "$curver" ] || curver=$(pacman -Qi douane-dkms | awk '/^Version/{print $3}')
+ pre_remove $curver
+}
+post_upgrade() {
+ post_install ${1%%-*}
+}
+pre_remove() {
+ dkms remove -m douane -v ${1%%-*} --all
+}
diff --git a/douane-dkms.install b/douane-dkms.install
deleted file mode 100644
index 7bd166f81e53..000000000000
--- a/douane-dkms.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	dkms install -m douane -v ${1%%-*}
-}
-pre_upgrade() {
-	local curver=${2%%-*}
-	# $2 is unset due to a bug. Query current version using pacman as fallback
-	[ -n "$curver" ] || curver=$(pacman -Qi douane-dkms | awk '/^Version/{print $3}')
-	pre_remove $curver
-}
-post_upgrade() {
-	post_install ${1%%-*}
-}
-pre_remove() {
-	dkms remove -m douane -v ${1%%-*} --all
-}
\ No newline at end of file