summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-06-05 23:22:17 +0000
committerPeter Palfrader <peter@palfrader.org>2008-06-05 23:22:17 +0000
commitcd6f5302968a67f171d7148bf1e2f1041a5e119b (patch)
treeb5fa7783ed3e3ee56f579e6d632c41c11fd2b406
parent574f265faf4f3388d8645870ce775b40cefa59dc (diff)
downloadtor-cd6f5302968a67f171d7148bf1e2f1041a5e119b.tar.gz
tor-cd6f5302968a67f171d7148bf1e2f1041a5e119b.zip
Do not ship a copy of the changelog in tor-geoipdb package. That's another 100kb right there
svn:r14978
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules7
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index a8c9fd38d0..778d855049 100644
--- a/debian/control
+++ b/debian/control
@@ -61,6 +61,7 @@ Description: debugging symbols for Tor
Package: tor-geoipdb
Architecture: all
Priority: extra
+Depends: tor (>= ${source:Version})
Description: geoIP database for Tor
This package provides a geoIP database for Tor, i.e. it maps IPv4 addresses
to countries.
diff --git a/debian/rules b/debian/rules
index 3d38b4f229..22854a5979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -156,12 +156,17 @@ install: build
rm -f $(CURDIR)/debian/tor/usr/bin/tor-control.py
+ # tor-dbg doc dir
install -d -m 755 $(CURDIR)/debian/tor-dbg/usr/share/doc
ln -s tor $(CURDIR)/debian/tor-dbg/usr/share/doc/tor-dbg
+ # tor-geoip
mv $(CURDIR)/debian/tor/usr/share/tor/geoip $(CURDIR)/debian/tor-geoipdb/usr/share/tor
rmdir $(CURDIR)/debian/tor/usr/share/tor || true
+ install -d -m 755 $(CURDIR)/debian/tor-geoipdb/usr/share/doc/tor-geoipdb
+ 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
# Build architecture-independent files here.
binary-indep: build install
@@ -171,7 +176,7 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+ dh_installchangelogs --package=tor ChangeLog
dh_installdocs
dh_installexamples
# dh_install