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-1.36.orig/manifest
+++ fossil-1.36/manifest
@@ -1,5 +1,5 @@
-C Version\s1.36
-D 2016-10-24T14:59:33.199
+C log\schanges
+D 2016-12-12T00:16:47.217
 F .dockerignore 29c5476ae4fb609219ea3f11d60c4b133a037b68
 F .fossil-settings/clean-glob c1679d70a381afc39909203441036a736fb4b596
 F .fossil-settings/encoding-glob f72f509f8101fb1f252c5719175a300aaabce8e0
@@ -14,7 +14,7 @@ F Makefile.classic f0e49e92670a94553f0e5
 F Makefile.in e68d67b0141655f3f6934ad35df484e50e84ff32
 F VERSION ea3b32fdf753b0b9cc7b2dddfd8fe26be61d0960
 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 ff6a9f6bedd406784a6bfb1238beb8deee713069
@@ -61,7 +61,7 @@ F autosetup/jimsh0.c e2e67757a06d0cab4d5
 F autosetup/local.tcl 3a6a7704f546f0863f86f69df7af1858de9c41c9
 F autosetup/pkg-config.tcl 232a81fd534755653144cea9558656908189e97f
 F autosetup/system.tcl de2f98df970cf17c5909f6d6534c382f4843a7cf
-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
@@ -309,7 +309,19 @@ 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 2135674f15d3dab289ed5a98c472c56bdb8dbfc1
+F debian/changelog 206c9194a3c3c2fdc9ae9e6e3bb49c22ba6dbff3
+F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
+F debian/control 224144212502a118f8707ca50cc8d3126f08009d
+F debian/copyright 3d850ea9194da4d2322fcf11b61174f7e9a6818a
+F debian/fossil.bash-completion e1e460f40668463a8e3e8df9a99de8f9301c9730
+F debian/fossil.docs 45a770a8534b1a439a32546145737975a9217b30
+F debian/fossil.manpages 8ca3a843375393ec37484e4dbae3d4dfe5b4ddcf
+F debian/rules 4826f83efcb42999165406b56c9d1c113fdf0a85 x
+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
+F debian/source/patch-header 84c8aca673f2fc094c29a10bd519fca36a57e9f6
+F debian/watch c55c64fe52e77ba8aef17d832de56b93bb439eac
 F fossil.1 5dafc0a0e37de8b6d38ca807a12e9e56619812d5
 F setup/fossil.iss 57e01e1feb0198de025417c0a98f1d4b1c444f53
 F setup/fossil.nsi 806b01761d5d42543d1c90b95b927c0ea8b251bf
@@ -369,7 +381,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 58b9ac05ed286534ff2c65f42db230732ca5caae
+F skins/xekri/css.txt b9607a2479ae483c1091ee8cda25740873ee0efa
 F skins/xekri/details.txt b8f20e99b2dd421f72f686b286f04c0283f242c5
 F skins/xekri/footer.txt e8a573cd5148c80926e8bed7f1407519cefbbd7c
 F skins/xekri/header.txt b5adf120f4828b86e6bb9efa6d3345b51ab56fcf
@@ -421,7 +433,7 @@ F src/graph.c 1e8070d743acae021523e42341
 F src/gzip.c b0d60daf0cf3e17c848906ec952ef0a4812d8a49
 F src/http.c 5d5c19958bad3b0de0be4f47ad022c689be0d543
 F src/http_socket.c c38d7bff255b35cc7cfe13405b67c32878f9d838
-F src/http_ssl.c 0d21a4842ad8c8902309a93cbc5ec2b4768a5710
+F src/http_ssl.c a64ed129e847162f23fe96b501d911576054370c
 F src/http_transport.c c6f2ce84687a4f210c62f99948154232abf46bec
 F src/import.c cc5b8328ac8675fd59176508df2e56ffd40be6c1
 F src/info.c 7e61b79de46ef4ecce409b079434fa9ef942aac6
@@ -486,12 +498,12 @@ F src/shun.c 7d0a7eeffdf515b2d78919408fe
 F src/sitemap.c b7c376b21d29322741c804e1f762b34aedb98ad1
 F src/skins.c 524384aafbe9e7707d3b87f42ee72fa63fe91796
 F src/sqlcmd.c a7dce974ba7afde541ed58df98bebce335ed75a5
-F src/sqlite3.c fba106f8f6493c66eeed08a2dfff0907de54ae76
+F src/sqlite3.c 6395204d5d6ddc0b5fa41a4824fbb32110b68c49
 F src/sqlite3.h 38a99d065c4e78a0eef545d92f2e5d495bb9be7a
 F src/stash.c 99687142f3b88d25d5da94d29cd5dfa637a9e65d
 F src/stat.c 8e2c652ba1deb14c61a7286028dd03f342244734
 F src/statrep.c 8e09b8fb6189ea785e06bc7fcd525b288320945f
