sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge differences between debian_version_0_1_1_18-rc-1 and debian_version_0_1_1_19-rc-1 from tor-0_1_1-patches into head 

svn:r6443
This commit is contained in:
Peter Palfrader 2006-05-05 15:40:54 +00:00
parent 1fcc12ffff
commit e8e113c6f7
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
tor (0.1.1.19-rc-1) experimental; urgency=low
* New upstream version.
* Remove support for my nodoc DEB_BUILD_OPTIONS variable. It clutters
stuff and I haven't used it in ages.
* Update debian/tor.docs file.
-- Peter Palfrader <weasel@debian.org> Fri, 5 May 2006 16:27:48 +0200
tor (0.1.1.18-rc-1) experimental; urgency=low
* New upstream version.

23
debian/rules vendored
View File

@ -35,11 +35,6 @@ endif
# INSTALL_PROGRAM += -s
#endif
# Prevent the design paper from being built with "nodoc"
ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
BUILD_DOC = no
endif
# Prevent the unit tests from being run with "nocheck"
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
RUN_TEST = no
@ -111,19 +106,7 @@ build-stamp: config.status
fi
# XXX ends
if [ "$(BUILD_DOC)" != "no" ]; then \
make -C doc/design-paper tor-design.ps tor-design.pdf || \
( echo -e "*\n*\n*\n*"; \
echo "* Building some docs failed, perhaps because you did not install the"; \
echo "* declared build dependencies and then used -o with dpkg-buildpackage."; \
echo "*"; \
echo "* If you want to skip this part, you can set nodoc in DEB_BUILD_OPTIONS" ; \
echo "* and start the build again. DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage.."; \
echo -e "*\n*\n*\n*"; \
false ); \
else \
echo -e "\n\nSkipping tor-design.{ps,pdf}\n\n"; \
fi
make -C doc/design-paper tor-design.ps tor-design.pdf
touch build-stamp
@ -173,10 +156,6 @@ binary-arch: build install
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
if [ "$(BUILD_DOC)" != "no" ]; then \
install -m 644 doc/design-paper/tor-design.ps $(CURDIR)/debian/tor/usr/share/doc/tor/; \
install -m 644 doc/design-paper/tor-design.pdf $(CURDIR)/debian/tor/usr/share/doc/tor/; \
fi
dh_installexamples
# dh_install
# dh_installdebconf

8
debian/tor.docs vendored
View File

@ -1,13 +1,15 @@
AUTHORS
debian/README.privoxy
debian/README.Debian
debian/README.privoxy
doc/HACKING
doc/TODO
doc/control-spec.txt
doc/design-paper/tor-design.pdf
doc/design-paper/tor-design.ps
doc/dir-spec.txt
doc/rend-spec.txt
doc/socks-extensions.txt
doc/website/stylesheet.css
doc/website/tor-*
doc/tor-spec.txt
doc/version-spec.txt
doc/website/stylesheet.css
doc/website/tor-*