# # # add_file "debian/mtnopt.1" # content [51d9513e56c6ff0e1ffe173d412e3baf4de4c8bf] # # patch "debian/changelog" # from [38b735741c87fb4ae193591dfe6cba9391923052] # to [42bcd8e73a233e6edd537fc04db367d266164e13] # # patch "debian/control" # from [adc34d4cb8141eb255c300b1177f91fee1d23f5b] # to [8498d81dbe44cc4283be9b3598eff481e9e512b0] # # patch "debian/monotone-doc.postinst" # from [42173087f1dc1dadf9365e37d71b02121f6f03b8] # to [f22408b56c4988171403ec530806f2b9f5eb73c5] # # patch "debian/monotone.manpages" # from [ed6d7f2b05011f1acc5a83164edd7c024b40a61a] # to [0feb2e5e14684d3b745f5010c25f2b7afcaf8ec7] # # patch "debian/rules" # from [139c1b2172984ea7ee22193925d5d0402fce8d47] # to [94f668db9b7ede39bbb218923fb6f5007a9a4d3a] # ============================================================ --- debian/mtnopt.1 51d9513e56c6ff0e1ffe173d412e3baf4de4c8bf +++ debian/mtnopt.1 51d9513e56c6ff0e1ffe173d412e3baf4de4c8bf @@ -0,0 +1,95 @@ +.TH MTNOPT 1 2009-02-13 monotone monotone +.SH NAME +mtnopt \- generate shell variables from monotone workspace options +.SH SYNOPSIS +.B mtnopt +.RB [\| \-s \||\| \-c \||\| \-v \|] +.RB [\| \-d +.IR dir \|] +.RB [\| \-k +.IR keys \|] +.br +.B mtnopt -h +.br +.SH DESCRIPTION +.B mtnopt +prints shell variable assignments for each value in the file of +monotone workspace options, +.IR _MTN/options , +in the current directory. For instance, if +.I _MTN/options +contained this text: +.IP +\f(CWdatabase "/home/user/src/monotone.mtn"\fP +.br +\f(CW branch "net.venge.monotone"\fP +.br +\f(CW keydir "/home/user/.monotone/keys"\fP +.PP +.B mtnopt +would print: +.IP +\f(CWMTN_database="/home/user/src/monotone.mtn";\fP +.br +\f(CWMTN_branch="net.venge.monotone";\fP +.br +\f(CWMTN_keydir="/home/user/.monotone/keys";\fP +.PP +By default, +.B mtnopt +attempts to guess appropriate syntax from the value of the +.B SHELL +environment variable. This can be overridden with the +.B \-s +and +.B \-c +command\(hyline options. +.SH OPTIONS +.TP +.B \-s +Print variable assignments in +.BR sh (1) +syntax. +.TP +.B \-c +Print variable assignments in +.BR csh (1) +syntax. +.TP +.B \-v +Print only the values, with no indication of the corresponding option keys. +.TP +.BI \-d\ directory +Look for +.I _MTN/options +in +.IR directory , +rather than in the current directory. +.TP +.BI \-k\ keys +Print assignments for only those options that match the +.BR egrep (1) +regular expression +.IR keys . +.TP +.B \-h +Print a help message and exit. +.SH BUGS +.B mtnopt +only looks in the current directory for the +.I _MTN +directory, so it will fail in a subdirectory of a workspace. +.PP +.B mtnopt +should be aware of the set of possible options, rather than blindly +printing whatever is in +.IR _MTN/options . +.PP +The behavior when there is no +.I _MTN/options +file to be found is less than helpful. +.SH SEE ALSO +.BR mtn (1), +.BR egrep (1), +.BR sh (1), +.BR csh (1) ============================================================ --- debian/changelog 38b735741c87fb4ae193591dfe6cba9391923052 +++ debian/changelog 42bcd8e73a233e6edd537fc04db367d266164e13 @@ -1,3 +1,19 @@ +monotone (0.42-2) unstable; urgency=low + + * debian/control: Allow use of boost1.35-dev or boost1.37-dev + as alternatives to plain boost-dev. Add ${misc:Depends} to + monotone and monotone-doc Depends: lines. + * po/es.po: New Spanish debconf template translation, thanks to + Fernando González de Requena (closes: #512996). + * Include a manpage for mtnopt. + * Add missing 'set -e' to monotone-doc.postinst. + * Recreate /var/run/monotone in init script if missing, to + accommodate systems where /var/run is a tmpfs. + * Tweak handling of config.sub/config.guess for build reproducibility. + * Upload to unstable now lenny is released (closes: #512035). + + -- Zack Weinberg Mon, 16 Feb 2009 10:22:12 -0800 + monotone (0.42-1) unstable; urgency=low * New upstream version. ============================================================ --- debian/control adc34d4cb8141eb255c300b1177f91fee1d23f5b +++ debian/control 8498d81dbe44cc4283be9b3598eff481e9e512b0 @@ -7,14 +7,15 @@ Build-Depends: debhelper (>= 4.2.0), aut Homepage: http://monotone.ca/ Vcs-Browser: http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone Build-Depends: debhelper (>= 4.2.0), autotools-dev, libz-dev, po-debconf, - libboost-dev (>= 1.34.1-2), libpcre3-dev (>= 7.6), patch + libboost-dev (>= 1.34.1-2) | libboost1.35-dev | libboost1.37-dev, + libpcre3-dev (>= 7.6), patch Build-Depends-Indep: ps2eps, texlive-base, texlive-generic-recommended, texlive-latex-base, texinfo, xpdf-utils Standards-Version: 3.8.0 Package: monotone Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: monotone-doc, monotone-server Description: A distributed version (revision) control system Monotone is a free, distributed version control system. It provides @@ -41,7 +42,7 @@ Architecture: all Package: monotone-doc Section: doc Architecture: all -Depends: monotone (>= ${source:Version}) +Depends: monotone (>= ${source:Version}), ${misc:Depends} Description: A distributed version (revision) control system - documentation Monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps ============================================================ --- debian/monotone-doc.postinst 42173087f1dc1dadf9365e37d71b02121f6f03b8 +++ debian/monotone-doc.postinst f22408b56c4988171403ec530806f2b9f5eb73c5 @@ -1,5 +1,7 @@ #! /bin/sh +set -e + case "$1" in configure) # directory turned into symlink; give dpkg a hand ============================================================ --- debian/monotone.manpages ed6d7f2b05011f1acc5a83164edd7c024b40a61a +++ debian/monotone.manpages 0feb2e5e14684d3b745f5010c25f2b7afcaf8ec7 @@ -1 +1,2 @@ debian/mtn.1 debian/mtn.1 +debian/mtnopt.1 ============================================================ --- debian/rules 139c1b2172984ea7ee22193925d5d0402fce8d47 +++ debian/rules 94f668db9b7ede39bbb218923fb6f5007a9a4d3a @@ -69,9 +69,11 @@ ifneq "$(wildcard /usr/share/misc/config config.status: configure dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" + mv -f config.sub config.sub.upstream cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" + mv -f config.guess config.guess.upstream cp -f /usr/share/misc/config.guess config.guess endif ./configure $(BUILD_AND_HOST) \ @@ -112,6 +114,8 @@ clean: dh_testroot [ ! -f Makefile ] || $(MAKE) distclean rm -f build-arch-stamp build-indep-stamp + [ ! -f config.sub.upstream ] || mv -f config.sub.upstream config.sub + [ ! -f config.guess.upstream ] || mv -f config.guess.upstream config.guess dh_clean # Build architecture-independent files here.