[Pkg-owncloud-commits] [owncloud-client] 498/498: update patch hunks

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:23 UTC 2015 

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 3e370770d2998dc54b8946625c818b4bc459e6e2
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Aug 11 15:02:43 2015 +0200

    update patch hunks
---
 debian/patches/0002-debian_version.patch    | 16 ++++++++--------
 debian/patches/0005-remove_admin.patch      |  8 ++++----
 debian/patches/0006-move-configfile.patch   | 14 +++++++-------
 debian/patches/0007-move-translations.patch | 18 +++++++++---------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0002-debian_version.patch b/debian/patches/0002-debian_version.patch
index 1ad9851..7fd91c3 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	2015-08-07 08:37:32.631561883 +0200
-+++ owncloud-client/OWNCLOUD.cmake	2015-08-07 08:37:32.628228515 +0200
+--- owncloud-client.orig/OWNCLOUD.cmake	2015-08-11 14:53:31.218998628 +0200
++++ owncloud-client/OWNCLOUD.cmake	2015-08-11 14:53:31.208998521 +0200
 @@ -1,6 +1,8 @@
  set( APPLICATION_NAME       "ownCloud" )
  set( APPLICATION_EXECUTABLE "owncloud" )
@@ -19,11 +19,11 @@ Index: owncloud-client/OWNCLOUD.cmake
  
 Index: owncloud-client/config.h.in
 ===================================================================
---- owncloud-client.orig/config.h.in	2015-08-07 08:37:32.631561883 +0200
-+++ owncloud-client/config.h.in	2015-08-07 08:37:32.628228515 +0200
-@@ -24,6 +24,11 @@
+--- owncloud-client.orig/config.h.in	2015-08-11 14:53:31.218998628 +0200
++++ owncloud-client/config.h.in	2015-08-11 14:53:31.208998521 +0200
+@@ -23,6 +23,11 @@
  #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
- #cmakedefine DATADIR "@DATADIR@"
+ #cmakedefine SHAREDIR "@SHAREDIR@"
  
 +//debian specific
 +#cmakedefine DEBIAN_VERSION "@DEBIAN_VERSION@"
@@ -35,8 +35,8 @@ Index: owncloud-client/config.h.in
  #endif
 Index: owncloud-client/src/libsync/owncloudtheme.cpp
 ===================================================================
---- owncloud-client.orig/src/libsync/owncloudtheme.cpp	2015-08-07 08:37:32.631561883 +0200
-+++ owncloud-client/src/libsync/owncloudtheme.cpp	2015-08-07 08:37:32.628228515 +0200
+--- owncloud-client.orig/src/libsync/owncloudtheme.cpp	2015-08-11 14:53:31.218998628 +0200
++++ owncloud-client/src/libsync/owncloudtheme.cpp	2015-08-11 14:53:31.208998521 +0200
 @@ -52,9 +52,9 @@
                 "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
                 "Inc. in the United States, other countries, or both.</p>"
diff --git a/debian/patches/0005-remove_admin.patch b/debian/patches/0005-remove_admin.patch
index 29e6aa4..6b4c733 100644
--- a/debian/patches/0005-remove_admin.patch
+++ b/debian/patches/0005-remove_admin.patch
@@ -8,12 +8,12 @@ Last-Update: 2014-10-11
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/CMakeLists.txt
 ===================================================================
---- owncloud-client.orig/CMakeLists.txt	2015-03-22 14:28:56.619942175 +0100
-+++ owncloud-client/CMakeLists.txt	2015-03-22 14:28:56.613275444 +0100
-@@ -194,7 +194,6 @@
- if(NOT BUILD_LIBRARIES_ONLY)
+--- owncloud-client.orig/CMakeLists.txt	2015-08-11 14:54:15.076132620 +0200
++++ owncloud-client/CMakeLists.txt	2015-08-11 14:54:38.146378566 +0200
+@@ -203,7 +203,6 @@
  add_subdirectory(shell_integration)
  add_subdirectory(doc)
+ add_subdirectory(doc/dev)
 -add_subdirectory(admin)
  endif(NOT BUILD_LIBRARIES_ONLY)
  
