The unified diff between revisions [9169f571..] and [dd66b9fa..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "debian/changelog"
# from [96ae7b54c2ba221b09f7bbae7ad86b2429006d19]
# to [5e897abd8b3e85f38ef4b9fbbd89a4da19464fec]
#
# patch "debian/rules"
# from [53602f3c8cbda45fb8a451da2d3949ea5043f352]
# to [f650fa62b8dc0fca5c044e56c3d0207e7cec5e84]
#
# patch "options.h"
# from [35c6abccbdb8c81688562448070402b8bc296384]
# to [fbceffcebe383fda1848f48acbb999c91d5cacec]
#
============================================================
--- debian/changelog 96ae7b54c2ba221b09f7bbae7ad86b2429006d19
+++ debian/changelog 5e897abd8b3e85f38ef4b9fbbd89a4da19464fec
@@ -1,5 +1,11 @@ dropbear (0.47-0.1) unstable; urgency=hi
dropbear (0.47-0.1) unstable; urgency=high
+ * merge for dispense
+
+ -- Matt Johnston <matt@ucc.asn.au> Sun, 11 Dec 2005 19:20:21 +0800
+
+dropbear (0.47-0.1) unstable; urgency=high
+
* New upstream release.
* SECURITY: Fix incorrect buffer sizing.
@@ -14,7 +20,6 @@ dropbear (0.46-2) unstable; urgency=low
-- Gerrit Pape <pape@smarden.org> Tue, 6 Dec 2005 13:30:49 +0000
-dropbear (0.46-1) unstable; urgency=medium
cokedropbear (0.46-0.1-dispense) unstable; urgency=medium
* With dispense stuff.
============================================================
--- debian/rules 53602f3c8cbda45fb8a451da2d3949ea5043f352
+++ debian/rules f650fa62b8dc0fca5c044e56c3d0207e7cec5e84
@@ -38,7 +38,7 @@ config.status: patch-stamp configure
./configure --host='$(DEB_HOST_GNU_TYPE)' --enable-pam\
--build='$(DEB_BUILD_GNU_TYPE)' --prefix=/usr \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- $(CONFFLAGS)
+ $(CONFFLAGS) --enable-pam
build: deb-checkdir build-stamp
build-stamp: config.status
============================================================
--- options.h 35c6abccbdb8c81688562448070402b8bc296384
+++ options.h fbceffcebe383fda1848f48acbb999c91d5cacec
@@ -200,7 +200,7 @@ etc) slower (perhaps by 50%). Recommende
*******************************************************************/
#ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.47"
+#define DROPBEAR_VERSION "0.47-ucc-dispense"
#endif
#define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION