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://people.debian.org/~bap/fossil.fsl
--- fossil-2.5.orig/manifest
+++ fossil-2.5/manifest
@@ -1,5 +1,5 @@
-C Version\s2.5
-D 2018-02-07T18:48:14.863
+C configure\s--with-tcl=1
+D 2018-02-14T11:45:01.475
 F .dockerignore 29c5476ae4fb609219ea3f11d60c4b133a037b68
 F .fossil-settings/binary-glob 34cc11b3b509fd5064afe327e70765799f314c9a
 F .fossil-settings/clean-glob 50327fe7150c88e5daf5150f240dc805398665fb
@@ -16,7 +16,7 @@ F Makefile.classic f0e49e92670a94553f0e5
 F Makefile.in 54b9af364d262761ac05970f96ea609467109548636807a584565350289d80dc x
 F VERSION bd6291c6a65f6ed39074abc5ef32954162961af9ca092dd6cb0b9ba0529c3fb5
 F ajax/README 133f25a88f21479a20cc3b20a8dfa0f0fa807ffc
-F ajax/cgi-bin/fossil-json.cgi.example 5e1245c336a0666e3777c5ba46ce2bbcd6450619
+F ajax/cgi-bin/fossil-json.cgi.example 5e1245c336a0666e3777c5ba46ce2bbcd6450619 x
 F ajax/i-test/rhino-shell.js 2b735676d55e3d06d670ffbc643e5d3f748b95ea
 F ajax/i-test/rhino-test.js c0e2d874caa424a8cb1628c8d85a4a6b197b8d32
 F ajax/index.html f4f8d1b79b51a12dd167f5e16a1e3e6e38f8903e
@@ -59,11 +59,10 @@ F autosetup/config.guess 947c8873202b420
 F autosetup/config.sub 1ed99f2fce4975f55e82b3833baf74fbcd8bdda0 x
 F autosetup/default.auto f78163e478676728918cbb7360abddb9c830e882
 F autosetup/find-tclsh f973558ad74bd8e4d55b677d9c166cbb35f34186 x
-F autosetup/jimsh0.c c31f25b294314ea582cb2acf8fe4aa04de1065060b72f58fa58c5dd5644863cd
 F autosetup/local.tcl 60b0633b484a89c87aed299e4c22ac5287803f921ba9b653a04b0c518f699cda
 F autosetup/pkg-config.tcl 1d3eb0476a271d7c506aa253a4a189a68344950d726381d2d0417bb31af21b4d
 F autosetup/system.tcl 8faf3eeadc63cb1718ada6eccecdb8f631801a6627e1d14c80230f8686d23d86
-F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c x
+F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c
 F autosetup/tmake.auto 76789a7eb47bb057c1d230f549dd6cf1cf3ac376
 F autosetup/tmake.tcl 585cf569bb5b94a98876615d6b6dd6d6d84c93a9
 F compat/tcl-8.6/generic/tcl.h 3e49f8e5404fd60181c69b6d0ad075e12c4fbd4d
@@ -108,7 +107,6 @@ F compat/zlib/contrib/delphi/ZLibConst.p
 F compat/zlib/contrib/delphi/readme.txt 366e08eaa227cd3d09810c45639aedf4879b7ecf
 F compat/zlib/contrib/delphi/zlibd32.mak ddf83b34d4c7d41ace39f96b5cb13fb390c8d2eb
 F compat/zlib/contrib/dotzlib/DotZLib.build 6f87ba12d786feca35738d0e9ce1f0f03f292881
-F compat/zlib/contrib/dotzlib/DotZLib.chm a1245c21c7e918fa2919fd10bbe5604fc81faf49
 F compat/zlib/contrib/dotzlib/DotZLib.sln 4946bdb71b79bff62f9217802b7524010c669408
 F compat/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs 9f1db1177b2e9a014f72bb3cd80be17133e06d16
 F compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs 3807a0e24a57b92ea301559cab7307b8eab52c51
@@ -318,7 +316,19 @@ F compat/zlib/zlib2ansi e9859eecf47ae662
 F compat/zlib/zutil.c 2f1fcc93488ac84acf984415b6ea0bd63c72aa49
 F compat/zlib/zutil.h f32dab3880d47eca1b71c308cf6542b32941b23c
 F configure 239cde01aca7fc63a2903f85bd2a6414189f1bd4 x
