# 
# patch "ChangeLog"
#  from [20a07dcbc466a6090c6506144a524a179a14cb52]
#    to [c2fc356cdd5b7eab95ae345c04e45ece26d2adb3]
# 
# patch "debian/control"
#  from [1fb0ca4df0eadfd784519d5a37eca1d96366327d]
#    to [67477cf00c29479c7967f96dcc8663329b1ee6b1]
# 
# patch "debian/rules"
#  from [c5080c228a8b8c2b1bb01ad8f4ec1e216c93dc66]
#    to [852b33f7d4b65bf12ef1bc37435dd0579c6ba6d8]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-07-05  Nathaniel Smith  <address@hidden>
 
+	* debian/rules (config.status): Use bundled sqlite.
+	* debian/control (Build-Depends): Remove popt and sqlite.
+
+2005-07-05  Nathaniel Smith  <address@hidden>
+
 	* NEWS: Add timestamp.  Barring unforeseen issues, this is 0.20.
 
 2005-07-05  Nathaniel Smith  <address@hidden>
--- debian/control
+++ debian/control
@@ -1,8 +1,8 @@
 Source: monotone
 Section: devel
 Priority: optional
 Maintainer: Tomas Fasth <address@hidden>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev, libboost-test-dev, libboost-dev, g++, libpopt-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev, libboost-test-dev, libboost-dev, g++
 Standards-Version: 3.6.1
 
 Package: monotone
--- debian/rules
+++ debian/rules
@@ -27,7 +27,7 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" --with-bundled-sqlite=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./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