[Pkg-owncloud-commits] [owncloud-client] 114/115: update 0002-debian_version.patch in new environment

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 7254310d3e465fd66447ddef8831ba39b9b9723e
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Aug 29 23:52:25 2014 +0200

    update 0002-debian_version.patch in new environment
---
 debian/patches/0002-debian_version.patch | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0002-debian_version.patch b/debian/patches/0002-debian_version.patch
index 094b6de..c017408 100644
--- a/debian/patches/0002-debian_version.patch
+++ b/debian/patches/0002-debian_version.patch
@@ -6,8 +6,8 @@ Last-Update: 2014-02-21
 ---
 Index: owncloud-client/OWNCLOUD.cmake
 ===================================================================
---- owncloud-client.orig/OWNCLOUD.cmake	2014-07-01 13:06:20.870049669 +0200
-+++ owncloud-client/OWNCLOUD.cmake	2014-07-01 13:06:20.853382628 +0200
+--- owncloud-client.orig/OWNCLOUD.cmake	2014-08-29 23:47:12.017385588 +0200
++++ owncloud-client/OWNCLOUD.cmake	2014-08-29 23:47:12.004051521 +0200
 @@ -2,6 +2,8 @@
  #set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
  set( APPLICATION_EXECUTABLE "owncloud" )
@@ -17,27 +17,10 @@ Index: owncloud-client/OWNCLOUD.cmake
  set( APPLICATION_VENDOR     "ownCloud" )
  set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
  
-Index: owncloud-client/src/mirall/owncloudtheme.cpp
-===================================================================
---- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-07-01 13:06:20.870049669 +0200
-+++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-07-01 13:06:20.856716036 +0200
-@@ -63,9 +63,9 @@
-                "Based on Mirall by Duncan Mac-Vicar P.</small></p>"
-                "%7"
-                )
--            .arg(MIRALL_VERSION_STRING)
--            .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
--            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN))
-+            .arg(DEBIAN_VERSION)
-+            .arg(DEBIAN_URL)
-+            .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN))
-             .arg(devString);
- 
- }
 Index: owncloud-client/config.h.in
 ===================================================================
---- owncloud-client.orig/config.h.in	2014-07-01 13:06:20.870049669 +0200
-+++ owncloud-client/config.h.in	2014-07-01 13:06:20.860049445 +0200
+--- owncloud-client.orig/config.h.in	2014-08-29 23:47:12.017385588 +0200
++++ owncloud-client/config.h.in	2014-08-29 23:47:12.007385038 +0200
 @@ -19,6 +19,11 @@
  #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
  #cmakedefine DATADIR "@DATADIR@"
@@ -50,3 +33,20 @@ Index: owncloud-client/config.h.in
  #ifndef NEON_WITH_LFS
  #cmakedefine NEON_WITH_LFS "@NEON_WITH_LFS@"
  #endif
+Index: owncloud-client/src/mirall/owncloudtheme.cpp
+===================================================================
+--- owncloud-client.orig/src/mirall/owncloudtheme.cpp	2014-08-29 23:47:12.017385588 +0200
++++ owncloud-client/src/mirall/owncloudtheme.cpp	2014-08-29 23:48:19.360676820 +0200
+@@ -54,9 +54,9 @@
+                "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
+                "Inc. in the United States, other countries, or both</p>"
+                )
+-            .arg(MIRALL_VERSION_STRING)
+-            .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
+-            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN));
++            .arg(DEBIAN_VERSION)
++            .arg(DEBIAN_URL)
++            .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN));
+ 
+     devString += gitSHA1();
+     return devString;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git