-F debian/makedeb.sh a178ffe4795ef9cc3ef3550572c20fe4110c8f87d9368f06526714ff12e33823
+F debian/README.Debian f0f10ef30732c830b5a0eab2eb1cb7eaa5857671c243b50aab04fe4da6833673
+F debian/changelog 090466fde0086fca20c1f5817d43e407ccc62a2cfbb2ab4fe6252eb8221a165f
+F debian/compat 3147dbedb6618cf418dc2a4e6e46b7f598ce62d3e346f8043e507b6626b9c9c6
+F debian/control 0a035acf189f9af9f2d5de5c4188f3abaa371b30b2640c5dda64dcac87d8d2ea
+F debian/copyright 3e7e1c14dc60cea82bdb050bf7e6f7764585fe65926284fcbb8ac1821729f4ab
+F debian/fossil.bash-completion e1e460f40668463a8e3e8df9a99de8f9301c9730
+F debian/fossil.docs 45a770a8534b1a439a32546145737975a9217b30
+F debian/fossil.manpages 8ca3a843375393ec37484e4dbae3d4dfe5b4ddcf
+F debian/rules fefadbd367d36f000d1b60a9f96f196f8b56572869e089f0a280a403cd28c48a x
+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
+F debian/source/patch-header 84c8aca673f2fc094c29a10bd519fca36a57e9f6
+F debian/watch 4e720404dfa8d3abb8b1111a26322de1d9c626321378080e1e3276a122e8133e
 F fossil.1 740ad69dfd64430b1e31d22ac799a6086c622ef8
 F setup/fossil.iss 57e01e1feb0198de025417c0a98f1d4b1c444f53
 F setup/fossil.nsi 806b01761d5d42543d1c90b95b927c0ea8b251bf
@@ -505,7 +515,7 @@ F src/loadctrl.c 76592cbc8dce7f6d6aeffef
 F src/login.c 8f07f96589451ba414fa42c28b2f77bf3a713e5cf9e40abd364ec2bbb4854826
 F src/login.js 3a7accefb8586f3f4587d5bb34eeb393caee7fff9500951d653f3a401cf65b3a
 F src/lookslike.c 2f276c62fe8e83fcb2b8a41b1e75e50713c4c165c92111c63c0f0171e6828ddf
-F src/main.c 267f42740eb32b10939fba64790d67f728cfaf362ebc5fa4c25051ed23cc372e
+F src/main.c 5b63842535ad70c859362d3a8aabd76bc06990b3ef018c8ac1085591939a206a
 F src/main.mk 24214bf65f5855c282632f76b620074487ae7a52dd45a07e342e8153e9722d2d
 F src/makeheaders.c ef97646ffc78b8400b06ab9751925bcc7b28dbc1
 F src/makeheaders.html c09a2e625c04fe6ac83bcbe148af321f75a956eb
@@ -553,7 +563,7 @@ F src/skin.js 4169dc16f8e0cfaf88ee92a6a3
 F src/skins.c fcbd5f57c0f2357e9dbde1295c72d62d4deb99dc1f57f1c505da1f22bd49af05
 F src/sorttable.js 305b1187e44046264d2da98f8e1d53bc078373e3d1fc603049d48067c4125c9f
 F src/sqlcmd.c 031b91c0ee221f41795bbb95e4ef9f6590478dc1468ee767e3ae744ff3381849
-F src/sqlite3.c 206df47ebc49cd1710ac0dd716ce5de5854826536993f4feab7a49d136b85069
+F src/sqlite3.c 34fe12e489d8707d291cb51154dcdf878896aa1bb36abf9e3ab3a396dfc6b623
 F src/sqlite3.h ba49aa5758c70c8b078f774736c13bb9e0e3f34e153fe016e523b5208e5f7784
 F src/stash.c 8f0bc283ba1099458e48ecd4c059a85bef34aef02066d972f61c165f2c47177b
 F src/stat.c 39a33f66a4d803c036f73993bd043f5484816b54f8cded166b07c100cc4097fd
