[Pkg-owncloud-commits] [owncloud-client] 25/27: Deleted upstream applied patch

[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 ba4f87e0d50337afa9833d5cd8f2c535fddf6074
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Aug 28 02:23:35 2015 +0200

    Deleted upstream applied patch
---
 debian/patches/series                              |  1 -
 .../patches/upstream_fix_constants_for_32bit.patch | 29 ----------------------
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 689dfdd..4893992 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
 0006-move-configfile.patch
 0007-move-translations.patch
 0008-make-reproducable.patch
-upstream_fix_constants_for_32bit.patch
diff --git a/debian/patches/upstream_fix_constants_for_32bit.patch b/debian/patches/upstream_fix_constants_for_32bit.patch
deleted file mode 100644
index c463b06..0000000
--- a/debian/patches/upstream_fix_constants_for_32bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 6c5328e4cacc9aa8fbc6f96b5781266a84a1cbdc
-Author: Christian Kamm <mail at ckamm.de>
-Date:   Mon Aug 24 13:56:10 2015 +0200
-
-    Utility: Fix constants for 32-bit arch #3670
-
-diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
-index 9504ca7..5babf16 100644
---- a/src/libsync/utility.cpp
-+++ b/src/libsync/utility.cpp
-@@ -301,12 +301,12 @@ QString Utility::durationToDescriptiveString(quint64 msecs)
- {
-     struct Period { const char *name; quint64 msec; };
-     Q_DECL_CONSTEXPR Period periods[] = {
--        { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000L },
--        { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000L },
--        { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000L },
--        { QT_TRANSLATE_NOOP("Utility", "%Ln hour(s)") , 3600*1000L },
--        { QT_TRANSLATE_NOOP("Utility", "%Ln minute(s)") , 60*1000L },
--        { QT_TRANSLATE_NOOP("Utility", "%Ln second(s)") , 1000L },
-+        { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000LL },
-+        { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000LL },
-+        { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000LL },
-+        { QT_TRANSLATE_NOOP("Utility", "%Ln hour(s)") , 3600*1000LL },
-+        { QT_TRANSLATE_NOOP("Utility", "%Ln minute(s)") , 60*1000LL },
-+        { QT_TRANSLATE_NOOP("Utility", "%Ln second(s)") , 1000LL },
-         { 0, 0 }
-     };
- 

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