-F src/style.c 88afceaf6b3bcda35acaf15281cb44d353a822a5
+F src/style.c 783fc95209d9063cfe2471a71a25239e26666d46
 F src/sync.c 9cc2947ef0f1ef73bd9fb1fa7291dd5df2c03ce9
 F src/tag.c 9ed843d120ac1a822fcb926d82c847aa0a0541d2
 F src/tar.c 8cfe3f2ef83784ed5644b3a9c4cd4d85f1096a38
@@ -507,7 +519,7 @@ F src/translate.c 144427e4ae2bfa1966f138
 F src/undo.c d3cca342dd73eaec65e352d978e8f7a9e75a5ddd
 F src/unicode.c 8e02b4fd6af9e735bda68eb06e3be90b6b901a87
 F src/unversioned.c 95327eac5a73649447bb5ae5c938a05686429900
-F src/update.c 8a39e2408a6a6d274d805dd9baab7ccaaa8bf7a9
+F src/update.c 01ee8804a1b55ee04da7aca202fe9c9f265bdfeb
 F src/url.c be48911fa1624051538157f2dfc815ec082e7206
 F src/user.c b3a18340bcd9db3613e67fb6a76689245b18c3d4
 F src/utf8.c bdabea0d93a24eacd31f0f0600edda8af3ce2e19
@@ -742,7 +754,7 @@ F www/newrepo.wiki f0b0a01e2dcf85b2d50f1
 F www/password.wiki 135405d9e2261e759d0d85fd2104848589c485e6
 F www/permutedindex.html 2190e7f8be7f6e1045f40c566431e61a4edfdfbd
 F www/pop.wiki 759734461ff700ab2cf94bec8f1eba08b239a092
-F www/private.wiki 72344489bbae6f7955369559b6ab22e01a64259b
+F www/private.wiki 9cd31c065d752409a671a5c50c4865a507012793
 F www/qandc.wiki e07b21da221b05afeb1905f17af3765045952ba8
 F www/quickstart.wiki d4ead37f048c87a56497d475023d1678e22dfa61
 F www/quotes.wiki 09a040dcc9ae1c3a9121940e3a2255471f8d59cf
@@ -759,7 +771,7 @@ F www/style.wiki da3a414d4c57c3da2636daf
 F www/sync.wiki 2dc71811c4c9d9d32b4cd533258328e4e733402b
 F www/tech_overview.wiki 4d74d28dfc2515d7864c4ecbf7324be9919e3efd
 F www/th1.md 9acd2e58ba57d7c605f4b940fd285483a015168e
-F www/theory1.wiki ddd2a87bc0849a3da7c2187cb91219bf0941dae0
+F www/theory1.wiki 2618357f5fdd2f767f177f161827053ac1193f20
 F www/tickets.wiki 717ff5a436834bf0ec42f9501216449c40b938fe
 F www/uitest.html 7d7bd8198689c266012398d1df12eb71ab98031c
 F www/unvers.wiki a75ea510c408c0bb83c396afbe72948b8b2202cd
@@ -768,11 +780,8 @@ F www/webui.wiki 411350e0bfcabd3e3e8a750
 F www/whyusefossil.wiki fa8a5e30aac0090380f65a1d3fb8482f56054327
 F www/wikitheory.wiki 16ff4640b1d9c9950f12a43cc1958687378204ac
 F www/xkcd-git.gif 1f9bc44ed41cad3f5ac18f21e3463e3390b53b29
-P fdebeba5a03343e3cdbc4727ce1ba1edd3e214a0
-R f301d4943999f1a4f351151363db10f8
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-1.36 *
-U drh
-Z 6dd31ef60a881626c2ab897860077d94
+P ba2d62bc603d334090af59b4b07229a2390f7961
+R c4111685e5ce1065361df9f4ed05e18e
+U barak
+Z 3f9998a55eaf884c4b52b3f77ef7467c
 # Remove this line to create a well-formed manifest.
--- fossil-1.36.orig/manifest.uuid
+++ fossil-1.36/manifest.uuid
@@ -1 +1 @@
-c24373934dc19c0295cf0ad0ab32c79bf3f373b6
+4c00f86886192b539fe9483f75ff612f57b28b05
--- fossil-1.36.orig/skins/xekri/css.txt
+++ fossil-1.36/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-1.36.orig/src/http_ssl.c
+++ fossil-1.36/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-1.36.orig/src/sqlite3.c
+++ fossil-1.36/src/sqlite3.c
@@ -117595,7 +117595,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-1.36.orig/src/style.c
+++ fossil-1.36/src/style.c
@@ -1226,7 +1226,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-1.36.orig/src/update.c
+++ fossil-1.36/src/update.c
@@ -705,7 +705,7 @@ int historical_version_of_file(
 **
 ** 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-1.36.orig/www/private.wiki
+++ fossil-1.36/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-1.36.orig/www/theory1.wiki
+++ fossil-1.36/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.
