[Pkg-haskell-commits] darcs: mighttpd2: New upstream version 2.8.3.
Clint Adams
clint at debian.org
Wed Nov 28 23:08:28 UTC 2012
Wed Nov 28 23:08:08 UTC 2012 Clint Adams <clint at debian.org>
* New upstream version 2.8.3.
Ignore-this: aa2c16009892bd7c1cc5d47ae9521f99
M ./changelog -2 +6
M ./control -3 +8
R ./patches/fix-tests.diff
M ./patches/series -1 +1
A ./patches/tweak-case-config-test.diff
Wed Nov 28 23:08:08 UTC 2012 Clint Adams <clint at debian.org>
* New upstream version 2.8.3.
Ignore-this: aa2c16009892bd7c1cc5d47ae9521f99
diff -rN -u old-mighttpd2//changelog new-mighttpd2//changelog
--- old-mighttpd2//changelog 2012-11-28 23:08:27.894233911 +0000
+++ new-mighttpd2//changelog 2012-11-28 23:08:27.898245042 +0000
@@ -1,8 +1,12 @@
-mighttpd2 (2.5.9-2) UNRELEASED; urgency=low
+mighttpd2 (2.8.3-1) experimental; urgency=low
+ [ Joachim Breitner ]
* Bump standards version, no change
- -- Joachim Breitner <nomeata at debian.org> Sat, 13 Oct 2012 14:21:22 +0200
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Wed, 28 Nov 2012 17:58:18 -0500
mighttpd2 (2.5.9-1) unstable; urgency=low
diff -rN -u old-mighttpd2//control new-mighttpd2//control
--- old-mighttpd2//control 2012-11-28 23:08:27.874235025 +0000
+++ new-mighttpd2//control 2012-11-28 23:08:27.898245042 +0000
@@ -5,20 +5,25 @@
Uploaders: Clint Adams <clint at debian.org>
Build-Depends: ghc
, ghc-prof
- , libghc-http-conduit-dev
+ , libghc-blaze-html-dev (>> 0.5)
+ , libghc-conduit-dev
+ , libghc-date-cache-dev
+ , libghc-http-conduit-dev (>> 1.8.2.1)
, libghc-http-date-dev
, libghc-http-types-dev
+ , libghc-io-choice-dev
, libghc-network-dev
, libghc-network-conduit-dev
, libghc-parsec3-dev
+ , libghc-process-conduit-dev
, libghc-transformers-dev
, libghc-unix-bytestring-dev
, libghc-unordered-containers-dev
- , libghc-wai-dev (>> 1.1)
+ , libghc-wai-dev (>> 1.3)
, libghc-wai-app-file-cgi-dev
, libghc-wai-logger-dev
, libghc-wai-logger-prefork-dev
- , libghc-warp-dev
+ , libghc-warp-dev (>> 1.3)
, libghc-hunit-dev
, libghc-test-framework-hunit-dev
, libghc-test-framework-th-prime-dev
diff -rN -u old-mighttpd2//patches/fix-tests.diff new-mighttpd2//patches/fix-tests.diff
--- old-mighttpd2//patches/fix-tests.diff 2012-11-28 23:08:27.846230356 +0000
+++ new-mighttpd2//patches/fix-tests.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -18,16 +18,16 @@
-
- case_config :: Assertion
- case_config = do
-- res <- parseConfig "sample.conf"
-+ res <- parseConfig "example.conf"
- res @?= ans
- where
- ans = [("Port",CV_Int 80),("Debug_Mode",CV_Bool True),("User",CV_String "nobody"),("Group",CV_String "nobody"),("Pid_File",CV_String "/var/run/mighty.pid"),("Logging",CV_Bool True),("Log_File",CV_String "/var/log/mighty"),("Log_File_Size",CV_Int 16777216),("Log_Backup_Number",CV_Int 10),("Index_File",CV_String "index.html"),("Index_Cgi",CV_String "index.cgi"),("Status_File_Dir",CV_String "/usr/local/share/mighty/status"),("Connection_Timeout",CV_Int 30),("Worker_Processes",CV_Int 1)]
-
- case_route :: Assertion
- case_route = do
-- res <- parseRoute "sample.route"
-+ res <- parseRoute "example.route"
- res @?= ans
- where
-- ans = [Block ["localhost","www.example.com"] [RouteCGI "/~alice/cgi-bin/" "/home/alice/public_html/cgi-bin/",RouteFile "/~alice/" "/home/alice/public_html/",RouteCGI "/cgi-bin/" "/export/cgi-bin/",RouteRevProxy "/app/cal/" "/calendar/" "example.net" 80,RouteRevProxy "/app/wiki/" "/" "127.0.0.1" 8080,RouteFile "/" "/export/www/"]]
-+ ans = [Block ["localhost","www.example.com"] [RouteCGI "/~alice/cgi-bin/" "/home/alice/public_html/cgi-bin/",RouteFile "/~alice/" "/home/alice/public_html/",RouteCGI "/cgi-bin/" "/export/cgi-bin/",RouteRevProxy "/app/cal/" "/calendar/" "example.net" 80,RouteRevProxy "/app/wiki/" "/" "127.0.0.1" 3000,RouteFile "/" "/export/www/"]]
-
- ----------------------------------------------------------------
diff -rN -u old-mighttpd2//patches/series new-mighttpd2//patches/series
--- old-mighttpd2//patches/series 2012-11-28 23:08:27.846230356 +0000
+++ new-mighttpd2//patches/series 2012-11-28 23:08:27.898245042 +0000
@@ -1 +1 @@
-fix-tests.diff
+tweak-case-config-test.diff
diff -rN -u old-mighttpd2//patches/tweak-case-config-test.diff new-mighttpd2//patches/tweak-case-config-test.diff
--- old-mighttpd2//patches/tweak-case-config-test.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-mighttpd2//patches/tweak-case-config-test.diff 2012-11-28 23:08:27.902222212 +0000
@@ -0,0 +1,13 @@
+Index: mighttpd2-2.8.3/test/Test.hs
+===================================================================
+--- mighttpd2-2.8.3.orig/test/Test.hs 2012-11-09 11:10:54.000000000 +0000
++++ mighttpd2-2.8.3/test/Test.hs 2012-11-28 23:07:08.965185903 +0000
+@@ -21,7 +21,7 @@
+ res <- parseConfig "example.conf"
+ res @?= ans
+ where
+- ans = [("Port",CV_Int 80),("Debug_Mode",CV_Bool True),("User",CV_String "root"),("Group",CV_String "root"),("Pid_File",CV_String "/var/run/mighty.pid"),("Logging",CV_Bool True),("Log_File",CV_String "/var/log/mighty"),("Log_File_Size",CV_Int 16777216),("Log_Backup_Number",CV_Int 10),("Index_File",CV_String "index.html"),("Index_Cgi",CV_String "index.cgi"),("Status_File_Dir",CV_String "/usr/local/share/mighty/status"),("Connection_Timeout",CV_Int 30),("Worker_Processes",CV_Int 1)]
++ ans = [("Port",CV_Int 80),("Debug_Mode",CV_Bool True),("User",CV_String "root"),("Group",CV_String "root"),("Pid_File",CV_String "/var/run/mighty.pid"),("Logging",CV_Bool True),("Log_File",CV_String "/var/log/mighty"),("Log_File_Size",CV_Int 16777216),("Log_Backup_Number",CV_Int 10),("Index_File",CV_String "index.html"),("Index_Cgi",CV_String "index.cgi"),("Status_File_Dir",CV_String "/usr/local/share/mighty/status"),("Connection_Timeout",CV_Int 30),("Fd_Cache_Duration",CV_Int 10),("Worker_Processes",CV_Int 1)]
+
+ case_route :: Assertion
+ case_route = do
More information about the Pkg-haskell-commits
mailing list