[Pkg-owncloud-commits] [owncloud-client] 01/02: Updated 0004-debian_version.patch
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Feb 24 20:32:28 UTC 2014
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 7587ad786879035c2de946914423bea45955ba36
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Mon Feb 24 21:29:19 2014 +0100
Updated 0004-debian_version.patch
---
debian/patches/0004-debian_version.patch | 67 ++++++++++++++++++++++----------
debian/rules | 6 ++-
2 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/debian/patches/0004-debian_version.patch b/debian/patches/0004-debian_version.patch
index 916dec7..b11e650 100644
--- a/debian/patches/0004-debian_version.patch
+++ b/debian/patches/0004-debian_version.patch
@@ -5,8 +5,8 @@ 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-17 18:20:11.286787740 +0100
-+++ owncloud-client/VERSION.cmake 2014-02-21 20:06:23.704900132 +0100
+--- 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 )
@@ -17,41 +17,66 @@ Index: owncloud-client/VERSION.cmake
if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
Index: owncloud-client/OWNCLOUD.cmake
===================================================================
---- owncloud-client.orig/OWNCLOUD.cmake 2014-02-17 18:20:11.286787740 +0100
-+++ owncloud-client/OWNCLOUD.cmake 2014-02-21 22:44:39.087466390 +0100
-@@ -1,7 +1,8 @@
- set( APPLICATION_NAME "ownCloud" )
+--- owncloud-client.orig/OWNCLOUD.cmake 2014-02-24 20:34:20.082416525 +0100
++++ owncloud-client/OWNCLOUD.cmake 2014-02-24 20:45:35.701682285 +0100
+@@ -2,6 +2,8 @@
#set( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
set( APPLICATION_EXECUTABLE "owncloud" )
--set( APPLICATION_DOMAIN "owncloud.com" )
-+set( APPLICATION_URL "http://packages.qa.debian.org/o/owncloud-client.html" )
-+set( APPLICATION_DOMAIN "PTS owncloud-client" )
+ set( APPLICATION_DOMAIN "owncloud.com" )
++set( DEBIAN_URL "http://packages.qa.debian.org/o/owncloud-client.html" )
++set( DEBIAN_DOMAIN "PTS owncloud-client" )
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-02-06 12:44:40.405346388 +0100
-+++ owncloud-client/src/mirall/owncloudtheme.cpp 2014-02-21 22:45:07.024370531 +0100
-@@ -61,7 +61,7 @@
+--- owncloud-client.orig/src/mirall/owncloudtheme.cpp 2014-02-24 20:34:20.082416525 +0100
++++ owncloud-client/src/mirall/owncloudtheme.cpp 2014-02-24 20:41:36.912948743 +0100
+@@ -60,9 +60,9 @@
+ "Based on Mirall by Duncan Mac-Vicar P.</small></p>"
"%7"
)
- .arg(MIRALL_VERSION_STRING)
+- .arg(MIRALL_VERSION_STRING)
- .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
-+ .arg(MIRALL_STRINGIFY(APPLICATION_URL))
- .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN))
+- .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN))
++ .arg(DEBIAN_VERSION)
++ .arg(MIRALL_STRINGIFY(DEBIAN_URL))
++ .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN))
.arg(devString);
+ }
Index: owncloud-client/src/mirall/theme.cpp
===================================================================
---- owncloud-client.orig/src/mirall/theme.cpp 2014-02-17 18:20:11.316787975 +0100
-+++ owncloud-client/src/mirall/theme.cpp 2014-02-21 22:45:32.817923143 +0100
-@@ -207,7 +207,7 @@
- "<p>Distributed by %4 and licensed under the GNU Public License (GPL) Version 2.0.<br>"
+--- 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>"
"%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_VERSION_STRING).arg(MIRALL_STRINGIFY(APPLICATION_URL))
- .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
+- .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
++ .arg(DEBIAN_VERSION).arg(MIRALL_STRINGIFY(DEBIAN_URL))
++ .arg(MIRALL_STRINGIFY(DEBIAN_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
}
+ QVariant Theme::customMedia( CustomMediaType type )
+Index: owncloud-client/config.h.in
+===================================================================
+--- owncloud-client.orig/config.h.in 2014-02-17 18:20:11.286787740 +0100
++++ owncloud-client/config.h.in 2014-02-24 21:18:14.033480075 +0100
+@@ -19,6 +19,11 @@
+ #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
+ #cmakedefine DATADIR "@DATADIR@"
+
++//debian specific
++#cmakedefine DEBIAN_VERSION "@DEBIAN_VERSION@"
++#cmakedefine DEBIAN_URL "@DEBIAN_URL@"
++#cmakedefine DEBIAN_DOMAIN "@DEBIAN_DOMAIN@"
++
+ #ifndef NEON_WITH_LFS
+ #cmakedefine NEON_WITH_LFS "@NEON_WITH_LFS@"
+ #endif
diff --git a/debian/rules b/debian/rules
index 352a439..2456aeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
export CSYNC_DIR=/usr/include/ocsync
export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+
%:
dh $@ --parallel --with sphinxdoc --with pkgkde_symbolshelper
@@ -13,10 +15,10 @@ override_dh_auto_test:
rm -r obj-$(DEB_HOST_GNU_TYPE)/config
override_dh_auto_configure-arch:
- dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DUNIT_TESTING=ON
+ dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DUNIT_TESTING=ON -DDEBIAN_VERSION=$(DEBVERS)
override_dh_auto_configure-indep:
- dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DWITH_DOC=ON -DUNIT_TESTING=ON
+ dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DWITH_DOC=ON -DUNIT_TESTING=ON -DDEBIAN_VERSION=$(DEBVERS)
override_dh_install:
dh_install --list-missing \
--
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