Merge from disorder.4.0

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 1c0259425e4fbba1b3ee80732662639da273543f..99a65d99935b6d1c0e307622b4a98d32eace345d 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -77,7 +77,7 @@ server/disorder-deadlock
 server/disorder-dump
 server/disorder-rescan
 server/disorder-speaker
-server/disorder.cgi
+cgi/disorder
 server/disorderd
 server/trackname
 sounds/Makefile
@@ -115,14 +115,14 @@ server/disorder-stats
 *.deb
 *.dsc
 disobedience/disobedience.html
-lib/NormalizationTest.txt
+libtests/NormalizationTest.txt
 lib/CaseFolding.txt
 lib/UnicodeData.txt
 lib/GraphemeBreakProperty.txt
-lib/GraphemeBreakTest.txt
+libtests/GraphemeBreakTest.txt
 lib/WordBreakProperty.txt
 lib/SentenceBreakProperty.txt
-lib/WordBreakTest.txt
+libtests/WordBreakTest.txt
 lib/DerivedNormalizationProps.txt
 tests/*.log
 server/disorder-dbupgrade
@@ -146,34 +146,34 @@ scripts/teardown
 sounds/long.ogg
 sounds/slap.raw
 server/disorder-choose
-lib/t-addr
-lib/t-basen
-lib/t-bits
-lib/t-cache
-lib/t-casefold
-lib/t-cookies
-lib/t-filepart
-lib/t-hash
-lib/t-heap
-lib/t-hex
-lib/t-kvp
-lib/t-mime
-lib/t-printf
-lib/t-regsub
-lib/t-selection
-lib/t-signame
-lib/t-sink
-lib/t-split
-lib/t-syscalls
-lib/t-trackname
-lib/t-unicode
-lib/t-url
-lib/t-utf8
-lib/t-vector
-lib/t-words
-lib/t-wstat
-lib/t-macros
-lib/t-cgi
+libtests/t-addr
+libtests/t-basen
+libtests/t-bits
+libtests/t-cache
+libtests/t-casefold
+libtests/t-cookies
+libtests/t-filepart
+libtests/t-hash
+libtests/t-heap
+libtests/t-hex
+libtests/t-kvp
+libtests/t-mime
+libtests/t-printf
+libtests/t-regsub
+libtests/t-selection
+libtests/t-signame
+libtests/t-sink
+libtests/t-split
+libtests/t-syscalls
+libtests/t-trackname
+libtests/t-unicode
+libtests/t-url
+libtests/t-utf8
+libtests/t-vector
+libtests/t-words
+libtests/t-wstat
+libtests/t-macros
+libtests/t-cgi
 doc/*.tmpl
 doc/disorder_templates.5
 oc/disorder_templates.5.html
@@ -187,6 +187,10 @@ doc/disorder_options.5
 doc/disorder_options.5.html
 doc/disorder_actions.5.in
 doc/disorder_templates.5.in
-lib/t-arcfour
-lib/t-charset
-
+libtests/t-arcfour
+libtests/t-charset
+libtests/t-event
+libtests/t-dateparse
+libtests/Makefile
+cgi/Makefile
+libtests/index.html