X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=dafdc009c92d620bf9c21b406bb222b524810fe2;hb=HEAD;hp=bf6e7a269ec5a6ee3a15f43eda27f1a92e3db939;hpb=2b29149302913db94b95cf51559dafbbea3e8600;p=pkg-tig.git

diff --git a/debian/rules b/debian/rules
index bf6e7a2..92ca06f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
-# debian/ruls for tig
+# debian/rules for tig
 #
-# Written by Sebastian Harl <sh@tokkee.org>
+# Written by Sebastian Harl <tokkee@debian.org>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -11,21 +11,25 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g -I/usr/include/ncursesw
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS  += -Wall -g -I/usr/include/ncursesw
+
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+
+LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
 
 config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc \
-		CFLAGS="$(CFLAGS)" LIBS="-lncursesw"
+		CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+build: build-arch build-indep
 
-build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: config.status
 	dh_testdir
@@ -42,23 +46,28 @@ clean:
 	$(MAKE) clean
 	
 	rm -f config.h config.log config.make config.status
-	rm -rf manual.html-chunked/
-	rm -f manual.pdf manual.html manual.toc
-	rm -f tig.1 tig.1.html tigrc.5 tigrc.5.html
+	rm -rf doc/manual.html-chunked/
+	rm -f doc/manual.pdf doc/manual.html doc/manual.toc doc/manual.tex
+	rm -f doc/tigmanual.7
+	rm -f doc/tig.1 doc/tig.1.html doc/tigrc.5 doc/tigrc.5.html
+	rm -f INSTALL.html NEWS.html README.html
 	
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	
 	$(MAKE) install install-doc DESTDIR=$(CURDIR)/debian/tig
+	# don't ship install instructions; README only links to them
+	rm -f debian/tig/usr/share/doc/tig/INSTALL.html \
+		debian/tig/usr/share/doc/tig/README.html
 	
-	mkdir -p debian/tig/etc/bash_completion.d
-	cp contrib/tig-completion.bash debian/tig/etc/bash_completion.d/tig
-	chmod 644 debian/tig/etc/bash_completion.d/tig
+	mkdir -p debian/tig/usr/share/bash-completion/completions
+	cp contrib/tig-completion.bash debian/tig/usr/share/bash-completion/completions/tig
+	chmod 644 debian/tig/usr/share/bash-completion/completions/tig
 
 binary-indep:
 	# nothing to do here
@@ -66,9 +75,9 @@ binary-indep:
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	dh_installdocs BUGS TODO manual.pdf
-	dh_installexamples contrib/tigrc
+	dh_installchangelogs NEWS.adoc
+	dh_installdocs doc/manual.pdf
+	dh_installexamples contrib/*.tigrc
 	dh_link
 	dh_strip
 	dh_compress -X.pdf
@@ -80,5 +89,5 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install