[Pkg-owncloud-commits] [owncloud-client] 01/03: Proofread patch

[David Prévot]

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

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

commit e02c9841721380df6158126c56eb09801aa915b6
Author: David Prévot <taffit at debian.org>
Date:   Mon Feb 24 19:08:49 2014 -0400

    Proofread patch
    
    Git-Dch: Ignore
---
 debian/patches/0004-debian_version.patch | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0004-debian_version.patch b/debian/patches/0004-debian_version.patch
index b11e650..8be62c8 100644
--- a/debian/patches/0004-debian_version.patch
+++ b/debian/patches/0004-debian_version.patch
@@ -1,20 +1,7 @@
-Description: Added a version tag to label this version as a debion build.
+Description: Added a version tag to label this version as a Debian build
 Author: Sandro Knauß<bugs at sandroknauss.de>
 Last-Update: 2014-02-21
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/VERSION.cmake
-===================================================================
---- owncloud-client.orig/VERSION.cmake	2014-02-24 20:34:20.082416525 +0100
-+++ owncloud-client/VERSION.cmake	2014-02-24 20:34:20.069083072 +0100
-@@ -1,6 +1,7 @@
- set( MIRALL_VERSION_MAJOR 1 )
- set( MIRALL_VERSION_MINOR 5 )
- set( MIRALL_VERSION_PATCH 1 )
-+set( MIRALL_VERSION_SUFFIX +deb8u1)
- set( MIRALL_SOVERSION 0 )
- 
- if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
 Index: owncloud-client/OWNCLOUD.cmake
 ===================================================================
 --- owncloud-client.orig/OWNCLOUD.cmake	2014-02-24 20:34:20.082416525 +0100
@@ -23,8 +10,8 @@ Index: owncloud-client/OWNCLOUD.cmake
  #set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
  set( APPLICATION_EXECUTABLE "owncloud" )
  set( APPLICATION_DOMAIN     "owncloud.com" )
-+set( DEBIAN_URL     "http://packages.qa.debian.org/o/owncloud-client.html" )
-+set( DEBIAN_DOMAIN     "PTS owncloud-client" )
++set( DEBIAN_URL        "https://packages.debian.org/unstable/owncloud-client" )
++set( DEBIAN_DOMAIN     "packages.debian.org/owncloud-client" )
  set( APPLICATION_VENDOR     "ownCloud" )
  set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
  
@@ -40,7 +27,7 @@ Index: owncloud-client/src/mirall/owncloudtheme.cpp
 -            .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
 -            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN))
 +            .arg(DEBIAN_VERSION)
-+            .arg(MIRALL_STRINGIFY(DEBIAN_URL))
++            .arg(DEBIAN_URL)
 +            .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN))
              .arg(devString);
  
@@ -49,17 +36,13 @@ Index: owncloud-client/src/mirall/theme.cpp
 ===================================================================
 --- owncloud-client.orig/src/mirall/theme.cpp	2014-02-24 20:34:20.082416525 +0100
 +++ owncloud-client/src/mirall/theme.cpp	2014-02-24 20:44:40.034536147 +0100
-@@ -204,11 +204,11 @@
- {
-     return tr("<p>Version %1 For more information please visit <a href='%2'>%3</a>.</p>"
-               "<p>Copyright ownCloud, Inc.<p>"
--              "<p>Distributed by %4 and licensed under the GNU Public License (GPL) Version 2.0.<br>"
-+              "<p>Distributed by debian and licensed under the GNU Public License (GPL) Version 2.0.<br>"
+@@ -207,8 +207,8 @@
+               "<p>Distributed by %4 and licensed under the GNU Public License (GPL) Version 2.0.<br>"
                "%5 and the %5 logo are registered trademarks of %4 in the<br>"
                "United States, other countries, or both.</p>")
 -            .arg(MIRALL_VERSION_STRING).arg("http://"MIRALL_STRINGIFY(APPLICATION_DOMAIN))
 -            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
-+            .arg(DEBIAN_VERSION).arg(MIRALL_STRINGIFY(DEBIAN_URL))
++            .arg(DEBIAN_VERSION).arg(DEBIAN_URL)
 +            .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
  }
  

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