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.22.1.orig/manifest.uuid
+++ fossil-1.22.1/manifest.uuid
@@ -1 +1 @@
-5dd5d39e7cc76dccd77f881eaedbf693d0a0a667
+ab461f39afecb26148a7e9b8b0655f9c3efc8794
--- fossil-1.22.1.orig/manifest
+++ fossil-1.22.1/manifest
@@ -1,8 +1,8 @@
-C Avoid\sa\svalgrind\swarning\sin\sthe\sside-by-side\sdiff\slogic.
-D 2012-03-19T12:45:47.592
+C bump\sdh\sand\spolicy\sversions
+D 2012-03-29T08:48:38.613
 F BUILD.txt 8ebfd7f92eff1922aaf28ebcce6639a39fcb5cdd
 F COPYRIGHT-BSD2.txt c7dd1de9f9539a5a859c2b41fe4560604a774476
-F Makefile.classic 610ce9eedc0d35e35692fb8b0fc2fdd8359a04fd
+F Makefile.classic 610ce9eedc0d35e35692fb8b0fc2fdd8359a04fd x
 F Makefile.in c663b6547744cc8061ad3e95930b1cabda25333f
 F VERSION 5f53333c05b38da9812402678d6f6ce73ef7d4d8
 F ajax/README 133f25a88f21479a20cc3b20a8dfa0f0fa807ffc
@@ -53,7 +53,20 @@ F autosetup/local.tcl 148de330d2f7dee3e9
 F autosetup/system.tcl 180ac175844a263c5767cc0a4e1e574c5919c31c
 F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c
 F configure 239cde01aca7fc63a2903f85bd2a6414189f1bd4 x
-F debian/makedeb.sh b57db65590abc4216946cecd9850a94fd3a4b19f
+F debian/README.Debian c4454849a34a6ec363880bb734c4caad9f0d8719
+F debian/changelog 263133cc5f99734ac25db55298226260b4dceec1
+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 3c524db25fd5531cca49d8ce92e86aa6fd8c92d3
 F src/add.c 087531f77613171cf1e3ec29f526ad7fec0eb844
@@ -80,7 +93,7 @@ F src/db.c b19a2182d3153b40b9ba00a8b793c
 F src/delta.c e3dfb31289b71aa446b61fc6e9d09a3fcdd92710
 F src/deltacmd.c 08f55239e28aa9530f3f53006f7b69b03fb51ede
 F src/descendants.c 685633650b44a0dd598b5161c82a6c45aac48919
-F src/diff.c 9787d3423d257254226c267b09fbcf69ba1574ab
+F src/diff.c f7608cab26bb42ccbd7ff7c0ae2e5cd050cfd27d
 F src/diffcmd.c 313e3cafca96cd9f99ea58b90fed91a1d9322c0a
 F src/doc.c 2ff7f76502e45293640912e13f73b6dd3841cd80
 F src/encode.c f09c83a1a637bf77ddf5d102956c094179515918
@@ -118,7 +131,7 @@ F src/main.c b4253150b04287e3ca58447858f
 F src/main.mk 49c5b5cdbe2e308189fa1a938fe452c1118ecb11
 F src/makeheaders.c 8ddc86f2e9e0415364c41206bcf8157739541927
 F src/makeheaders.html 4428f89f94c3b333b106171fe63f2c175d0ee53b
-F src/makemake.tcl 19421cea38dcf2d0bfd1c55c1c4c1c80efd8e204
+F src/makemake.tcl 19421cea38dcf2d0bfd1c55c1c4c1c80efd8e204 x
 F src/manifest.c 8e439f60b651a31fea46876475770875fe263335
 F src/md5.c b3c2d3918d5d197fa99b8df19be5f85de72de8b8
 F src/merge.c 97116104e753460b2ccf73dad72f3e61cb3e2f98
@@ -359,13 +372,10 @@ F www/stats.wiki 69851d26ed42c1ba987f526
 F www/style.wiki 563afb27ea91812024a804b9c9593171dd1ed8d4
 F www/sync.wiki 9ea990b4d45a19cf4d7aa473249213db6798378d
 F www/tech_overview.wiki 729384def59791576850e08b00b506fdf7843334
-F www/theory1.wiki 0f84e4669699e5912f3c95174921bd802bca731b
+F www/theory1.wiki f8fe3f921ade08fc42e30ca7e9f5f5d25632ef9a
 F www/webui.wiki d6f45339cf55d9e249afc46f062e1fd62519231f
 F www/wikitheory.wiki 4100c1164995d26295591cf8d4170a87ad8d1c43
-P f7e215bcac885cb40b5a9dcda563f636c9c7fd7a
-R 8fccb553abc013a7e1438e3609a7c3ad
-T *branch * branch-1.22
-T *sym-branch-1.22 *
-T -sym-trunk *
-U drh
-Z 60ae5f2086d044732e97153f54fa4280
+P d9a54377685517720078267904993b318173b20f
+R 83eedda581c2add0ffdbc7b658721061
+U barak
+Z 0adef8b2285c18034fa0cd9f13641b0d
--- fossil-1.22.1.orig/www/theory1.wiki
+++ fossil-1.22.1/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.
--- fossil-1.22.1.orig/src/diff.c
+++ fossil-1.22.1/src/diff.c
@@ -883,7 +883,6 @@ static void sbsDiff(
   int nChunk = 0; /* Number of chunks of diff output seen so far */
   SbsLine s;    /* Output line buffer */
 
-  memset(&s, 0, sizeof(s));
   s.zLine = fossil_malloc( 10*width + 200 );
   if( s.zLine==0 ) return;
   s.width = width;
