Update to v0.3.0, package renamed from textsecure-cli to signal-cli

8 files changed, 36 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e903993e84f7..891623441b19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by mksrcinfo v8
-# Tue Mar  1 15:52:59 UTC 2016
-pkgbase = textsecure-cli
+# Sat Apr  2 11:26:07 UTC 2016
+pkgbase = signal-cli
 	pkgdesc = Provides a commandline and dbus interface for secure Signal/TextSecure messaging.
-	pkgver = 0.2.1
-	pkgrel = 3
-	url = https://github.com/AsamK/textsecure-cli
-	install = textsecure-cli.install
+	pkgver = 0.3.0
+	pkgrel = 1
+	url = https://github.com/AsamK/signal-cli
+	install = signal-cli.install
 	arch = any
 	license = GPL3
 	makedepends = java-environment
@@ -14,14 +14,16 @@ pkgbase = textsecure-cli
 	depends = libmatthew-unix-java
 	depends = java-commons-logging
 	depends = java-commons-io
-	source = https://github.com/AsamK/textsecure-cli/archive/v0.2.1.tar.gz
-	source = textsecure-cli.sh
-	source = textsecure-cli.sysusers.conf
-	source = textsecure-cli.tmpfiles.conf
-	sha256sums = 19e4c66c5699e4a7cc2213c0df56ed3240ada49507c6b670133b33f2e6ccf760
-	sha256sums = 6a0229a91b87d4b2fd44e30b67feb972e4e24dc22c80eabd04aa007b68d190bf
-	sha256sums = e4560cafef512e59935d1562f05dd55b04f6b2ead6bf2a888dc6f9ec5b342758
-	sha256sums = 31a16ec54fbdef581695b797d03c47b5618030de9b9fa26c3d3fcfc476ad30b8
+	conflicts = textsecure-cli
+	replaces = textsecure-cli
+	source = https://github.com/AsamK/signal-cli/archive/v0.3.0.tar.gz
+	source = signal-cli.sh
+	source = signal-cli.sysusers.conf
+	source = signal-cli.tmpfiles.conf
+	sha256sums = 1ffd176c238bb8cec92026f442f46366b80bb06425d1cd4fe359d81d67364a82
+	sha256sums = 874dd32da6f0f0c427d26cb5ecdcf989d7b84288a8deb74a36c7b7101e73c337
+	sha256sums = 873aee431878cbecf6162b51053e82ed758cadbca40bbb2614e5a82e5a99f32f
+	sha256sums = 2fcc0856591271c5997051a9b19ed13cf94d179d7b4a1b5addff9ccd4cf60f9d
 
-pkgname = textsecure-cli
+pkgname = signal-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index ddf530c4c984..979e1cc91474 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,25 @@
 # Maintainer: AsamK <asamk ät gmx de>
 
-pkgname=textsecure-cli
-pkgver=0.2.1
-pkgrel=3
+pkgname=signal-cli
+pkgver=0.3.0
+pkgrel=1
 pkgdesc="Provides a commandline and dbus interface for secure Signal/TextSecure messaging."
 arch=('any')
-url="https://github.com/AsamK/textsecure-cli"
+url="https://github.com/AsamK/signal-cli"
 license=('GPL3')
 depends=('java-runtime' 'libmatthew-unix-java' 'java-commons-logging' 'java-commons-io')
 makedepends=('java-environment' 'gradle')
+replaces=('textsecure-cli')
+conflicts=('textsecure-cli')
 source=("https://github.com/AsamK/${pkgname}/archive/v${pkgver}.tar.gz"
         "${pkgname}.sh"
         "${pkgname}.sysusers.conf"
         "${pkgname}.tmpfiles.conf")
 install="${pkgname}.install"