@@ -837,7 +847,7 @@ F www/sync.wiki 54f36924056d9b854a509ed1
 F www/tech_overview.wiki 202a068495f341712b040ed2c672b4f1a39f4959ef4a71608923b5eefd494364
 F www/th1-hooks.md d03bf09f51a061c17f39eefe6149dae36930da5e905e8bd38d610c20b143f6bc
 F www/th1.md 8fe09653d75c61780b48ef9e24c18984bbd657befb9495fee0bf3f6ee99842d9
-F www/theory1.wiki c5a3a5c9c81a94787d20eacd5184f8afa0c7519efaacd75f84633d129763644a
+F www/theory1.wiki b12d58c80fb3a9860a8dd17452af6f4857bbdf13
 F www/tickets.wiki 717ff5a436834bf0ec42f9501216449c40b938fe
 F www/uitest.html 7d7bd8198689c266012398d1df12eb71ab98031c
 F www/unvers.wiki a75ea510c408c0bb83c396afbe72948b8b2202cd
@@ -846,11 +856,7 @@ F www/webui.wiki 411350e0bfcabd3e3e8a750
 F www/whyusefossil.wiki 730056ead695df82c7aa9dd099cf34b4bfbfd473
 F www/wikitheory.wiki bd20172d783835606043b15bba0c69c9f606a87b
 F www/xkcd-git.gif 1f9bc44ed41cad3f5ac18f21e3463e3390b53b29
-P f390552d0e5c0174560772f81096910178185165b15fea2ad4ed101049d0c8a0
-R 1479a816adf739cdbbe4bfbdeeb0fd59
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-2.5 *
-U drh
-Z ee45093a20ca2906fd50424eb1400fb7
-# Remove this line to create a well-formed manifest.
+P 3fd77dfea9aafbd55de47c1f8c773c640ad980097c13474defd8a9f215b8277a
+R 06e386ff390c287b8d78257ffa62b607
+U barak
+Z 7ad34e17149f42abfea8f584ad823cc2
--- fossil-2.5.orig/manifest.uuid
+++ fossil-2.5/manifest.uuid
@@ -1 +1 @@
-188a0e290419211f7928be4e808d58331c9fdd742d73caa7818c2ac0b66b605c
+a425d84480ccea1a11d1fab64334486ec2786812df59f47d93d89eb483c6f32e
--- fossil-2.5.orig/src/main.c
+++ fossil-2.5/src/main.c
@@ -1469,7 +1469,7 @@ static void process_one_web_page(
         **
         ** For safety, do not allow any file whose name contains ".fossil"
         ** to be returned this way, to prevent complete repositories from
-        ** being delivered accidently.  This is not intended to be a
+        ** being delivered accidentally.  This is not intended to be a
         ** general-purpose web server.  The "--file GLOB" mechanism is
         ** designed to allow the delivery of a few static images or HTML
         ** pages.
--- fossil-2.5.orig/src/sqlite3.c
+++ fossil-2.5/src/sqlite3.c
@@ -122007,7 +122007,7 @@ static void substSelect(
 **   (9)  If the subquery uses LIMIT then the outer query may not be aggregate.
 **
 **  (**)  Restriction (10) was removed from the code on 2005-02-05 but we
-**        accidently carried the comment forward until 2014-09-15.  Original
+**        accidentally carried the comment forward until 2014-09-15.  Original
 **        constraint: "If the subquery is aggregate then the outer query 
 **        may not use LIMIT."
 **
@@ -185862,7 +185862,7 @@ static sqlite3_module jsonTreeModule = {
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 /****************************************************************************
-** The following routines are the only publically visible identifiers in this
+** The following routines are the only publicly visible identifiers in this
 ** file.  Call the following routines in order to register the various SQL
 ** functions and the virtual table implemented by this file.
 ****************************************************************************/
@@ -206593,7 +206593,7 @@ struct Fts5VocabCursor {
   Fts5IndexIter *pIter;           /* Term/rowid iterator object */
 
   int nLeTerm;                    /* Size of zLeTerm in bytes */
-  char *zLeTerm;                  /* (term <= $zLeTerm) paramater, or NULL */
+  char *zLeTerm;                  /* (term <= $zLeTerm) parameter, or NULL */
 
   /* These are used by 'col' tables only */
   Fts5Config *pConfig;            /* Fts5 table configuration */
