# # # patch "debian/changelog" # from [d257d7d590a3e97c4b5ac0c9a42a89813db36221] # to [6df21f6d924b1a2b26efe10ac3fc341d38d25c2f] # # patch "debian/mtn.1" # from [f492970c31ff65477dcf51f7b7af336ec02023a4] # to [4a99c4a8599c6de310996bdff2c4f69dc1972b18] # # patch "debian/rules" # from [da3d4045eb1a244fad05b09f897c9e6577af1c1a] # to [6e94753c65c9264f4290b8da9949fa91b7544225] # ============================================================ --- debian/changelog d257d7d590a3e97c4b5ac0c9a42a89813db36221 +++ debian/changelog 6df21f6d924b1a2b26efe10ac3fc341d38d25c2f @@ -1,9 +1,10 @@ monotone (0.37-2) unstable; urgency=low monotone (0.37-2) unstable; urgency=low * Do not error out if $HOME exists but is inaccessible. Should fix mips(el) FTBFS. * Fix bashisms in monotone-server scripts. Thanks to Glen Ditchfield for finding this problem and providing part of the fix. + (Closes: #450646) * In monotone-server.postinst, set permissions and ownership of just-created directories whether or not we created the monotone user. Thanks to Michael Berg for doing almost all the work on @@ -16,10 +17,12 @@ monotone (0.37-2) unstable; urgency=low and monkey with the rules so that dpkg-buildpackage -B doesn't build the documentation. This gets us out from under the present nonavailability of some of the B-D-Is on some of the buildds. + Cross-compilation and lintian fixes. * Info files moved to monotone-doc. Other cleanups to that package. * Do not install the boilerplate ABOUT-NLS file in any of the packages' documentation directories. * Improve short descriptions. + * Clean up usage of "-" in debian/mtn.1. -- Zack Weinberg Sun, 04 Nov 2007 11:53:17 -0800 ============================================================ --- debian/mtn.1 f492970c31ff65477dcf51f7b7af336ec02023a4 +++ debian/mtn.1 4a99c4a8599c6de310996bdff2c4f69dc1972b18 @@ -5,15 +5,15 @@ mtn \- distributed version control syste \fBmtn\fP \fI[options] [parameters]\fP .SH WARNING .P -This manpage is not well-maintained; it is a summary of monotone's +This manpage is not well\(hymaintained; it is a summary of monotone's capabilities, and probably contains inaccuracies. For the complete, accurate manual, including tutorial, concepts, and full reference documentation, please use \fBinfo monotone\fP or refer to \fBhttp://monotone.ca/docs/\fP. (On Debian systems, a local copy of -the HTML manual is available in the \fBmonotone-doc\fP package as -\fB/usr/share/doc/monotone-doc/monotone.html\fP, along with a +the HTML manual is available in the \fBmonotone\-doc\fP package as +\fB/usr/share/doc/monotone\-doc/html/index.html\fP, along with a printable PDF copy.) The developers will gratefully accept patches to -arrange that this manpage, the \fI--help\fP output, and the main +arrange that this manpage, the \fI\-\-help\fP output, and the main manual are kept in sync mechanically. .SH DESCRIPTION .P @@ -22,10 +22,10 @@ operations are authenticated by individu describe the location of files in a tree. Unlike other systems, versions in monotone are \fIidentified\fP by cryptographic hash, and operations are authenticated by individual users' evaluating -cryptographic signatures on meta-data, rather than any central +cryptographic signatures on meta\(hydata, rather than any central authority. .P -Monotone keeps a collection of versions in a single-file relational +Monotone keeps a collection of versions in a single\(hyfile relational database. It is essentially serverless, using network servers only as untrusted communication facilities. A monotone database is a regular file, which contains all the information needed to extract previous @@ -49,7 +49,7 @@ Indicate a passing or failing test resul \fBtestresult\fP \fI (0|1|true|false|yes|no|pass|fail)\fP Indicate a passing or failing test result on a revision. .TP -\fBdiff \fI[--revision= [--revision=] ] [...]\fP +\fBdiff \fI[\-\-revision= [\-\-revision=] ] [...]\fP Show diffs between workspace and database. .TP \fBstatus \fI[...]\fP @@ -64,7 +64,7 @@ from stdin if no value given on command from stdin if no value given on command line. .TP \fBgenkey\fP \fI\fP -Generate an RSA key-pair and store it in the database. +Generate an RSA key\(hypair and store it in the database. .TP \chkeypass\fP \fI\fP Change passphrase of the private half of a key. @@ -72,7 +72,7 @@ List certs associated with revision. \fBlist certs\fP \fI\fP List certs associated with revision. .TP -\fBlist keys\fP \fI[partial-id]\fP +\fBlist keys\fP \fI[partial\(hyid]\fP List keys matching glob, or list all keys if no glob given. .TP \fBlist branches\fP @@ -135,10 +135,10 @@ debugging; use cvs_import. across the entire tree. You do not want this command, it is for debugging; use cvs_import. .TP -\fBcheckout\fP \fI[--revision=revision-id]\fP \fI[]\fP +\fBcheckout\fP \fI[\-\-revision=revision\(hyid]\fP \fI[]\fP Check out revision from database. .TP -\fBco\fP \fI[--revision=revision-id]\fP \fI[]\fP +\fBco\fP \fI[\-\-revision=revision\(hyid]\fP \fI[]\fP Check out revision from database; an alias for \fBcheckout\fP. .TP \fBcat\fP \fI(file|manifest) \fP @@ -162,19 +162,19 @@ Rename files from \fI \fP to \fI \fI\fP Rename files from \fI \fP to \fI \fP in workspace. .TP -\fBcommit\fP \fI[(--message=|--message-file=)] [...]\fP +\fBcommit\fP \fI[(\-\-message=|\-\-message\-file=)] [...]\fP Commit workspace to database. Each commit has a changelog message -associated with it. If --message is provided on the command line, it -is used; if --message-file is provided, the content of the -named file will be used as a commit message. If the filename is '-' +associated with it. If \-\-message is provided on the command line, it +is used; if \-\-message\-file is provided, the content of the +named file will be used as a commit message. If the filename is '\-' the commit message will be read from standard input. Otherwise a log message editor will be invoked. If the file _MTN/log exists -and is non-empty, its content is used to prefill the editor. You -cannot specify both --message and --message-file at the same time, and -if _MTN/log exists and is non-empty, you can cannot specify either of them +and is non\(hyempty, its content is used to prefill the editor. You +cannot specify both \-\-message and \-\-message\-file at the same time, and +if _MTN/log exists and is non\(hyempty, you can cannot specify either of them at all. .TP -\fBupdate\fP \fI[revision-id]\fP +\fBupdate\fP \fI[revision\(hyid]\fP Update workspace. .TP \fBrefresh_inodeprints\fP @@ -189,10 +189,10 @@ Sync contents of \fI\fP with datab \fBsync\fP \fI \fP Sync contents of \fI\fP with database on \fI\fP. .TP -\fBserve\fP \fI[--pid-file=] [--bind=[][:]] [--exclude=]\fP +\fBserve\fP \fI[\-\-pid\-file=] [\-\-bind=[][:]] [\-\-exclude=]\fP Serve contents of \fI\fP at network address \fI\fP, on the port \fI\fP. If \fI\fP isn't given, 4691 is used. If a ---pid-file option is provided on the command line, monotone will store +\-\-pid\-file option is provided on the command line, monotone will store the process id of the server in the specified file. .TP \fBset\fP \fI \fP @@ -202,112 +202,112 @@ Delete any setting for db var \fI\ \fBunset\fP \fI \fP Delete any setting for db var \fI\fP in domain \fI\fP. .TP -\fBautomate\fP \fI(interface_version|heads|ancestors|attributes|parents|descendents|children|graph|erase_ancestors|toposort|ancestry_difference|leaves|inventory|stdio|certs|select)\fP +\fBautomate\fP \fI(interface_version | heads | ancestors | attributes | parents | descendents | children | graph | erase_ancestors | toposort | ancestry_difference | leaves | inventory | stdio | certs | select)\fP Scripting interface. .TP -\fBdb\fP \fI(init|info|version|dump|load|migrate|rebuild|execute|check)\fP +\fBdb\fP \fI(init | info | version | dump | load | migrate | rebuild | execute | check)\fP Manipulate database state. .SH OPTIONS .P Command line options override environment variables and settings in lua scripts (such as \fB.monotonerc\fP) .TP -\fB--help\fP +\fB\-\-help\fP Print help message. .TP -\fB--debug\fP +\fB\-\-debug\fP Turn on debugging log on standard error stream. This is very verbose. Default is to be silent, unless an error occurs, in which case failure log is dumped. .TP -\fB--quiet\fP +\fB\-\-quiet\fP Turn off normal progress messages. .TP -\fB--dump=\fP\fI\fP +\fB\-\-dump=\fP\fI\fP Dump debugging log to \fIfile\fP on failure. .TP -\fB--nostd\fP +\fB\-\-nostd\fP Do not evaluate "standard" lua hooks compiled into \fBmonotone\fP. .TP -\fB--norc\fP +\fB\-\-norc\fP Do not load lua hooks from user's \fB~/.monotonerc\fP file. .TP -\fB--rcfile=\fP\fI\fP +\fB\-\-rcfile=\fP\fI\fP Load extra lua hooks from \fIfile\fP (may be given multiple times). .TP -\fB--db=\fP\fI\fP +\fB\-\-db=\fP\fI\fP Use database in \fIfile\fP. .TP -\fB--key=\fP\fI\fP +\fB\-\-key=\fP\fI\fP Use \fIkeyid\fP for operations which produce RSA signatures. Default is inferred from presence of unique private key in database. Can also -be customized on a per-branch basis with hook function +be customized on a per\(hybranch basis with hook function \fBget_branch_key(branchname)\fP. .TP -\fB-k\fP \fI\fP -An alias for \fB--key=\fP\fI\fP +\fB\-k\fP \fI\fP +An alias for \fB\-\-key=\fP\fI\fP .TP -\fB--branch=\fP\fI\fP +\fB\-\-branch=\fP\fI\fP Use \fIbranchname\fP for operations on a branch. Default is inferred in operations on existing branches (commit, update, etc). .TP -\fB-b\fP \fI\fP -An alias for \fB--branch=\fP\fI\fP +\fB\-b\fP \fI\fP +An alias for \fB\-\-branch=\fP\fI\fP .TP -\fB--ticket=\fP\fIdot|count|none\fP +\fB\-\-ticket=\fP\fIdot|count|none\fP Use the given method to print tickers. The \fBcount\fP method prints the count for each ticker on one line, incrementing the numbers in place, while the \fBdot\fP method prints a continuous string of characters (like some programs provide a progress line of dots). \fBnone\fP prints nothing. The default is \fBcount\fP. .TP -\fB--revision=\fP\fI\fP +\fB\-\-revision=\fP\fI\fP Used to specify one or more revision ids to various commands. .TP -\fB-r\fP \fI\fP -An alias for \fB--revision=\fP\fI\fP +\fB\-r\fP \fI\fP +An alias for \fB\-\-revision=\fP\fI\fP .TP -\fB--message=\fI\fP +\fB\-\-message=\fI\fP Use the given message as the changelog when committing a new revision rather than invoking the log message editor. Currently this option only applies to the commit command but it may also apply to the comment command in the future. -This option is alternative to --message-file +This option is alternative to \-\-message\-file .TP -\fB-m \fI\fP -An alias for \fB--message=\fI\fP +\fB\-m \fI\fP +An alias for \fB\-\-message=\fI\fP .TP -\fB--message-file=\fI\fP +\fB\-\-message\-file=\fI\fP Use the content of the given file as the changelog when committing a -new revision rather than invoking the log message editor. If the passed filename is '-' the changelog message will be read from standard input. +new revision rather than invoking the log message editor. If the passed filename is '\-' the changelog message will be read from standard input. Currently this option only applies to the commit command but it may also apply to the comment command in the future. -This option is alternative to --message. +This option is alternative to \-\-message. .TP -\fB--author=\fI\fP +\fB\-\-author=\fI\fP Use the given author as the value of the "author" cert when committing a new revision, rather than the default author. Useful when committing a patch on behalf of someone else, or when importing history from another version control system. .TP -\fB--date=\fI\fP +\fB\-\-date=\fI\fP Use the given given date and time as value of the "date" cert when committing a new revision, rather than the current time. Useful when importing history from another version control system. .TP -\fB--root=\fI\fP +\fB\-\-root=\fI\fP Stop the search for a workspace (containing the _MTN directory) at the specified root directory rather than at the physical root of the filesystem. .TP -\fB--xargs=\fI\fP +\fB\-\-xargs=\fI\fP Inject the contents of the file in place among the command line arguments. This may be useful in case the command line would otherwise become too long for your system. This option can be used more than once if needed. .TP -\fB-@ \fI\fP -An alias for \fB--xargs=\fI\fP. +\fB\-@ \fI\fP +An alias for \fB\-\-xargs=\fI\fP. .SH ENVIRONMENT .TP \fBEDITOR\fP ============================================================ --- debian/rules da3d4045eb1a244fad05b09f897c9e6577af1c1a +++ debian/rules 6e94753c65c9264f4290b8da9949fa91b7544225 @@ -8,9 +8,20 @@ export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq "$(DEB_HOST_GNU_TYPE)" "$(DEB_BUILD_GNU_TYPE)" +# not cross-compiling; don't specify --host, which will confuse configure +BUILD_AND_HOST := --build=$(DEB_BUILD_GNU_TYPE) +else +# cross-compiling: need both switches. Also, turn off the testsuite +# (the cross-compile environment should have done this anyway, but +# let's make sure). +BUILD_AND_HOST := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) +DEB_BUILD_OPTIONS += nocheck +endif + # This enables parallelism. CPUS ?= $(shell getconf _NPROCESSORS_ONLN) @@ -42,7 +53,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + ./configure $(BUILD_AND_HOST) \ --prefix=/usr --mandir='$${prefix}/share/man' \ --infodir='$${prefix}/share/info' CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" @@ -54,8 +65,11 @@ build-arch-stamp: config.status # we have to bypass the 'all' target. (Revisit after automake-ectomy.) # The testsuite is still not entirely reliable in parallel mode. make -j$(CPUS) -C po all - make -j$(CPUS) mtn unit_tester tester + make -j$(CPUS) mtn +ifeq "$(findstring nocheck, $(DEB_BUILD_OPTIONS))" "" + make -j$(CPUS) unit_tester tester make check-local +endif touch $@ build-indep: build-indep-stamp @@ -68,7 +82,7 @@ clean: clean: dh_testdir dh_testroot - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f build-arch-stamp build-indep-stamp dh_clean