* Ship AUTHORS, doc/CLIENTS, doc/FAQ, doc/HACKING, doc/TODO, doc/tor-doc.{css,html}, doc/{rend,tor}-spec.txt with the binary package.

* Build tor-design.{pdf,ps}, wich adds new build-dependencies: tetex-{bin,extra}, transfig, and gs.
* Support DEB_BUILD_OPTIONS option 'nodoc' to skip building tor-design.  With nodoc the build will not need tetex-{bin,extra}, transfig, and gs.
* Support DEB_BUILD_OPTIONS option 'nocheck' to skip unittests ('notest' is an alias')


svn:r2170
This commit is contained in:
Peter Palfrader 2004-08-06 21:31:01 +00:00
parent 13ff77508e
commit bd24c68a58
4 changed files with 64 additions and 2 deletions

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
tor (0.0.7.2+0.0.8pre3-0) unstable; urgency=low
* Ship AUTHORS, doc/CLIENTS, doc/FAQ, doc/HACKING, doc/TODO,
doc/tor-doc.{css,html}, doc/{rend,tor}-spec.txt with the binary package.
* Build tor-design.{pdf,ps}, wich adds new build-dependencies:
tetex-{bin,extra}, transfig, and gs.
* Support DEB_BUILD_OPTIONS option 'nodoc' to skip building tor-design.
With nodoc the build will not need tetex-{bin,extra}, transfig, and gs.
* Support DEB_BUILD_OPTIONS option 'nocheck' to skip unittests
('notest' is an alias')
-- Peter Palfrader <weasel@debian.org> Fri, 6 Aug 2004 23:27:55 +0200
tor (0.0.7.2+0.0.8pre2-1) unstable; urgency=low
* New upstream (pre)release.

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: tor
Section: comm
Priority: optional
Maintainer: Peter Palfrader <weasel@debian.org>
Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch
Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, tetex-bin, tetex-extra, transfig, gs
Standards-Version: 3.6.1
Package: tor

42
debian/rules vendored
View File

@ -16,15 +16,31 @@ CFLAGS = -Wall -g
export PACKAGE=tor
include /usr/share/dpatch/dpatch.make
# Do not optimize the build with "noopt"
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
# Do not strip the binary with "nostrip"
#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
# 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
endif
ifneq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))
RUN_TEST = no
endif
configure: patch-stamp
config.status: configure
dh_testdir
@ -46,9 +62,29 @@ build-stamp: config.status
$(MAKE)
@echo
@echo
src/or/test
# Running unit tests
if [ "$(RUN_TEST)" != "no" ]; then \
src/or/test; \
else \
echo -e "\n\nSkipping unittests\n\n"; \
fi
@echo
# make design paper
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
touch build-stamp
clean: unpatch
@ -90,6 +126,10 @@ 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/; \
install -m 644 doc/design-paper/tor-design.pdf $(CURDIR)/debian/tor/usr/share/doc/; \
fi
dh_installexamples
# dh_install
# dh_installdebconf

9
debian/tor.docs vendored
View File

@ -1,3 +1,12 @@
AUTHORS
README
INSTALL
debian/README.privoxy
doc/CLIENTS
doc/FAQ
doc/HACKING
doc/TODO
doc/tor-doc.css
doc/tor-doc.html
doc/rend-spec.txt
doc/tor-spec.txt