[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 14:43:18 UTC 2010
The following commit has been merged in the master branch:
commit 324a26f7dc0e05b8807958ceb99b5f621fb237b9
Author: John Goerzen <jgoerzen at complete.org>
Date: Thu Oct 7 08:44:50 2004 +0100
Switched to dh_haskell and added hugs building
Keywords:
(jgoerzen at complete.org--projects/missingh--head--1.0--patch-41)
diff --git a/ChangeLog b/ChangeLog
index 8c9da54..d078c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,30 @@
# arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
#
+2004-10-07 02:44:50 GMT John Goerzen <jgoerzen at complete.org> patch-41
+
+ Summary:
+ Switched to dh_haskell and added hugs building
+ Revision:
+ missingh--head--1.0--patch-41
+
+
+ removed files:
+ debian/.arch-ids/libghc6-missingh-dev.dirs.id
+ debian/.arch-ids/libghc6-missingh-dev.postinst.tmpl.id
+ debian/.arch-ids/libghc6-missingh-dev.prerm.tmpl.id
+ debian/.arch-ids/missingh-dev.install.id
+ debian/.arch-ids/missingh1.install.id
+ debian/libghc6-missingh-dev.dirs
+ debian/libghc6-missingh-dev.postinst.tmpl
+ debian/libghc6-missingh-dev.prerm.tmpl
+ debian/missingh-dev.install debian/missingh1.install
+
+ modified files:
+ ChangeLog Setup.description debian/changelog debian/control
+ debian/rules
+
+
2004-10-07 02:36:06 GMT John Goerzen <jgoerzen at complete.org> patch-40
Summary:
diff --git a/Setup.description b/Setup.description
index 513540a..e1b71a0 100644
--- a/Setup.description
+++ b/Setup.description
@@ -1,6 +1,6 @@
-- arch-tag: MissingH main description file
Name: MissingH
-Version: 0.1.0
+Version: 0.2.0
License: GPL
Maintainer: John Goerzen <jgoerzen at complete.org>
Stability: Alpha
diff --git a/debian/changelog b/debian/changelog
index 672f90c..77976ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+missingh (0.2.0) unstable; urgency=low
+
+ * Renamed to more standard names: MissingH.IO, MissingH.List,
+ MissingH.Str.
+
+ * Moved binary functions into new module MissingH.IO.Binary.
+
+ * Added unit tests and test cases for List and Str.
+
+ * Moved Debian code to use dh_haskell.
+
+ * Build Hugs package for Debian.
+
+ -- John Goerzen <jgoerzen at complete.org> Wed, 6 Oct 2004 21:36:47 -0500
+
missingh (0.1.0) unstable; urgency=low
* Initial Release. Closes: #275070.
diff --git a/debian/control b/debian/control
index fe0d714..9383402 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
Source: missingh
Priority: optional
Maintainer: John Goerzen <jgoerzen at complete.org>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.2.1), ghc6 (<< 6.2.2)
-Build-Depends-Indep: debhelper (>= 4.0.0), haddock
+Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.2.1), ghc6 (<< 6.2.2), haskell-devscripts (>= 0.5.1)
+Build-Depends-Indep: debhelper (>= 4.0.0), haddock, hugs, haskell-devscripts (>= 0.5.1)
Standards-Version: 3.6.1
Section: devel
Package: libghc6-missingh-dev
Section: devel
Architecture: any
-Depends: ghc6 (>= 6.2.1), ghc6 (<< 6.2.2)
+Depends: ${haskell:Depends}
Suggests: missingh-doc
Description: Library of utility functions for Haskell, GHC6 package
MissingH is a library of all sorts of utility functions for
@@ -23,6 +23,23 @@ Description: Library of utility functions for Haskell, GHC6 package
due to things Haskell is missing, or things that Haskell makes
possible.
+Package: libhugs-missingh
+Section: devel
+Architecture: all
+Depends: ${haskell:Depends}
+Suggests: missingh-doc
+Description: Library of utility functions for Haskell, Hugs package
+ MissingH is a library of all sorts of utility functions for
+ Haskell programmers. It is written in pure Haskell and thus should
+ be extremely portable and easy to use. It also has no prerequisites
+ save those that are commonly included with Haskell compilers.
+ .
+ MissingH is based on my MissingLib library for OCaml and contains some
+ of the same features. However, some features are left behind because
+ they are already in Haskell or not needed here -- and others are added
+ due to things Haskell is missing, or things that Haskell makes
+ possible.
+
Package: missingh-doc
Section: doc
Architecture: all
diff --git a/debian/libghc6-missingh-dev.dirs b/debian/libghc6-missingh-dev.dirs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/libghc6-missingh-dev.postinst.tmpl b/debian/libghc6-missingh-dev.postinst.tmpl
deleted file mode 100644
index c6e1dd1..0000000
--- a/debian/libghc6-missingh-dev.postinst.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# postinst script for missingh
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
- configure)
- ghc-pkg -g --add-package \
- < /usr/lib/haskell-packages/ghc6/lib/MissingH-@@VERSION@@/installed-pkg-config
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/libghc6-missingh-dev.prerm.tmpl b/debian/libghc6-missingh-dev.prerm.tmpl
deleted file mode 100644
index 661794b..0000000
--- a/debian/libghc6-missingh-dev.prerm.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# prerm script for missingh
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
- ghc-pkg -r MissingH
- rm /usr/lib/haskell-packages/ghc6/lib/MissingH-@@VERSION@@/HSMissingH*.o
-# install-info --quiet --remove /usr/info/missingh.info.gz
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/missingh-dev.install b/debian/missingh-dev.install
deleted file mode 100644
index 68a175d..0000000
--- a/debian/missingh-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
diff --git a/debian/missingh1.install b/debian/missingh1.install
deleted file mode 100644
index d0dbfd1..0000000
--- a/debian/missingh1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 3457d98..38270d0 100644
--- a/debian/rules
+++ b/debian/rules
@@ -9,16 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-GHCVERSION=6.2.1
-GHCPATH=/usr/lib/ghc-$(GHCVERSION)/bin
-PATH:=$(GHCPATH):$(PATH)
-
-export PATH
-LIBPATH=/usr/lib/haskell-packages/ghc6
-LIBNAME=MissingH
-PACKAGE=libghc6-missingh-dev
-VERSION:=$(shell dpkg-parsechangelog | grep Version | awk '{ print $$2 }')
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -54,9 +44,6 @@ build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
- ./setup build
- make doc
-
touch build-stamp
clean:
@@ -65,8 +52,8 @@ clean:
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) clean
- rm -f .*config* debian/$(PACKAGE).postinst debian/$(PACKAGE).prerm
+ -./setup clean
+ -rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
dh_clean
@@ -77,14 +64,7 @@ install: build
dh_installdirs -a
# Add here commands to install the package into debian/tmp
- ./setup install --install-prefix=$(CURDIR)/debian/$(PACKAGE)$(LIBPATH)
- cp .installed-pkg-config $(CURDIR)/debian/$(PACKAGE)$(LIBPATH)/lib/$(LIBNAME)-$(VERSION)/installed-pkg-config
- sed s/\@\@VERSION\@\@/$(VERSION)/g < \
- debian/$(PACKAGE).postinst.tmpl > \
- debian/$(PACKAGE).postinst
- sed s/\@\@VERSION\@\@/$(VERSION)/g < \
- debian/$(PACKAGE).prerm.tmpl > \
- debian/$(PACKAGE).prerm
+ dh_haskell -a
builddocs: builddocs-stamp
builddocs-stamp:
@@ -98,6 +78,8 @@ installdocs: builddocs
dh_clean -k
dh_installdirs -i
+ dh_haskell -i
+
# Build architecture-independent files here.
binary-indep: builddocs installdocs
dh_testdir
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list