diff --git a/debian/patches/0006-move-configfile.patch b/debian/patches/0006-move-configfile.patch
index e6e4e02..054fc97 100644
--- a/debian/patches/0006-move-configfile.patch
+++ b/debian/patches/0006-move-configfile.patch
@@ -8,11 +8,11 @@ Last-Update: 2015-03-22
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/CMakeLists.txt
 ===================================================================
---- owncloud-client.orig/CMakeLists.txt	2015-08-07 08:37:42.608330461 +0200
-+++ owncloud-client/CMakeLists.txt	2015-08-07 08:37:42.601663726 +0200
-@@ -205,6 +205,6 @@
- if(BUILD_OWNCLOUD_OSX_BUNDLE)
+--- owncloud-client.orig/CMakeLists.txt	2015-08-11 14:55:10.813393624 +0200
++++ owncloud-client/CMakeLists.txt	2015-08-11 14:55:10.806726886 +0200
+@@ -215,6 +215,6 @@
      install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
+     configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
  else()
 -    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
 +    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_EXECUTABLE}-client )
@@ -20,9 +20,9 @@ Index: owncloud-client/CMakeLists.txt
  endif()
 Index: owncloud-client/src/libsync/configfile.cpp
 ===================================================================
---- owncloud-client.orig/src/libsync/configfile.cpp	2015-08-07 08:37:42.608330461 +0200
-+++ owncloud-client/src/libsync/configfile.cpp	2015-08-07 08:37:42.601663726 +0200
-@@ -260,7 +260,7 @@
+--- owncloud-client.orig/src/libsync/configfile.cpp	2015-08-11 14:55:10.813393624 +0200
++++ owncloud-client/src/libsync/configfile.cpp	2015-08-11 14:55:10.806726886 +0200
+@@ -263,7 +263,7 @@
      fi.setFile( QCoreApplication::applicationDirPath(), exclFile );
  #endif
  #ifdef Q_OS_UNIX
diff --git a/debian/patches/0007-move-translations.patch b/debian/patches/0007-move-translations.patch
index e4853c1..ee2a8b4 100644
--- a/debian/patches/0007-move-translations.patch
+++ b/debian/patches/0007-move-translations.patch
@@ -9,27 +9,27 @@ Last-Update: 2015-03-22
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/src/gui/application.cpp
 ===================================================================
---- owncloud-client.orig/src/gui/application.cpp	2015-05-01 13:20:02.394608675 +0200
-+++ owncloud-client/src/gui/application.cpp	2015-05-01 13:20:02.384608585 +0200
+--- owncloud-client.orig/src/gui/application.cpp	2015-08-11 14:55:26.323559095 +0200
++++ owncloud-client/src/gui/application.cpp	2015-08-11 14:57:07.117968626 +0200
 @@ -76,7 +76,7 @@
  #elif defined(Q_OS_MAC)
      return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
  #elif defined(Q_OS_UNIX)
--    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "/i18n/");
-+    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "-client/i18n/");
+-    return QString::fromLatin1(SHAREDIR "/" APPLICATION_EXECUTABLE "/i18n/");
++    return QString::fromLatin1(SHAREDIR "/" APPLICATION_EXECUTABLE "-client/i18n/");
  #endif
  }
  }
 Index: owncloud-client/src/gui/CMakeLists.txt
 ===================================================================
---- owncloud-client.orig/src/gui/CMakeLists.txt	2015-05-01 13:20:02.394608675 +0200
-+++ owncloud-client/src/gui/CMakeLists.txt	2015-05-01 13:20:02.384608585 +0200
-@@ -204,7 +204,7 @@
+--- owncloud-client.orig/src/gui/CMakeLists.txt	2015-08-11 14:55:26.323559095 +0200
++++ owncloud-client/src/gui/CMakeLists.txt	2015-08-11 14:58:11.568657552 +0200
+@@ -222,7 +222,7 @@
          endforeach( _file )
      endif(NOT WIN32)
  
--    install(FILES ${client_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n)
-+    install(FILES ${client_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}-client/i18n)
+-    install(FILES ${client_I18N} DESTINATION ${DATADIR}/${APPLICATION_EXECUTABLE}/i18n)
++    install(FILES ${client_I18N} DESTINATION ${DATADIR}/${APPLICATION_EXECUTABLE}-client/i18n)
  
      # we may not add MACOSX_BUNDLE here, if not building one
  

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

More information about the Pkg-owncloud-commits mailing list