Merge pull request #108 from nextcloud/ivaradi-patch-v2.3.1

Ubuntu/Debian support for client version 2.3.1

10 files changed, 133 insertions, 15 deletions

diff --git a/linux/debian/nextcloud-client/debian.stable/changelog b/linux/debian/nextcloud-client/debian.stable/changelog
index ddc4596..c29c44b 100644
--- a/linux/debian/nextcloud-client/debian.stable/changelog
+++ b/linux/debian/nextcloud-client/debian.stable/changelog
@@ -1,4 +1,10 @@
-nextcloud-client (2.3.0-1.0) yakkety; urgency=medium
+nextcloud-client (2.3.1-1.0) stable; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
+nextcloud-client (2.3.0-1.0) stable; urgency=medium
 
   * New upstream version
 
diff --git a/linux/debian/nextcloud-client/debian.trusty/changelog b/linux/debian/nextcloud-client/debian.trusty/changelog
index 98e484c..4fd62e8 100644
--- a/linux/debian/nextcloud-client/debian.trusty/changelog
+++ b/linux/debian/nextcloud-client/debian.trusty/changelog
@@ -1,3 +1,9 @@
+nextcloud-client (2.3.1-1.0~trusty1) trusty; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
 nextcloud-client (2.3.0-1.0~trusty1) trusty; urgency=medium
 
   * New upstream version
diff --git a/linux/debian/nextcloud-client/debian.xenial/changelog b/linux/debian/nextcloud-client/debian.xenial/changelog
index 2d82f43..d08cbd2 100644
--- a/linux/debian/nextcloud-client/debian.xenial/changelog
+++ b/linux/debian/nextcloud-client/debian.xenial/changelog
@@ -1,3 +1,9 @@
+nextcloud-client (2.3.1-1.0~xenial1) xenial; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
 nextcloud-client (2.3.0-1.0~xenial1) xenial; urgency=medium
 
   * New upstream version
diff --git a/linux/debian/nextcloud-client/debian.zesty/changelog b/linux/debian/nextcloud-client/debian.zesty/changelog
index 715b595..bdd7336 100644
--- a/linux/debian/nextcloud-client/debian.zesty/changelog
+++ b/linux/debian/nextcloud-client/debian.zesty/changelog
@@ -1,3 +1,9 @@
+nextcloud-client (2.3.1-1.0~zesty1) zesty; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
 nextcloud-client (2.3.0-1.0~zesty1) zesty; urgency=medium
 
   * New upstream version
diff --git a/linux/debian/nextcloud-client/debian/changelog b/linux/debian/nextcloud-client/debian/changelog
index 1aae1a4..02eabe4 100644
--- a/linux/debian/nextcloud-client/debian/changelog
+++ b/linux/debian/nextcloud-client/debian/changelog
@@ -1,3 +1,9 @@
+nextcloud-client (2.3.1-1.0~yakkety1) yakkety; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
 nextcloud-client (2.3.0-1.0~yakkety1) yakkety; urgency=medium
 
   * New upstream version
diff --git a/linux/debian/nextcloud-client/debian/patches/fix-application-icon-name.patch b/linux/debian/nextcloud-client/debian/patches/fix-application-icon-name.patch
index 1d907fa..234ebe8 100644
--- a/linux/debian/nextcloud-client/debian/patches/fix-application-icon-name.patch
+++ b/linux/debian/nextcloud-client/debian/patches/fix-application-icon-name.patch
@@ -23,8 +23,8 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: 2016-12-20
 
---- nextcloud-client-2.2.4.orig/client/mirall.desktop.in
-+++ nextcloud-client-2.2.4/client/mirall.desktop.in
+--- nextcloud-client-2.3.1.orig/client/mirall.desktop.in
++++ nextcloud-client-2.3.1/client/mirall.desktop.in
 @@ -5,7 +5,7 @@
  Name=@APPLICATION_NAME@ desktop sync client 
  Comment=@APPLICATION_NAME@ desktop synchronization client
@@ -34,7 +34,7 @@ Last-Update: 2016-12-20
  Keywords=@APPLICATION_NAME@;syncing;file;sharing;
  X-GNOME-Autostart-Delay=3
  
