# # # delete "debian/monotone.install" # # rename "debian/monotone.info" # to "debian/monotone-doc.info" # # add_file "debian/monotone-doc.dirs" # content [87882a2689244f9c7380a9c320c595e52c0f3b02] # # patch "debian/changelog" # from [ae7162bda56e6a3b556c2c96e8d392eb8fb9c7b4] # to [d257d7d590a3e97c4b5ac0c9a42a89813db36221] # # patch "debian/control" # from [172323f3eba197bb2a58646fa44b356476b8bbda] # to [765431b648c1cc4524dc65be23359cd81e863297] # # patch "debian/monotone-doc.docs" # from [1739f2f25cac359cb3bf3b46b34cee22148c8690] # to [234795010ef0166d4bba978034cc12b2f2459373] # # patch "debian/monotone-doc.info" # from [7c2864a7ac1a58dc9700fe1dd28a18bf6faeb359] # to [a9819b431d8d972835382dcd0ec843c5c9a89123] # # patch "debian/monotone.docs" # from [12ac91039595de7e9b23184aa19b904bca4025e7] # to [acbe6763ec74c6f43841414c82df93c6eddd8f73] # # patch "debian/rules" # from [307ef10ce7e3eb38bccdfc8096d901c62ffb3fcb] # to [da3d4045eb1a244fad05b09f897c9e6577af1c1a] # ============================================================ --- debian/monotone-doc.dirs 87882a2689244f9c7380a9c320c595e52c0f3b02 +++ debian/monotone-doc.dirs 87882a2689244f9c7380a9c320c595e52c0f3b02 @@ -0,0 +1 @@ +usr/share/doc/html/figures ============================================================ --- debian/changelog ae7162bda56e6a3b556c2c96e8d392eb8fb9c7b4 +++ debian/changelog d257d7d590a3e97c4b5ac0c9a42a89813db36221 @@ -1,3 +1,28 @@ +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. + * 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 + this bug. (Closes: #437978) + * Reincorporate debian/changelog entries for versions 0.27-1 and + 0.27-1.1. These versions were once uploaded to Debian but their + entries got lost from the official changelog somehow. + * Switch from cdbs to a handwritten rules file based on debhelper + examples. Restore Build-Depends/Build-Depends-Indep distinction + 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. + * 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. + + -- Zack Weinberg Sun, 04 Nov 2007 11:53:17 -0800 + monotone (0.37-1) unstable; urgency=low * New upstream release. ============================================================ --- debian/control 172323f3eba197bb2a58646fa44b356476b8bbda +++ debian/control 765431b648c1cc4524dc65be23359cd81e863297 @@ -1,12 +1,12 @@ Uploaders: Richard Levitte Uploaders: Richard Levitte , Zack Weinberg , Ludovic Brenta -Build-Depends: cdbs (>= 0.4.28), debhelper (>= 4.2.0), autotools-dev, - libboost-dev (>= 1.34.1-2), libz-dev, ps2eps, texlive-base, - texlive-generic-recommended, texlive-latex-base, texinfo, xpdf-utils, - po-debconf, patch +Build-Depends: debhelper (>= 4.2.0), autotools-dev, libz-dev, po-debconf, + libboost-dev (>= 1.34.1-2), patch +Build-Depends-Indep: ps2eps, texlive-base, texlive-generic-recommended, + texlive-latex-base, texinfo, xpdf-utils Standards-Version: 3.7.2.2 Package: monotone @@ -24,7 +24,7 @@ Depends: monotone (>= ${source:Version}) Architecture: all Depends: monotone (>= ${source:Version}), adduser, ucf (>= 0.28), lsb-base (>= 3.0-6), ${misc:Depends} -Description: A distributed version (revision) control system +Description: A distributed version (revision) control system - server scripts Monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping @@ -37,6 +37,6 @@ Architecture: all Package: monotone-doc Section: doc Architecture: all -Description: A distributed version (revision) control system - This package contains the documentation for monotone in HTML and PDF +Description: A distributed version (revision) control system - documentation + This package contains the documentation for monotone in Info, HTML, and PDF formats. See the description of the package monotone for more details. ============================================================ --- debian/monotone-doc.docs 1739f2f25cac359cb3bf3b46b34cee22148c8690 +++ debian/monotone-doc.docs 234795010ef0166d4bba978034cc12b2f2459373 @@ -1,9 +1,6 @@ -ABOUT-NLS AUTHORS NEWS README README.changesets UPGRADE monotone.pdf -monotone.html -figures ============================================================ --- debian/monotone.info 7c2864a7ac1a58dc9700fe1dd28a18bf6faeb359 +++ debian/monotone-doc.info a9819b431d8d972835382dcd0ec843c5c9a89123 @@ -1 +1,2 @@ monotone.info monotone.info +monotone.info-* ============================================================ --- debian/monotone.docs 12ac91039595de7e9b23184aa19b904bca4025e7 +++ debian/monotone.docs acbe6763ec74c6f43841414c82df93c6eddd8f73 @@ -1,4 +1,3 @@ -ABOUT-NLS AUTHORS NEWS README ============================================================ --- debian/rules 307ef10ce7e3eb38bccdfc8096d901c62ffb3fcb +++ debian/rules da3d4045eb1a244fad05b09f897c9e6577af1c1a @@ -1,19 +1,139 @@ #!/usr/bin/make -f +# +# debian/rules for monotone, by Zack Weinberg +# Based on a public domain template, originally written by Joey Hess. -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 -DEB_MAKE_CHECK_TARGET = check -DEB_DH_INSTALLINIT_ARGS = --name=monotone +# 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) -CPUS := $(shell getconf _NPROCESSORS_ONLN) +# This enables parallelism. +CPUS ?= $(shell getconf _NPROCESSORS_ONLN) -build : DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -j$(CPUS) -C $(DEB_BUILDDIR) +# put this up top so it's the default rule. +# +# Policy (section 4.9) says that build should depend on build-indep. +# However, this is only a "should", and it doesn't work, because +# dpkg-buildpackage uses build even in -B mode. Thus, if build +# depends on build-indep, even a -B build will try to generate the +# manuals -- and the buildds will do this having installed only the +# Build-Depends, for they are ignorant of B-D-I. All die, O the +# embarrassment. (This has been a festering known problem for at +# least five years; see bugs #218893 and #229357. There is a bunch of +# recent discussion but, as far as I can tell, no actual forward +# progress is being made.) +# +# Conversely, not having build depend on build-indep means that if you +# do a normal dpkg-buildpackage, the manual gets generated in the +# binary-indep phase rather than the build phase, which works fine (as +# long as you are being sensible and using fakeroot, anyway; I haven't +# tried it with actual root privileges and don't propose to). +build: build-arch -build/monotone-doc:: - make monotone.pdf +config.status: configure + dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +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) \ + --prefix=/usr --mandir='$${prefix}/share/man' \ + --infodir='$${prefix}/share/info' CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" -# dh_install cannot do this. -install/monotone:: +build-arch: build-arch-stamp +build-arch-stamp: config.status + +# We don't want to generate the info documentation in build-arch, so +# 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 check-local + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: config.status + +# Just the formatted documentation. + make -j$(CPUS) info html monotone.pdf + touch $@ + +clean: + dh_testdir + dh_testroot + -$(MAKE) distclean + rm -f build-arch-stamp build-indep-stamp + dh_clean + +# Build architecture-independent files here. +binary-indep: build-indep + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -i +# The upstream makefiles' install targets do nothing useful for these +# packages. (In particular, we do not want the monolithic +# monotone.html installed.) Annoyingly, at present we cannot simply +# dh_installdocs the entire html directory, because it contains a +# bunch of unwanted junk; instead we dh_installdirs the directory +# hierarchy that is required and use cp -a to put all the files in place. + cp -p html/*.html html/*.css debian/monotone-doc/usr/share/doc/html + cp -p html/figures/*.png debian/monotone-doc/usr/share/doc/html/figures + + dh_installchangelogs -i + dh_installdebconf -i + dh_installdocs -i + dh_installexamples -i +# we should have logrotate support for monotone-server, but currently we don't +# dh_installlogrotate -i --name=monotone + dh_installinit -i --name=monotone + dh_installinfo -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build-arch + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + +# again because we don't want the documentation in *-arch, we can't +# use the generic install target; instead, use the *nonrecursive* +# install-exec target for the top level makefile and the install-data +# target for the po directory. (using the recursive install-exec +# target would work too, but there's no point.) + $(MAKE) DESTDIR=$(shell pwd)/debian/monotone install-exec-am + $(MAKE) DESTDIR=$(shell pwd)/debian/monotone -C po install-data + +# dh_installdirs created etc/bash_completion.d. dh_install cannot install +# a file under a different basename. cp contrib/monotone.bash_completion \ + debian/monotone/etc/bash_completion.d/monotone + + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_installman -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: clean build build-arch build-indep binary binary-arch binary-indep - debian/monotone/etc/bash_completion.d/monotone