Merge pull request #65 from nextcloud/ivaradi-patch-1

Various changes for the Ubuntu/Debian build files

linux/debian/nextcloud-client/debian.stable/changelog

@@ -0,0 +1,17 @@
+nextcloud-client (2.2.4-1.2) stable; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1) stable; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
+nextcloud-client (2.2.4-1.0) stable; urgency=medium
+
+  * Initial release.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100

linux/debian/nextcloud-client/debian.stable/control

@@ -0,0 +1,52 @@
+Source: nextcloud-client
+Section: contrib/devel
+Priority: optional
+Maintainer: István Váradi <ivaradi@varadiistvan.hu>
+Build-Depends: debhelper (>= 9), cdbs, cmake, libssl-dev (>= 1.0.0), libsqlite3-dev (>=3.5.9),
+    qtkeychain-dev (>=0.7.0), libqtwebkit-dev, pkg-config
+Standards-Version: 3.9.8
+Homepage: https://github.com/nextcloud/client_theming
+#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
+
+Package: nextcloud-client
+Architecture: any
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Description: Nextcloud desktop sync client
+ Use the desktop client to keep your files synchronized
+ between your Nextcloud server and your desktop. Select
+ one or more directories on your local machine and always
+ have access to your latest files wherever you are.
+
+Package: libnextcloudsync0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nextcloud sync library
+ Used by the Nextcloud desktop client as the synchronization engine.
+
+Package: libnextcloudsync-dev
+Architecture: any
+Section: contrib/libdevel
+Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
+Description: Nextcloud sync library development files
+ The headers and development library for the Nextcloud sync library.
+
+Package: nextcloud-client-l10n
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nextcloud client internatialization files
+ The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+  This package contains a Nautilus plugin to display
+  synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+  This package contains a Nemo plugin to display
+  synchronization status icons for Nextcloud files.

linux/debian/nextcloud-client/debian.trusty/changelog

@@ -1,3 +1,15 @@
+nextcloud-client (2.2.4-1.2~trusty1) trusty; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1~trusty1) trusty; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
 nextcloud-client (2.2.4-1.0~trusty1) trusty; urgency=medium
 
   * Initial release.

linux/debian/nextcloud-client/debian.xenial/changelog

@@ -1,3 +1,15 @@
+nextcloud-client (2.2.4-1.2~xenial1) xenial; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1~xenial1) xenial; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
 nextcloud-client (2.2.4-1.0~xenial1) xenial; urgency=medium
 
   * Initial release.

linux/debian/nextcloud-client/debian/changelog

@@ -1,3 +1,15 @@
+nextcloud-client (2.2.4-1.2~yakkety1) yakkety; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1~yakkety1) yakkety; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
 nextcloud-client (2.2.4-1.0~yakkety1) yakkety; urgency=medium
 
   * Initial release.

linux/debian/nextcloud-client/debian/control

@@ -36,3 +36,17 @@ Architecture: all
 Depends: ${misc:Depends}
 Description: Nextcloud client internatialization files
  The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+  This package contains a Nautilus plugin to display
+  synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+  This package contains a Nemo plugin to display
+  synchronization status icons for Nextcloud files.

linux/debian/nextcloud-client/debian/nextcloud-client-nautilus.install

@@ -0,0 +1 @@
+usr/share/nautilus-python

linux/debian/nextcloud-client/debian/nextcloud-client-nemo.install

@@ -0,0 +1 @@
+usr/share/nemo-python

linux/debian/nextcloud-client/debian/patches/fix-synctstate-nemo-branding.patch

@@ -0,0 +1,44 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ nextcloud-client (2.2.4-1.0~trusty1) trusty; urgency=medium
+ .
+   * Initial release.
+Author: István Váradi <ivaradi@varadiistvan.hu>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- nextcloud-client-2.2.4.orig/client/shell_integration/nautilus/CMakeLists.txt
++++ nextcloud-client-2.2.4/client/shell_integration/nautilus/CMakeLists.txt
+@@ -3,7 +3,6 @@
+ if( UNIX AND NOT APPLE )
+ 
+     configure_file(syncstate.py syncstate.py COPYONLY)
+-    configure_file(syncstate.py syncstate_nemo.py COPYONLY)
+ 
+     # Call the setupappname.sh script to set the custom app name.
+     set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh")
+--- nextcloud-client-2.2.4.orig/client/shell_integration/nautilus/createnemoplugin.sh
++++ nextcloud-client-2.2.4/client/shell_integration/nautilus/createnemoplugin.sh
+@@ -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

linux/debian/nextcloud-client/debian/patches/series

@@ -1 +1,2 @@
 fix-application-icon-name.patch
+fix-synctstate-nemo-branding.patch

linux/debian/qtkeychain/debian.stable/changelog

@@ -0,0 +1,5 @@
+qtkeychain (0.7.0-1.0) stable; urgency=medium
+
+  * Initial release.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 23 Dec 2016 16:28:38 +0100

linux/debian/scripts/build.sh

@@ -3,6 +3,7 @@
 set -e -u
 
 scriptdir=`dirname $0`
+scriptdir=`cd "${scriptdir}" && pwd`
 
 . "${scriptdir}/config.sh"
 
@@ -12,6 +13,10 @@ version="${3}"
 distribution="${4}"
 shift 4
 
