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.33.orig/autosetup/autosetup
+++ fossil-1.33/autosetup/autosetup
@@ -422,7 +422,7 @@ proc options {optlist} {
 	if {[opt-bool option-checking]} {
 		foreach o [array names ::useropts] {
 			if {$o ni $::autosetup(options)} {
-				user-error "Unknown option --$o"
+				user-warning "Unknown option --$o"
 			}
 		}
 	}
@@ -759,6 +759,12 @@ proc user-error {msg} {
 	exit 1
 }
 
+proc user-warning {msg} {
+	show-notices
+	puts stderr "Warning: $msg"
+	puts stderr "Try: '[file tail $::autosetup(exe)] --help' for options"
+}
+
 # @user-notice msg
 #
 # Output the given message to stderr.
--- fossil-1.33.orig/manifest
+++ fossil-1.33/manifest
@@ -1,5 +1,5 @@
-C Version\s1.33
-D 2015-05-23T11:11:31.970
+C update\sdebian/changelog
+D 2015-07-11T23:38:04.565
 F .dockerignore 29c5476ae4fb609219ea3f11d60c4b133a037b68
 F .fossil-settings/clean-glob c1679d70a381afc39909203441036a736fb4b596
 F .fossil-settings/encoding-glob f72f509f8101fb1f252c5719175a300aaabce8e0
@@ -14,7 +14,7 @@ F Makefile.classic 8860fc8763421cb968e05
 F Makefile.in 4c745f08a8ecfe6e1f227e2a6d33cce3adc532d0
 F VERSION 68b05f0ffffaf08e478922297c5140cc3b5d6965
 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 29c5eb998ee1b33f8138f26618ef1014a0555e48
 F ajax/index.html 144dfb6264fd55caf41e9138e94110f846c2d701
@@ -48,7 +48,7 @@ F art/encode9.tex 84df5abf42b007748ec0ea
 F auto.def e70a82048f77a7f67461cd7a06a287313e066531
 F autosetup/LICENSE 34b2f1d7acba3eeb992e4281307640989cd08d0a
 F autosetup/README.autosetup 4e0b671b54288fc64d851d056822ee5fec4d3365
-F autosetup/autosetup f80eb8d3ebc34b06b08095daf8d964a898ea2777 x
+F autosetup/autosetup 81cb02c15279da3890a59576594c240fa2f997f1 x
 F autosetup/cc-db.tcl 2789d831c2f4ac5364d6aaf0ea922b5fad382f4d
 F autosetup/cc-lib.tcl 3c6bbfcb75eacfd4d5b060b9da74bfbf6e932305
 F autosetup/cc-shared.tcl 6634fa62ced64692179819ef83eb0ade13f6f7d0
@@ -60,7 +60,7 @@ F autosetup/find-tclsh f973558ad74bd8e4d
 F autosetup/jimsh0.c c4b6eb336c5fb548e747b1dc50ffc710fc0f7df0
 F autosetup/local.tcl 3a6a7704f546f0863f86f69df7af1858de9c41c9
 F autosetup/system.tcl 9e878fb45e32f6a2790ac82b84f9c9d951e15c68
-F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c x
+F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c
 F compat/tcl-8.6/generic/tcl.h 3e49f8e5404fd60181c69b6d0ad075e12c4fbd4d
 F compat/tcl-8.6/generic/tclDecls.h 9f431aa5c9a819efa078fadecf3fb1214137455d
 F compat/tcl-8.6/generic/tclPlatDecls.h 05f8965cb99af1c9bb78ff437e991f49a598f7b7
@@ -306,7 +306,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 8c466f7a600c1fcf21c6507921a9279a86fb151d
+F debian/changelog 7104df90329cb028c315f2167570fed406006307
+F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
+F debian/control d8ff692f49133213e4f1151806c53c88a298f440
+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 7d6814d13a021f24cdb66bf021da9ec585032df7 x
+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
+F debian/source/patch-header 84c8aca673f2fc094c29a10bd519fca36a57e9f6
+F debian/watch 6761f44df048b7be1ed9ac89d23c31d24c091ec7
 F fossil.1 2947f4d66ede5508f4fbe501e1e965df3b3a243d
 F setup/fossil.iss 57e01e1feb0198de025417c0a98f1d4b1c444f53
 F setup/fossil.nsi 688d5a732b08facc529dceeb9fb1ce5c9aa050ab
@@ -730,17 +743,13 @@ F www/style.wiki 4c9c67c0eddba030a73a55e
 F www/sync.wiki ecd7e356270a40e81649970c1b606767db68d9e3
 F www/tech_overview.wiki 66d893fd0bca7f5dbc659ab0b4e9dde987e4fdb3
 F www/th1.md bf69f21f480afe640a327cd0d392be77a9a3c1bb
-F www/theory1.wiki ddd2a87bc0849a3da7c2187cb91219bf0941dae0
+F www/theory1.wiki 2618357f5fdd2f767f177f161827053ac1193f20
 F www/tickets.wiki 717ff5a436834bf0ec42f9501216449c40b938fe
 F www/uitest.html b4160b619cb6694c0caebd13422b15a3182e5dee
 F www/webpage-ex.md 72a7965e3c53ea04beb0bbac5e11757b308b2059
 F www/webui.wiki 7fe551ac712f1036d3927f983e6469962fe4402d
 F www/wikitheory.wiki 06d46f731993c0d0ab1c9b202fea77a6dbd6a7a8
-P 36c457b086ed710f2f8b825e2657ead54b27364f
-R fa566a255d636eaaa4b59169412ce50e
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-1.33 *
-U drh
-Z fcd65a9b4e598d39eae8601775b2f8cb
-# Remove this line to create a well-formed manifest.
+P 2f685e7e3ecabb6b4e39c36274c88392a0590b0f
+R 3185dda9e0685c069a43b32b98ec3032
+U barak
+Z 840d47f63454f01ee979438a655bb0fc
--- fossil-1.33.orig/manifest.uuid
+++ fossil-1.33/manifest.uuid
@@ -1 +1 @@
-9c65b5432e4aeecf3556e5550c338ce93fd861cc
+bd97cb73068243a100517b7465c1f9f8acf8d24f
--- fossil-1.33.orig/www/theory1.wiki
+++ fossil-1.33/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.
