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.0.orig/manifest
+++ fossil-2.0/manifest
@@ -1,5 +1,5 @@
-C Version\s2.0
-D 2017-03-03T12:00:30.977
+C the\sSEE\sencryption\sstuff\sseems\snon-free,\sso\snever\smind\sthat
+D 2017-03-13T14:05:14.277
 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 ca04b4081ad0dc54256f7d609168750c2247882e
 F VERSION 7959c969e092f2a5a8604e2287807ac5b1b384ad
 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
@@ -63,7 +63,7 @@ F autosetup/jimsh0.c e2e67757a06d0cab4d5
 F autosetup/local.tcl 3a6a7704f546f0863f86f69df7af1858de9c41c9
 F autosetup/pkg-config.tcl 232a81fd534755653144cea9558656908189e97f
 F autosetup/system.tcl 82f4b642c6c605dc1fa8cb728bf251e501350572
-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
@@ -323,7 +323,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 b57db65590abc4216946cecd9850a94fd3a4b19f
+F debian/README.Debian 4f504cbfd2afbe917ad659e85f995c5e5bd27cd2
+F debian/changelog d0ca7cf932ff9bc29b53cb5a4323576d89b100e7
+F debian/compat 4143d3a341877154d6e95211464e1df1015b74bd
+F debian/control d00ad12cfaf7edfc9cf3d4a29efc8df757de8ee7
+F debian/copyright 3d850ea9194da4d2322fcf11b61174f7e9a6818a
+F debian/fossil.bash-completion e1e460f40668463a8e3e8df9a99de8f9301c9730
+F debian/fossil.docs 45a770a8534b1a439a32546145737975a9217b30
+F debian/fossil.manpages 8ca3a843375393ec37484e4dbae3d4dfe5b4ddcf
+F debian/rules 85a94009eb1ba23d62ac0f25a447107dd89f3687 x
+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
+F debian/source/patch-header 84c8aca673f2fc094c29a10bd519fca36a57e9f6
+F debian/watch ba25c94ab4aa8d9c3939c81f2e32dcef84593ea5
 F fossil.1 740ad69dfd64430b1e31d22ac799a6086c622ef8
 F setup/fossil.iss 57e01e1feb0198de025417c0a98f1d4b1c444f53
 F setup/fossil.nsi 806b01761d5d42543d1c90b95b927c0ea8b251bf
@@ -383,7 +395,7 @@ F skins/rounded1/details.txt b8f20e99b2d
 F skins/rounded1/footer.txt d20c3ed17ceccc1ad865c4fa50375d197e79f877
 F skins/rounded1/header.txt 90ea81c5b14e22a048e182c22769e9aa779d8752
 F skins/xekri/README.md 4acf7362d3bae2959b35f0d07694128a081f7049
-F skins/xekri/css.txt 50acf931233c8b882c57d6dbe104b5f53cc4883d
+F skins/xekri/css.txt be8150445f26a2c4ad703af1e34576bb1d382067
 F skins/xekri/details.txt b8f20e99b2dd421f72f686b286f04c0283f242c5
 F skins/xekri/footer.txt e8a573cd5148c80926e8bed7f1407519cefbbd7c
 F skins/xekri/header.txt b5adf120f4828b86e6bb9efa6d3345b51ab56fcf
@@ -436,7 +448,7 @@ F src/gzip.c b0d60daf0cf3e17c848906ec952
 F src/hname.c f0054f0dca9db094c53d16390f92b129d367ad55
 F src/http.c 5d5c19958bad3b0de0be4f47ad022c689be0d543
 F src/http_socket.c 6d14a9c8e2e3a7d9cd0acfdcdf544173b339cab1
-F src/http_ssl.c 0d21a4842ad8c8902309a93cbc5ec2b4768a5710
+F src/http_ssl.c a64ed129e847162f23fe96b501d911576054370c
 F src/http_transport.c c6f2ce84687a4f210c62f99948154232abf46bec
 F src/import.c 1c8c9a6f994826b2a129847aa7b652a55a771c99
 F src/info.c 41b0b0c411516623b09a22a5252b7914786bd7f7
