Commit d7fe0533 authored Sep 22, 2012 by Peter Palfrader

Use dh_lintian to install the override file for tor-geoipdb

parent d492d5db

debian/changelog

+4 −1

Original line number	Diff line number	Diff line
		@@ -5,8 +5,11 @@ tor (0.2.4.2-alpha-X) XXperimental; urgency=low
		* Update and fix a minor whitespace issue in
		debian/patches/14_fix_geoip_warning.
		* remove obsolete debian/TODO file.
		* Use dh_lintian to install the override file for tor-geoipdb. Requires
		changing debhelper build dependency to >= 6 from >= 5, and renaming
		debian/tor-geoipdb.lintian-override to tor-geoipdb.lintian-overrides.

		-- Peter Palfrader <weasel@debian.org> Wed, 19 Sep 2012 10:39:19 +0200
		-- Peter Palfrader <weasel@debian.org> Sat, 22 Sep 2012 10:15:26 +0200

		tor (0.2.4.2-alpha-1) experimental; urgency=low

debian/control

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ Source: tor
		Section: net
		Priority: optional
		Maintainer: Peter Palfrader <weasel@debian.org>
		Build-Depends: debhelper (>= 5), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), hardening-includes, asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor
		Build-Depends: debhelper (>= 6), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), hardening-includes, asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor
		Standards-Version: 3.8.1
		Homepage: https://www.torproject.org/
		Vcs-Git: https://git.torproject.org/debian/tor.git

debian/rules

+1 −2

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ install: build
		dh_testroot
		dh_clean -k
		dh_installdirs
		dh_lintian

		$(MAKE) install DESTDIR=$(CURDIR)/debian/tor
		# move tor to where it belongs
		@@ -171,8 +172,6 @@ install: build
		ln -s ../tor/changelog.gz $(CURDIR)/debian/tor-geoipdb/usr/share/doc/tor-geoipdb
		ln -s ../tor/changelog.Debian.gz $(CURDIR)/debian/tor-geoipdb/usr/share/doc/tor-geoipdb

		install -m 644 debian/tor-geoipdb.lintian-override $(CURDIR)/debian/tor-geoipdb/usr/share/lintian/overrides/tor-geoipdb

		# Must not depend on anything. This is to be called by
		# binary-arch/binary-indep
		# in another 'make' thread.

debian/tor-geoipdb.dirs

+0 −1

Original line number	Diff line number	Diff line
		usr/share/tor
		usr/share/lintian/overrides

debian/tor-geoipdb.lintian-override→debian/tor-geoipdb.lintian-overrides

+0 −0

File moved.