This patch contains all the Debian-specific changes mixed together.
The reason for doing this, rather than maintaining quilt patches, is
that the Debian-specific changes are maintained as a branch in a
fossil repository.  To review them separately, please inspect the
debian branch in http://cvs.bcl.hamilton.ie:8080
--- fossil-1.26+dfsg.orig/manifest
+++ fossil-1.26+dfsg/manifest
@@ -1,5 +1,5 @@
-C Version\s1.26
-D 2013-06-18T21:09:23.758
+C update\sdebian/changelog
+D 2013-08-14T15:20:34.816
 F .fossil-settings/clean-glob c1679d70a381afc39909203441036a736fb4b596
 F .fossil-settings/ignore-glob 3ed6aa34e7396bad5468607064d39be9269d93d6
 F .fossil-settings/keep-glob 3ed6aa34e7396bad5468607064d39be9269d93d6
@@ -8,7 +8,7 @@ F .settings/org.eclipse.core.resources.p
 F .settings/org.eclipse.core.runtime.prefs 6cc9381da1eff8e6dac0e41121d3cce3f1b4761b
 F BUILD.txt 624bb79c741d865e8f9823c1a546ac6782b9d1cc
 F COPYRIGHT-BSD2.txt c7dd1de9f9539a5a859c2b41fe4560604a774476
-F Makefile.classic 610ce9eedc0d35e35692fb8b0fc2fdd8359a04fd
+F Makefile.classic 610ce9eedc0d35e35692fb8b0fc2fdd8359a04fd x
 F Makefile.in ed20ed61a1d9a7c221b3c916bdda056f031dcd8e
 F VERSION e8235232d414c4f60347d15432459dcc200f4ce0
 F ajax/README 133f25a88f21479a20cc3b20a8dfa0f0fa807ffc
@@ -301,7 +301,20 @@ F compat/zlib/zlib2ansi e9859eecf47ae662
 F compat/zlib/zutil.c e1af709bff21ae0d4331119a7fc4c19f82932043
 F compat/zlib/zutil.h b909d27ef9ce51639f76b7ea6b62721e7d1b6bf7
 F configure 239cde01aca7fc63a2903f85bd2a6414189f1bd4 x
-F debian/makedeb.sh b57db65590abc4216946cecd9850a94fd3a4b19f
+F debian/README.Debian f05c55a5adc00dba9124ed5959b629295ec340d8
+F debian/changelog acd03e78e56c26822a5b4e012197365bbdad2370
+F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
+F debian/control 635919c3859d07c4b840d5bb8a5cce3d125f5d29
+F debian/copyright 29b63bf8e972b563d99210f6f37a86d2b1208fe7
+F debian/fossil.1 0aa94b217a630021c4b7fcf6b4a91dac1511c704
+F debian/fossil.docs 45a770a8534b1a439a32546145737975a9217b30
+F debian/fossil.install 8ae909034651ad9b0a72cd10460fed7b9e51f627
+F debian/fossil.manpages a54d8f1ffdace2473552a7903f51d059edc38a07
+F debian/rules 96ad9296ad6d476c8b1e609098f457071dce7270 x
+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
+F debian/source/patch-header cc9c5d455e74f2cb75b716fb8cab2c2d31c6fe4e
+F debian/watch ef89439bf0d6920682338c97e49e4199f9e0164b
 F fossil.nsi 7d2f5e7424fdc4e35d609228dd4b92e019c6d5d6
 F src/Makefile 102203d824d778194b79680bef8a553d5e6d9819
 F src/add.c 1bbaef2842740ec96b42ea209b29319e8383776c
@@ -322,8 +335,8 @@ F src/comformat.c 4c6ab3776e9c591937c70a
 F src/config.h b0d94a1b2de290c448a18ba3b33b1b3ae97d02dd
 F src/configure.c d9192353fbb8d656ef1a927a5c0b75beaa4f9e8a
 F src/content.c b0e1dc9ae86f79cfca36fe0ee826108d86f852fd
