[Pkg-haskell-commits] [SCM] Configuration file support branch, upstream, updated. debian/1.0.5-1-6-g38649c5

[John Goerzen]

The following commit has been merged in the upstream branch:
commit 1ec22545a4e1bccd1ab9a0443f4ba9b16d1b5fe1
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Feb 19 09:32:36 2010 -0600

    Cleaning up build system and directory

diff --git a/ConfigFile.cabal b/ConfigFile.cabal
index 2c4ba74..afd32a6 100644
--- a/ConfigFile.cabal
+++ b/ConfigFile.cabal
@@ -5,7 +5,10 @@ Maintainer: John Goerzen <jgoerzen at complete.org>
 Author: John Goerzen
 Copyright: Copyright (c) 2004-2010 John Goerzen
 license-file: COPYRIGHT
-extra-source-files: COPYING
+extra-source-files: COPYING,
+                    README,
+                    Makefile,
+                    testsrc/ConfigParser/test.cfg
 Category: Parsing
 homepage: http://software.complete.org/configfile
 synopsis: Configuration file reading & writing
@@ -51,6 +54,7 @@ Executable runtests
     Buildable: False
   Main-Is: runtests.hs
   HS-Source-Dirs: testsrc, src, .
+  Other-Modules: Tests.hs, ConfigParser.Maintest, ConfigParser.Parsertest
   Extensions: ExistentialQuantification, OverlappingInstances,
     UndecidableInstances, CPP, TypeSynonymInstances, FlexibleContexts,
     FlexibleInstances
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 237a7d8..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,45 +0,0 @@
-=========================================
-INSTALLATION INSTRUCTIONS
-For Linux, Unix, BSD, and POSIX platforms
-=========================================
-
-Please see the file INSTALL-win.txt for Windows platform instructions.
-
-PREREQUISITES
--------------
-
-You must satisfy one or more of these major categories:
-
-1. GHC 6.6 or above (including cpphs) or Hugs
-
-2. MissingH and its dependencies;
-   see http://software.complete.org/missingh
-
-INSTALLATION
-------------
-
-The first step is to generate your setup file.  To do that, run:
-
-  make setup
-
-Now, for GHC:
-
- ./setup configure
- ./setup build
- ./setup install
-
-Or, for Hugs:
-
- ./setup configure --hugs
- ./setup build
- ./setup install
- 
-Optionally, to run the unit tests, you'll need to install HUnit.  Then:
-
- make test-ghc6
-
-or:
-
- make test-hugs
-
-(More to come in this file)
diff --git a/INSTALL-win.txt b/INSTALL-win.txt
deleted file mode 100644
index 3bb03be..0000000
--- a/INSTALL-win.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-=========================
-INSTALLATION INSTRUCTIONS
-For Microsoft platforms
-=========================
-
-For Unix, Linux, BSD, and other POSIX platforms (including Cygwin),
-see the INSTALL file instead of this one.
-
-PREREQUISITES
--------------
-
-You need GHC 6.6 or above plus MissingH, which you can find at
-http://software.complete.org/missingh
-
-INSTALLATION
-------------
-
-Before doing anything, open up a command prompt and cd into the
-top-level missingh directory.
-
-Now, run the script to build the program:
-
-  winbuild
-
-To install, run:
-
-  setup install
-
-To compile and run the unit tests, run:
-
-  wintest
-
-(More to come in this file)
diff --git a/winbuild.bat b/winbuild.bat
deleted file mode 100644
index 2bd4482..0000000
--- a/winbuild.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-ghc -package Cabal Setup.hs -o setup.exe
-setup configure
-setup build
-
diff --git a/wintest.bat b/wintest.bat
deleted file mode 100644
index e7dcb5e..0000000
--- a/wintest.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-cd testsrc
-ghc --make -package MissingH -package mtl -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -cpp -o runtests.exe -i..\dist\build:..\src runtests.hs
-cd ..
-testsrc\runtests
-

-- 
Configuration file support