-sha256sums=('19e4c66c5699e4a7cc2213c0df56ed3240ada49507c6b670133b33f2e6ccf760'
-            '6a0229a91b87d4b2fd44e30b67feb972e4e24dc22c80eabd04aa007b68d190bf'
-            'e4560cafef512e59935d1562f05dd55b04f6b2ead6bf2a888dc6f9ec5b342758'
-            '31a16ec54fbdef581695b797d03c47b5618030de9b9fa26c3d3fcfc476ad30b8')
+sha256sums=('1ffd176c238bb8cec92026f442f46366b80bb06425d1cd4fe359d81d67364a82'
+            '874dd32da6f0f0c427d26cb5ecdcf989d7b84288a8deb74a36c7b7101e73c337'
+            '873aee431878cbecf6162b51053e82ed758cadbca40bbb2614e5a82e5a99f32f'
+            '2fcc0856591271c5997051a9b19ed13cf94d179d7b4a1b5addff9ccd4cf60f9d')
 
 build() {
 	cd "${srcdir}"
@@ -42,7 +44,7 @@ package() {
 
 	cd "${pkgname}-${pkgver}"
 
-	install -m644 "data/org.asamk.TextSecure.conf" "${pkgdir}/etc/dbus-1/system.d/"
+	install -m644 "data/org.asamk.Signal.conf" "${pkgdir}/etc/dbus-1/system.d/"
 	install -m644 "data/${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/"
 	sed -i "s|%dir%|/usr|" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service"
 
diff --git a/textsecure-cli.install b/signal-cli.install
index adc946db6919..6b52bb262389 100644
--- a/textsecure-cli.install
+++ b/signal-cli.install
@@ -1,7 +1,7 @@
 #!/bin/sh
 post_common() {
-	systemd-sysusers textsecure-cli.conf
-	systemd-tmpfiles --create textsecure-cli.conf
+	systemd-sysusers signal-cli.conf
+	systemd-tmpfiles --create signal-cli.conf
 }
 
 post_install() {
diff --git a/textsecure-cli.sh b/signal-cli.sh
index f89b73886f0d..d53e14883655 100644
--- a/textsecure-cli.sh
+++ b/signal-cli.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 CP="/usr/share/java/libmatthew-unix-java/unix.jar":"/usr/share/java/commons-logging/commons-logging.jar":"/usr/share/java/commons-io/commons-io.jar"
-for name in /usr/share/java/textsecure-cli/*.jar ; do
+for name in /usr/share/java/signal-cli/*.jar ; do
 	CP=$CP:"$name"
 done
-exec /usr/bin/java -cp "$CP" org.asamk.textsecure.Main "$@"
+exec /usr/bin/java -cp "$CP" org.asamk.signal.Main "$@"
diff --git a/signal-cli.sysusers.conf b/signal-cli.sysusers.conf
new file mode 100644
index 000000000000..fcab31ef41f9
--- /dev/null
+++ b/signal-cli.sysusers.conf
@@ -0,0 +1 @@
+u signal-cli - "Signal messaging service" /var/lib/signal-cli
diff --git a/signal-cli.tmpfiles.conf b/signal-cli.tmpfiles.conf
new file mode 100644
index 000000000000..859e560519c6
--- /dev/null
+++ b/signal-cli.tmpfiles.conf
@@ -0,0 +1,3 @@
+d /var/lib/signal-cli             0755 signal-cli signal-cli -
+d /var/lib/signal-cli/data        0700 signal-cli signal-cli -
+d /var/lib/signal-cli/attachments 0755 signal-cli signal-cli -
diff --git a/textsecure-cli.sysusers.conf b/textsecure-cli.sysusers.conf
deleted file mode 100644
index 3069d4078ac7..000000000000
--- a/textsecure-cli.sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u textsecure-cli - "TextSecure messaging service" /var/lib/textsecure-cli
diff --git a/textsecure-cli.tmpfiles.conf b/textsecure-cli.tmpfiles.conf
deleted file mode 100644
index f632e56141b5..000000000000
--- a/textsecure-cli.tmpfiles.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-d /var/lib/textsecure-cli             0755 textsecure-cli textsecure-cli -
-d /var/lib/textsecure-cli/data        0700 textsecure-cli textsecure-cli -
-d /var/lib/textsecure-cli/attachments 0755 textsecure-cli textsecure-cli -