@@ -503,12 +515,12 @@ F src/shun.c bcbc874407f9dd9b98a62033948
 F src/sitemap.c 60b9f066776bd05db01f7db31353f4cae2df4faf
 F src/skins.c 0b6ae35015f48cbe9cef2f97d65105a796fc366b
 F src/sqlcmd.c c9d03589cc39ae6bb5242ed9186645fbb5b67dea
-F src/sqlite3.c 882d49dd40ebb58e25b3fb9b790ecb2fd7d9cc7e
+F src/sqlite3.c eafac5424d1d610bcdd2f1d6b7e6956a5025f2fb
 F src/sqlite3.h b590133adb2907b8b635c5df4c88393ea94761bd
 F src/stash.c ac247e5b718cd29c6c1fc543f7b984be9b9f53e6
 F src/stat.c 6eeba5211c329f742b6a9dfe65519955a8d9ce00
 F src/statrep.c 0845172bf1b5c8f724b4176557f34895a8dcc4ae
-F src/style.c cf9edbf403e1df8e094e8a1d44d5dd9516046678
+F src/style.c 1ce7078e469af57bb12c715a5e8520ee53056f21
 F src/sync.c 8b50b5df163adae3fc79281fd1f7a2ecbd3a4381
 F src/tag.c 46fdc5d0e7c8d60bedae8ef4227692587813bc7f
 F src/tar.c 7d2471e3ae0f6234ed1d5bb59f6e79151d9fa565
@@ -524,7 +536,7 @@ F src/translate.c 33b65539a12abd079a5797
 F src/undo.c d3cca342dd73eaec65e352d978e8f7a9e75a5ddd
 F src/unicode.c 49d229135beb3cba5a58013dfda577fa51ab96ee
 F src/unversioned.c 8e5f76b5847295f84f0772937617cc945721a72f
-F src/update.c a66c55724db6a355c28d542fcfc4320b9de0eb36
+F src/update.c 18ea927a21118967b7be90e3b69fb1ac800ab78e
 F src/url.c be48911fa1624051538157f2dfc815ec082e7206
 F src/user.c 1d31844a9e48e2ab515586bf54ecc4b30b47d5b5
 F src/utf8.c 9f458b9698fc928cc21e375538f268651d1d22a2
@@ -760,7 +772,7 @@ F www/newrepo.wiki 8b05313b8c7b3ceb71dfc
 F www/password.wiki 135405d9e2261e759d0d85fd2104848589c485e6
 F www/permutedindex.html e2f7a7752d2527674bfe905d1e2e91cffc3e4e38
 F www/pop.wiki 9f3459c3343265fed252854bfbab49afd2008797
-F www/private.wiki 1c55c09563361db73b733386dc0fd6689156d5ab
+F www/private.wiki d5fb4755e39352116bafdbdecee96ca24221c8a1
 F www/qandc.wiki b8b6f9668796bde63440e64dfd40a176766dd78e
 F www/quickstart.wiki afc5e41e06cc2d54364016e3d0d7dff1209b082d
 F www/quotes.wiki 6f77c1af17f05596d0f6a4cc88f149a61188ecfd
@@ -777,7 +789,7 @@ F www/style.wiki da3a414d4c57c3da2636daf
 F www/sync.wiki f2d19da3016d11203eed108df2215ae1425236f7
 F www/tech_overview.wiki 40fa2c33db02cf457f1b3bd1663404c428b6dda7
 F www/th1.md 19fd3af8400d8dbeb0d7c94370db06c73114f5f1
-F www/theory1.wiki f3b67ce69fc710a54a9ec89f6d12f90da0632ea4
+F www/theory1.wiki b12d58c80fb3a9860a8dd17452af6f4857bbdf13
 F www/tickets.wiki 717ff5a436834bf0ec42f9501216449c40b938fe
 F www/uitest.html 7d7bd8198689c266012398d1df12eb71ab98031c
 F www/unvers.wiki a75ea510c408c0bb83c396afbe72948b8b2202cd
@@ -786,11 +798,7 @@ F www/webui.wiki 411350e0bfcabd3e3e8a750
 F www/whyusefossil.wiki 730056ead695df82c7aa9dd099cf34b4bfbfd473
 F www/wikitheory.wiki bd20172d783835606043b15bba0c69c9f606a87b
 F www/xkcd-git.gif 1f9bc44ed41cad3f5ac18f21e3463e3390b53b29