-@@ -758,164 +758,164 @@
+@@ -806,168 +806,168 @@
  Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
  GenericName[oc]=Dorsièr de Sincronizacion
  Name[oc]=@APPLICATION_NAME@ sincronizacion del client
@@ -45,6 +45,11 @@ Last-Update: 2016-12-20
  Name[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
 -Icon[ar]=@APPLICATION_EXECUTABLE@
 +Icon[ar]=@APPLICATION_SHORTNAME@
+ Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
+ GenericName[bg_BG]=Синхронизиране на папката
+ Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
+-Icon[bg_BG]=@APPLICATION_EXECUTABLE@
++Icon[bg_BG]=@APPLICATION_SHORTNAME@
  Comment[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
  GenericName[ca]=Sincronització de carpetes
  Name[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
@@ -85,18 +90,18 @@ Last-Update: 2016-12-20
  Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 -Icon[de_DE]=@APPLICATION_EXECUTABLE@
 +Icon[de_DE]=@APPLICATION_SHORTNAME@
- Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
- GenericName[bg_BG]=Синхронизиране на папката
- Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
--Icon[bg_BG]=@APPLICATION_EXECUTABLE@
-+Icon[bg_BG]=@APPLICATION_SHORTNAME@
+ Comment[eu]=@APPLICATION_NAME@ mahaigaineko sinkronizazio bezeroa
+ GenericName[eu]=Karpetaren sinkronizazioa
+ Name[eu]=@APPLICATION_NAME@ mahaigaineko sinkronizazio bezeroa
+-Icon[eu]=@APPLICATION_EXECUTABLE@
++Icon[eu]=@APPLICATION_SHORTNAME@
  GenericName[fa]=همسان سازی پوشه‌ها
  Name[fa]=@APPLICATION_EXECUTABLE@ نسخه‌ی همسان سازی مشتری
 -Icon[fa]=@APPLICATION_EXECUTABLE@
 +Icon[fa]=@APPLICATION_SHORTNAME@
- Comment[fr]=@APPLICATION_NAME@ synchronisation du client
- GenericName[fr]=Dossier de Synchronisation
- Name[fr]=@APPLICATION_NAME@ synchronisation du client
+ Comment[fr]=Application de bureau pour synchroniser des dossiers avec un serveur @APPLICATION_NAME@
+ GenericName[fr]=Synchronisation de dossier
+ Name[fr]=Client de synchronisation @APPLICATION_NAME@
 -Icon[fr]=@APPLICATION_EXECUTABLE@
 +Icon[fr]=@APPLICATION_SHORTNAME@
  Comment[he]=@APPLICATION_NAME@ לקוח סנכון שולחן עבודה
diff --git a/linux/debian/nextcloud-client/debian/patches/fix-syncstate-appname.patch b/linux/debian/nextcloud-client/debian/patches/fix-syncstate-appname.patch
new file mode 100644
index 0000000..a98b026
--- /dev/null
+++ b/linux/debian/nextcloud-client/debian/patches/fix-syncstate-appname.patch
@@ -0,0 +1,33 @@
+diff -ruN nextcloud-client_2.3.0.orig/client/shell_integration/nautilus/CMakeLists.txt nextcloud-client_2.3.0/client/shell_integration/nautilus/CMakeLists.txt
+--- nextcloud-client_2.3.0.orig/client/shell_integration/nautilus/CMakeLists.txt	2017-03-03 10:11:17.000000000 +0100
++++ nextcloud-client_2.3.0/client/shell_integration/nautilus/CMakeLists.txt	2017-03-23 19:11:30.031358428 +0100
+@@ -3,8 +3,6 @@
+ if( UNIX AND NOT APPLE )
+ 
+     configure_file(syncstate.py syncstate.py COPYONLY)
+-    configure_file(syncstate.py syncstate_nemo.py COPYONLY)
+-    configure_file(syncstate.py syncstate_caja.py COPYONLY)
+ 
+     # Call the setupappname.sh script to set the custom app name.
+     set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh")
+diff -ruN nextcloud-client_2.3.0.orig/client/shell_integration/nautilus/createcajaplugin.sh nextcloud-client_2.3.0/client/shell_integration/nautilus/createcajaplugin.sh
+--- nextcloud-client_2.3.0.orig/client/shell_integration/nautilus/createcajaplugin.sh	2017-03-03 10:11:17.000000000 +0100
++++ nextcloud-client_2.3.0/client/shell_integration/nautilus/createcajaplugin.sh	2017-03-23 19:11:42.419312193 +0100
+@@ -2,6 +2,6 @@
+ 
+ # this script creates a plugin for caja, just by replacing
+ # all occurences of Nautilus with Caja (case sensitive).
+-
++cp syncstate.py syncstate_caja.py
+ sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py
+ sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py
+diff -ruN nextcloud-client_2.3.0.orig/client/shell_integration/nautilus/createnemoplugin.sh nextcloud-client_2.3.0/client/shell_integration/nautilus/createnemoplugin.sh
+--- nextcloud-client_2.3.0.orig/client/shell_integration/nautilus/createnemoplugin.sh	2017-03-03 10:11:17.000000000 +0100
++++ nextcloud-client_2.3.0/client/shell_integration/nautilus/createnemoplugin.sh	2017-03-23 19:11:50.347282602 +0100
+@@ -2,5 +2,5 @@
+ 
+ # this script creates a plugin for nemo, just be replacing
+ # all occurences of Nautilus with Nemo.
+-
++cp syncstate.py syncstate_nemo.py
+ sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py
diff --git a/linux/debian/nextcloud-client/debian/patches/series b/linux/debian/nextcloud-client/debian/patches/series
index 0277a20..6cdbb79 100644
--- a/linux/debian/nextcloud-client/debian/patches/series
+++ b/linux/debian/nextcloud-client/debian/patches/series
@@ -1 +1,2 @@
 fix-application-icon-name.patch
+fix-syncstate-appname.patch
diff --git a/linux/debian/scripts/addchange.sh b/linux/debian/scripts/addchange.sh
new file mode 100755
index 0000000..7f3f334
--- /dev/null
+++ b/linux/debian/scripts/addchange.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e -u
+
+scriptdir=`dirname $0`
+
+DEFAULT_DIST=yakkety
+
+package="$1"
+version="$2"
+comment="$3"
+distver="${4:-}"
+
+if test -z "${distver}"; then
+    distver="1"
+fi
+
+packagedir="${scriptdir}/../${package}"
+
+now=`date -R`
+
+tmpfile="/tmp/addchange.$$"
+
+for subdir in "${packagedir}/debian"*; do
+    if test -f "${subdir}/changelog"; then
+        echo "${subdir}"
+        bname=`basename "${subdir}"`
+        dist=`echo "${bname}" | sed 's:debian\.\?::'`
+        if test -z "${dist}"; then
+            dist="${DEFAULT_DIST}"
+        fi
+        if test "${dist}" = "stable"; then
+            versuffix=""
+        else
+            versuffix="~${dist}${distver}"
+        fi
+        cat > "${tmpfile}" <<EOF
+${package} (${version}${versuffix}) ${dist}; urgency=medium
+
+  * ${comment}
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  ${now}
+
+EOF
+        cat "${subdir}/changelog" >> "${tmpfile}"
+        mv "${tmpfile}" "${subdir}/changelog"
+    fi
+done
+
+rm -f "${tmpfile}"
diff --git a/linux/debian/scripts/config.sh b/linux/debian/scripts/config.sh
index e6a382b..19425e0 100644
--- a/linux/debian/scripts/config.sh
+++ b/linux/debian/scripts/config.sh
@@ -23,14 +23,13 @@ QTKEYCHAIN_FULL_VERSION="${QTKEYCHAIN_VERSION}-1.0ppa1~@DISTRIBUTION@1"
 QTKEYCHAIN_TAG="v${QTKEYCHAIN_VERSION}"
 
 # The version of the nextcloud-client package
-NEXTCLOUD_CLIENT_VERSION=2.3.0
+NEXTCLOUD_CLIENT_VERSION=2.3.1
 
 # The FULL version of the nextcloud-client package
 NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.0~@DISTRIBUTION@1"
 
 # The tag of the nextcloud-client package
-#NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
-NEXTCLOUD_CLIENT_TAG="d65eb9e8cc91cca34dd13bf1e4ec695c390be550"
+NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
 
 # The number of CPUs that can be used for paralel builds
 NUMCPUS=4