+pushd /
+
 "${scriptdir}/create_debdir.sh" "${package}" "${tag}" "${version}" "${distribution}"
 
 (cd "${BUILDAREA}/${package}_${version}"; debuild "$@")
+
+popd

linux/debian/scripts/build_all.sh

@@ -3,6 +3,7 @@
 set -e -u
 
 scriptdir=`dirname $0`
+scriptdir=`cd "${scriptdir}" && pwd`
 
 . "${scriptdir}/config.sh"
 
@@ -11,5 +12,9 @@ shift
 
 rm -rf "${BUILDAREA}"
 
+pushd /
+
 "${scriptdir}/build.sh" qtkeychain "${QTKEYCHAIN_TAG}" "${QTKEYCHAIN_VERSION}" "${distribution}" "$@"
 "${scriptdir}/build.sh" nextcloud-client "${NEXTCLOUD_CLIENT_TAG}" "${NEXTCLOUD_CLIENT_VERSION}" "${distribution}" "$@"
+
+popd

linux/debian/scripts/config.sh

@@ -17,7 +17,7 @@ PBUILDER_DEPS="${PBUILDER_ROOT}/deps"
 QTKEYCHAIN_VERSION=0.7.0
 
 # The full version of the qtkeychain package
-QTKEYCHAIN_FULL_VERSION="${QTKEYCHAIN_VERSION}-1.0"
+QTKEYCHAIN_FULL_VERSION="${QTKEYCHAIN_VERSION}-1.0ppa1~@DISTRIBUTION@1"
 
 # The tag of the qtkeychain package
 QTKEYCHAIN_TAG="v${QTKEYCHAIN_VERSION}"
@@ -26,7 +26,10 @@ QTKEYCHAIN_TAG="v${QTKEYCHAIN_VERSION}"
 NEXTCLOUD_CLIENT_VERSION=2.2.4
 
 # The FULL version of the nextcloud-client package
-NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.0"
+NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.2~@DISTRIBUTION@1"
 
 # The tag of the nextcloud-client package
 NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
+
+# The number of CPUs that can be used for paralel builds
+NUMCPUS=4

linux/debian/scripts/create_debdir.sh

@@ -3,6 +3,7 @@
 set -e -u
 
 scriptdir=`dirname $0`
+scriptdir=`cd "${scriptdir}" && pwd`
 
 . "${scriptdir}/config.sh"
 
@@ -48,6 +49,7 @@ rm -rf "${packagedir}"
 mkdir -p "${packagedir}"
 
 echo "Updating submodules"
+commit=`cd "${GITROOTS}/${package}"; git rev-parse HEAD`
 (cd "${GITROOTS}/${package}"; git checkout "${tag}"; git submodule update --recursive --init)
 
 echo "Copying sources"
@@ -61,6 +63,10 @@ else
     tar cjf "${origtar}" -C "${BUILDAREA}" "${package}_${version}"
 fi
 
+echo "Restoring Git state"
+(cd "${GITROOTS}/${package}"; git checkout "${commit}")
+cd "${scriptdir}"
+
 echo "Copying Debian files"
 mkdir -p "${packagedir}/debian"
 tar cf - -C "${scriptdir}/../${package}/debian" . | tar xf - -C "${packagedir}/debian"
@@ -68,5 +74,3 @@ tar cf - -C "${scriptdir}/../${package}/debian" . | tar xf - -C "${packagedir}/d
 if test -d "${scriptdir}/../${package}/debian.${distribution}"; then
     tar cf - -C "${scriptdir}/../${package}/debian.${distribution}" . | tar xf - -C "${packagedir}/debian"
 fi
-
-echo "Applying patches"

linux/debian/scripts/pbuild_all.sh

@@ -3,12 +3,15 @@
 set -e -u
 
 scriptdir=`dirname $0`
+scriptdir=`cd "${scriptdir}" && pwd`
 
 . "${scriptdir}/config.sh"
 
 distribution="${1}"
 shift
 
-"${scriptdir}/build_all.sh" "${distribution}" --build=source "$@"
+pushd /
+"${scriptdir}/build_all.sh" "${distribution}" -S "$@"
 
 "${scriptdir}/pbuilder_all.sh" "${distribution}" "$@"
+popd

linux/debian/scripts/pbuilder_all.sh

@@ -17,7 +17,9 @@ rm -f "${resultdir}/"*
 
 source "${HOME}/.pbuilderrc"
 
-pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" "$@" "${BUILDAREA}/qtkeychain_${QTKEYCHAIN_FULL_VERSION}.dsc"
+dscversion=`echo ${QTKEYCHAIN_FULL_VERSION} | sed "s:@DISTRIBUTION@:${distribution}:g"`
+pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" --debbuildopts "-j${NUMCPUS}" "$@" "${BUILDAREA}/qtkeychain_${dscversion}.dsc"
 cp "${resultdir}/"*.deb "${PBUILDER_DEPS}"
 
-pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" "$@" "${BUILDAREA}/nextcloud-client_${NEXTCLOUD_CLIENT_FULL_VERSION}.dsc"
+dscversion=`echo ${NEXTCLOUD_CLIENT_FULL_VERSION} | sed "s:@DISTRIBUTION@:${distribution}:g"`
+pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" --debbuildopts "-j${NUMCPUS}" "$@" "${BUILDAREA}/nextcloud-client_${dscversion}.dsc"