-P 69b9b9563fd471936d8591fd2f7e79b3e4abe497
-R b14b318ebcd302d700096463b7de65d4
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-2.0 *
-U drh
-Z dd9b6c6458a6b4370d68a3c57a9f1bd8
-# Remove this line to create a well-formed manifest.
+P feb3b2e71a22a92827553041d45f9dcf990fefcd
+R 7ff1b70010b968265fa70d07b5111ea8
+U barak
+Z 810ef2c4a2a71d7801340c36f6a5de87
--- fossil-2.0.orig/manifest.uuid
+++ fossil-2.0/manifest.uuid
@@ -1 +1 @@
-1d407cff32978b6ed57138da36787d547ce6887d
+fc8d4dd735122f5281f5ee597ce8d6092a9e5bf1
--- fossil-2.0.orig/skins/xekri/css.txt
+++ fossil-2.0/skins/xekri/css.txt
@@ -989,7 +989,7 @@ blockquote.reportError {
 p.noMoreShun {
   color: #00f;
 }
-/* format for artifact lines beeing shunned */
+/* format for artifact lines being shunned */
 p.shunned {
   color: #00f;
 }
--- fossil-2.0.orig/src/http_ssl.c
+++ fossil-2.0/src/http_ssl.c
@@ -295,8 +295,10 @@ int ssl_open(UrlData *pUrlData){
   SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
 
   if( !pUrlData->useProxy ){
-    BIO_set_conn_hostname(iBio, pUrlData->name);
-    BIO_ctrl(iBio,BIO_C_SET_CONNECT,3,(char *)&pUrlData->port);
+    char *connStr;
+    connStr = mprintf("%s:%d", pUrlData->name, pUrlData->port);
+    BIO_set_conn_hostname(iBio, connStr);
+    free(connStr);
     if( BIO_do_connect(iBio)<=0 ){
       ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
           pUrlData->name, pUrlData->port, ERR_reason_error_string(ERR_get_error()));
--- fossil-2.0.orig/src/sqlite3.c
+++ fossil-2.0/src/sqlite3.c
@@ -119071,7 +119071,7 @@ static void substSelect(
 **        aggregates.
 **
 **  (**)  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
 **        text: "The subquery does not use aggregates or the outer query 
 **        does not use LIMIT."
 **
--- fossil-2.0.orig/src/style.c
+++ fossil-2.0/src/style.c
@@ -1241,7 +1241,7 @@ const struct strctCssDefaults {
     @   color: blue;
   },
   { "p.shunned",
-    "format for artifact lines beeing shunned",
+    "format for artifact lines being shunned",
     @   color: blue;
   },
   { "span.brokenlink",
--- fossil-2.0.orig/src/update.c
+++ fossil-2.0/src/update.c
@@ -738,7 +738,7 @@ int historical_blob(
 **
 ** Revert all files if no file name is provided.
 **
-** If a file is reverted accidently, it can be restored using
+** If a file is reverted accidentally, it can be restored using
 ** the "fossil undo" command.
 **
 ** Options:
--- fossil-2.0.orig/www/private.wiki
+++ fossil-2.0/www/private.wiki
@@ -60,7 +60,7 @@ you have to enable the "Private" capabil
 to enable private branch syncing.  The Admin ("a") and Superuser ("s") do
 <u>not</u> imply Private ("x"); you'll have to set "x" in addition to
 "a" or "s".  This is a little extra work, but there is a purpose here:
-the interface is designed to make it very difficult to accidently
+the interface is designed to make it very difficult to accidentally
 sync a private branch to a public server.  It is highly recommended that
 you leave the "x" capability turned off on all repositories used for
 collaboration (repositories to which many people push and pull) and
@@ -69,7 +69,7 @@ branches.
 
 Private branch sync only works if you use the --private command-line option.
 Private branches are never synced via the auto-sync mechanism.  Once
-again, this restriction is designed to make it hard to accidently
+again, this restriction is designed to make it hard to accidentally
 push private branches beyond their intended audience.
 
 <h2>Purging Private Branches</h2>
--- fossil-2.0.orig/www/theory1.wiki
+++ fossil-2.0/www/theory1.wiki
@@ -111,7 +111,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.
