[Pkg-haskell-commits] [SCM] Haskell binding to libmagic branch, master, updated. debian/1.0.8-1-2-ge175aaf

Sat Nov 21 06:47:15 UTC 2009

The following commit has been merged in the master branch:
commit 503c65e59cc2327518c97888c0a8dc90f04c296b
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sat Nov 21 17:38:12 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 22dba5d..37ffef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+magic-haskell (1.0.8-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>  Sat, 21 Nov 2009 17:19:53 +1100
+
 magic-haskell (1.0.8-1) unstable; urgency=low
 
   * Switched to regular non-native package.
diff --git a/debian/compat b/debian/compat
index b8626c4..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+6
diff --git a/debian/control b/debian/control
index ba9fa59..b06f77b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,24 @@ Source: magic-haskell
 Priority: optional
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: John Goerzen <jgoerzen at complete.org>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.8.2dfsg1), hugs (>= 98.200503.08), haskell-devscripts (>= 0.6.15), libmagic-dev
-Build-Depends-Indep: debhelper (>= 4.0.0), haddock, ghc6 (>= 6.8.2dfsg1), haskell-devscripts (>= 0.6.15), libmagic-dev
-Standards-Version: 3.6.2
-Section: devel
+Build-Depends: debhelper (>= 6.0.0),
+ cdbs,
+ haddock,
+ hscolour,
+ haskell-devscripts (>= 0.6.18),
+ ghc6 (>= 6.10),
+ hugs (>= 98.200503.08),
+ libmagic-dev
+Standards-Version: 3.8.3
+Section: haskell
 Vcs-Git: git://git.debian.org/git/pkg-haskell/magic-haskell.git
 Vcs-Browser: http://git.debian.org/?p=pkg-haskell/magic-haskell.git;a=summary
 
 Package: libghc6-magic-dev
-Section: devel
+Section: haskell
 Architecture: any
-Suggests: magic-haskell-doc
-Depends: ${haskell:Depends}, libmagic-dev, ${shlibs:Depends}
+Suggests: ${haskell:Suggests}
+Depends: ${misc:Depends}, ${haskell:Depends}, libmagic-dev, ${shlibs:Depends}
 Description: File type determination library for Haskell
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
@@ -24,10 +30,10 @@ Description: File type determination library for Haskell
  in libhugs-magic.
 
 Package: libhugs-magic
-Section: devel
+Section: haskell
 Architecture: any
-Suggests: magic-haskell-doc
-Depends: ${haskell:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${haskell:Depends}, ${shlibs:Depends}
+Suggests: ${haskell:Suggests}
 Description: File type determination library for Haskell
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
@@ -38,8 +44,9 @@ Description: File type determination library for Haskell
  in libghc6-magic-dev.
 
 Package: magic-haskell-doc
-Section: devel
+Section: doc
 Architecture: all
+Depends: ${misc:Depends}, ${haskell:Depends}
 Description: File type determination library for Haskell
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
diff --git a/debian/rules b/debian/rules
index 6142bc4..bc087e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,152 +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
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-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.
-	make setup
-	./setup configure
-
-	touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	#make test-ghc6
-	# Add here commands to compile the package.
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-./setup clean
-	-make clean
-	-rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs -a 
-
-	# Add here commands to install the package into debian/tmp
-	dh_haskell -a
-	dh_haskell_depends -a
-	#make test
-
-builddocs: builddocs-stamp
-builddocs-stamp:
-	dh_testdir
-
-	make doc
-	#make test-hugs
-
-installdocs: builddocs
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -i
-
-	dh_haskell -i
-	#make test-hugs
-
-# Build architecture-independent files here.
-binary-indep: builddocs installdocs
-	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
-	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
-	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
-	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

-- 
Haskell binding to libmagic

