[Pkg-owncloud-commits] [owncloud-client] 37/38: cleanup debian/rules

Sandro Knauß hefee-guest at moszumanska.debian.org
Fri Sep 5 20:20:58 UTC 2014


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

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

commit b29555cbe4c2fa318cc138672eeaf9c31dc6f723
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Aug 29 23:15:47 2014 +0200

    cleanup debian/rules
    
    Conflicts:
    	debian/rules
---
 debian/rules | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index b78b695..7aa9c62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-export CSYNC_DIR=/usr/include/ocsync
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
 DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 
 %:
@@ -18,15 +16,19 @@ else
 	@echo "** tests disabled"
 endif
 
-override_dh_auto_configure-arch:
+override_dh_auto_configure:
 	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 -DDEBIAN_VERSION=$(DEBVERS)
+override_dh_auto_build:
+	dh_auto_build -- doc
+	dh_auto_build --
+
+override_dh_auto_build-indep:
+	dh_auto_build -- doc
 
 override_dh_auto_build-arch:
-	dh_auto_build --
 	dh_auto_build -- doc-man
+	dh_auto_build --
 
 override_dh_install:
 	dh_install --list-missing \
@@ -38,4 +40,3 @@ override_dh_install:
 
 override_dh_sphinxdoc-arch:
 
-build: build-indep

-- 
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