# 
# patch "debian/changelog"
#  from [55dab413b30f046f933930d054c3da844b818366]
#    to [7e7d19665043624e52133857efe533d33a368ac4]
# 
# patch "debian/control"
#  from [485b9b7ef5523b1d37820c4ad0a9b7ff5b7df53e]
#    to [ebf99dead1ad25f5504309250bcf5f2125687ef2]
# 
# patch "debian/rules"
#  from [852b33f7d4b65bf12ef1bc37435dd0579c6ba6d8]
#    to [fe72fe2cb65bfb118258945b73978e05c506a700]
# 
========================================================================
--- debian/changelog	55dab413b30f046f933930d054c3da844b818366
+++ debian/changelog	7e7d19665043624e52133857efe533d33a368ac4
@@ -1,3 +1,30 @@
+monotone (0.23-2) unstable; urgency=low
+
+  * Arm, hppa and m68k is now build-depending on g++-3.4
+  * Closes: #334999: FTBFS on arm/hppa/m68k: please use g++-3.4
+  * Build is now controlled by Common Debian Build System (CDBS).
+
+ -- Tomas Fasth <address@hidden>  Fri, 21 Oct 2005 17:18:16 +0000
+
+monotone (0.23-1) unstable; urgency=low
+
+  * Rebuild in clean environment for upload to debian archive.
+
+ -- Tomas Fasth <address@hidden>  Mon, 10 Oct 2005 16:59:06 +0000
+
+monotone (0.23-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathaniel Smith <address@hidden>  Thu, 29 Sep 2005 23:50:22 -0700
+
+monotone (0.22-2) unstable; urgency=high
+
+  * Closes: #323858: package has unmet dependencies
+  * New build to fix broken library dependencies for unstable.
+
+ -- Tomas Fasth <address@hidden>  Thu, 18 Aug 2005 23:08:51 +0000
+
 monotone (0.22-1) unstable; urgency=low
 
   * Rebuild in clean environment (pdebuild) for upload to debian
========================================================================
--- debian/control	485b9b7ef5523b1d37820c4ad0a9b7ff5b7df53e
+++ debian/control	ebf99dead1ad25f5504309250bcf5f2125687ef2
@@ -1,10 +1,11 @@
 Source: monotone
 Section: devel
 Priority: optional
 Maintainer: Tomas Fasth <address@hidden>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev,
+Build-Depends: cdbs (>= 0.4.28), debhelper (>= 4.0.0), autotools-dev,
  libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev,
- libboost-test-dev, libboost-dev, g++, texinfo, libz-dev
+ libboost-test-dev, libboost-dev, texinfo, libz-dev,
+ g++ [!arm !hppa !m68k], g++-3.4 [arm hppa m68k]
 Standards-Version: 3.6.2
 
 Package: monotone
========================================================================
--- debian/rules	852b33f7d4b65bf12ef1bc37435dd0579c6ba6d8
+++ debian/rules	fe72fe2cb65bfb118258945b73978e05c506a700
@@ -1,107 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Uncomment this to turn on verbose mode.
-#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)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/monotone.sgml > monotone.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-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
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/monotone.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/monotone
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-#	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install