-F src/cson_amalgamation.c 5cb9365b7d6c5aba118776662123b69cbaac7959
-F src/cson_amalgamation.h 4e9be49388ddae9efdb112dd0366eb08bb063aad
+F src/cson_amalgamation.c b22103e1c54249139e27639481e5c4fe4fde49a6
+F src/cson_amalgamation.h b22103e1c54249139e27639481e5c4fe4fde49a6
 F src/db.c 5918dc6458ca73c07e6b8cf7f70bb29b7f5d0bf5
 F src/delta.c 2c7e11a91b2aa2196c3f3d4cf2c20ff158bddd2e
 F src/deltacmd.c 08f55239e28aa9530f3f53006f7b69b03fb51ede
@@ -367,7 +380,7 @@ F src/main.c 569695be96816be6f81b78bf8d3
 F src/main.mk c428f1570bb4338a60813da2f62a875239fff17a
 F src/makeheaders.c d0855feacdb7145573d938c85de645de51b4b277
 F src/makeheaders.html 4428f89f94c3b333b106171fe63f2c175d0ee53b
-F src/makemake.tcl 7806d08bf3ed970ef6a532f2ebe8662b81975b82
+F src/makemake.tcl 7806d08bf3ed970ef6a532f2ebe8662b81975b82 x
 F src/manifest.c 18f07ec33d8fe75a42ff3823a27e375d591b5d99
 F src/markdown.c 4118a71bae5968f1b8d177a72f8b7a93002875db
 F src/markdown_html.c 8029139ecfa00a73c7bf8acec4c8b03c8a3e4657
@@ -622,15 +635,12 @@ F www/stats.wiki 69851d26ed42c1ba987f526
 F www/style.wiki 92ede836b02fb8958e948b9df51f196e9ec95d68
 F www/sync.wiki 9ea990b4d45a19cf4d7aa473249213db6798378d
 F www/tech_overview.wiki ee507e1cf99186948c2d7207ed36a6838c8575d2
-F www/theory1.wiki 0f84e4669699e5912f3c95174921bd802bca731b
+F www/theory1.wiki f8fe3f921ade08fc42e30ca7e9f5f5d25632ef9a
 F www/tickets.wiki 74561cedee65fa362e67970911a0415f723457db
 F www/uitest.html b4160b619cb6694c0caebd13422b15a3182e5dee
 F www/webui.wiki d6f45339cf55d9e249afc46f062e1fd62519231f
 F www/wikitheory.wiki 4100c1164995d26295591cf8d4170a87ad8d1c43
-P 1294f9b22db300efb0a5b0f2743eaeb80e2d42b9
-R c6cd889112e6b9ee3a707c260e276eeb
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-1.26 *
-U drh
-Z e7924235472880b76137c3abb38c6901
+P 60f0cbd4e362d8ec542ec4114ce46af4b8dbf650
+R 7029fcac05581bde3067c76a3ba291c2
+U barak
+Z d6f5c9a7eba632f9485dbd792831ad3c
--- fossil-1.26+dfsg.orig/manifest.uuid
+++ fossil-1.26+dfsg/manifest.uuid
@@ -1 +1 @@
-c9cb6e72932fefbec9a8c025ea0727565ee54086
+e7bc34b73ab01cde78c2aa268859ff4edb773f93
--- fossil-1.26+dfsg.orig/www/theory1.wiki
+++ fossil-1.26+dfsg/www/theory1.wiki
@@ -110,7 +110,7 @@ just a programming language.
 
 For certain types of problems, SQL has a huge advantage over other
 programming languages because it is so high level and because it allows
-programmers to focus more on the <i>what</i> and less of the <i>how</i>
+programmers to focus more on the <i>what</i> and less on the <i>how</i>
 of a computation.  In other words,
 programmers tend to think about problems at a much higher level when
 using SQL; this can result in better applications.
