[Pkg-haskell-commits] [SCM] Data type conversions branch, master, updated. debian/1.0.6-1-1-gd793ff9
Erik de Castro Lopo
erikd at mega-nerd.com
Fri Nov 27 09:32:11 UTC 2009
The following commit has been merged in the master branch:
commit d793ff9be64bd480594136709324d365336e57c8
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date: Mon Nov 23 11:35:38 2009 +1100
Updated to compile with latest haske-devscrips (0.6.18).
Use CDBS based hlibrary.mk instead of dh_haskell.
Update control/compat.
Add build-dep on hscolour.
Make lintian happy.
diff --git a/debian/changelog b/debian/changelog
index 2f4923c..9122e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+haskell-convertible (1.0.6-1+nmu1) UNRELEASED; urgency=low
+
+ * NMU upload ok-ed by regular maintainer.
+ * debian/rules
+ - Convert to hlibrary.mk (dh_haskell was removed to haskell-devscripts).
+ * debian/control
+ - Depend on haskell-devscripts >= 0.6.18.
+ - Move Build-Depends-Indeps to Build-Depends.
+ - Add hscolour to build deps.
+ - Standards-Version 3.8.3
+ - Section haskell.
+ * debian/compat
+ - Version 5
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com> Mon, 23 Nov 2009 20:30:55 +1100
+
haskell-convertible (1.0.6-1) unstable; urgency=low
* New upstream release fixes issues with time library.
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 473275c..0b9839d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,30 @@ Source: haskell-convertible
Priority: optional
Uploaders: John Goerzen <jgoerzen at complete.org>
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.10), haskell-devscripts (>= 0.6.15), cpphs, haddock, libghc6-mtl-dev, libghc6-time-dev, libghc6-mtl-prof, libghc6-time-prof
-Build-Depends-Indep: debhelper (>= 4.0.0), haddock, hugs (>= 98.200503.08), haskell-devscripts (>= 0.6.15), ghc6 (>= 6.10), cpphs, libghc6-mtl-doc, libghc6-time-doc, ghc6-doc
-Standards-Version: 3.8.0
-Section: libs
+Build-Depends: debhelper (>= 5.0.0),
+ cdbs,
+ haddock,
+ hscolour,
+ haskell-devscripts (>= 0.6.18),
+ ghc6 (>= 6.10),
+ hugs (>= 98.200503.08),
+ ghc6-doc,
+ libghc6-mtl-dev,
+ libghc6-time-dev,
+ libghc6-mtl-prof,
+ libghc6-time-prof,
+ libghc6-mtl-doc,
+ libghc6-time-doc
+Standards-Version: 3.8.3
+Section: haskell
Homepage: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible
Vcs-Git: git://git.debian.org/git/pkg-haskell/haskell-convertible.git
Vcs-Browser: http://git.debian.org/?p=pkg-haskell/haskell-convertible.git;a=summary
Package: libghc6-convertible-dev
-Section: libdevel
+Section: haskell
Architecture: any
-Depends: ${haskell:Depends}
+Depends: ${msic:Depends}, ${haskell:Depends}
Description: Typeclasses and instances for converting between types, GHC package
convertible provides a typeclass with a single function
that is designed to help convert between different types: numeric
@@ -39,7 +51,7 @@ Description: Typeclasses and instances for converting between types, GHC package
Package: libghc6-convertible-prof
Section: libdevel
Architecture: any
-Depends: ${haskell:Depends}
+Depends: ${misc:Depends}, ${haskell:Depends}
Description: Typeclasses and instances for converting between types, GHC profiling package
convertible provides a typeclass with a single function
that is designed to help convert between different types: numeric
@@ -65,7 +77,7 @@ Description: Typeclasses and instances for converting between types, GHC profili
Package: libhugs-convertible
Section: libs
Architecture: all
-Depends: ${haskell:Depends}, hugs (>= 98.200503.08)
+Depends: ${haskell:Depends}
Description: Typeclasses and instances for converting between types, Hugs package
convertible provides a typeclass with a single function
that is designed to help convert between different types: numeric
diff --git a/debian/rules b/debian/rules
index d6d14c9..bc087e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,153 +1,6 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Standard way of building Haskell libraries .
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
-
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- #$(MAKE) test
- $(MAKE) clean
-
- # Add here commands to compile the package.
- #$(MAKE)
- #$(MAKE) doc
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #-$(MAKE) clean
- -./setup clean
- -rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist
- -rm -rf doc
-
- dh_clean
-
-install-a: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_haskell -a
- dh_haskell_depends -a
-
-install-i: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_haskell -i
-
-
-
-
-# Build architecture-independent files here.
-binary-indep: build install-i
- dh_testdir
- dh_testroot
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -i
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman -i
- dh_link -i
- dh_strip -i
- dh_compress -i -X.haddock
- dh_fixperms -i
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install-a
- dh_testdir
- dh_testroot
- dh_installchangelogs -a
- dh_installdocs -a
- dh_installexamples -a
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman -a
- dh_link -a
- dh_strip -a
- dh_compress -a -X.haddock
- dh_fixperms -a
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
--
Data type conversions
More information about the Pkg-haskell-commits
mailing list