haskell-hopenpgp-tools: New upstream version 0.1.

7 files changed, 18 insertions, 73 deletions

diff --git a/p/haskell-hopenpgp-tools/debian/changelog b/p/haskell-hopenpgp-tools/debian/changelog
index 171a61692..c1ad29c45 100644
--- a/p/haskell-hopenpgp-tools/debian/changelog
+++ b/p/haskell-hopenpgp-tools/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hopenpgp-tools (0.1-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Sat, 04 Jan 2014 16:05:05 -0500
+
 haskell-hopenpgp-tools (0.0.4-1) unstable; urgency=high
 
   * New upstream version.
diff --git a/p/haskell-hopenpgp-tools/debian/compat b/p/haskell-hopenpgp-tools/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/p/haskell-hopenpgp-tools/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/p/haskell-hopenpgp-tools/debian/control b/p/haskell-hopenpgp-tools/debian/control
index 4725f3931..3f5f8d194 100644
--- a/p/haskell-hopenpgp-tools/debian/control
+++ b/p/haskell-hopenpgp-tools/debian/control
@@ -3,14 +3,17 @@ Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Clint Adams <clint@debian.org>
-Build-Depends: haskell-devscripts (>= 0.8.15)
+Build-Depends: debhelper (>= 9)
+  , cdbs
+  , haskell-devscripts (>= 0.8.15)
   , ghc
   , libghc-ansi-wl-pprint-dev
+  , libghc-attoparsec-dev (>= 0.10.0.0)
   , libghc-cereal-dev
   , libghc-cereal-conduit-dev
   , libghc-conduit-dev
   , libghc-crypto-pubkey-dev
-  , libghc-hopenpgp-dev (>= 0.10.2)
+  , libghc-hopenpgp-dev (>= 0.11)
   , libghc-ixset-dev
   , libghc-lens-dev
   , libghc-openpgp-asciiarmor-dev (>= 0.1)
diff --git a/p/haskell-hopenpgp-tools/debian/files b/p/haskell-hopenpgp-tools/debian/files
deleted file mode 100644
index 7350ad3a7..000000000
--- a/p/haskell-hopenpgp-tools/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-hopenpgp-tools_0.0.4-1_amd64.deb haskell extra
diff --git a/p/haskell-hopenpgp-tools/debian/hopenpgp-tools.haskell-binaries b/p/haskell-hopenpgp-tools/debian/hopenpgp-tools.haskell-binaries
new file mode 100644
index 000000000..62040affa
--- /dev/null
+++ b/p/haskell-hopenpgp-tools/debian/hopenpgp-tools.haskell-binaries
@@ -0,0 +1,3 @@
+hokey
+hot
+hkt
diff --git a/p/haskell-hopenpgp-tools/debian/rules b/p/haskell-hopenpgp-tools/debian/rules
index f38a034e4..d730346e0 100755
--- a/p/haskell-hopenpgp-tools/debian/rules
+++ b/p/haskell-hopenpgp-tools/debian/rules
@@ -1,72 +1,6 @@
 #!/usr/bin/make -f
 
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+# DEB_ENABLE_TESTS = yes
 
-package=hopenpgp-tools
-
-clean: checkroot
-	rm -f debian/hopenpgp-tools.setup build-arch stamp-configure
-	rm -rf debian/$(package)
-
-debian/hopenpgp-tools.setup:
-	ghc Setup.hs -o $@
-
-build: build-arch build-indep
-build-indep:
-
-build-arch: stamp-configure
-	$(checkdir)
-
-	debian/hopenpgp-tools.setup build
-
-	touch build-arch
-
-stamp-configure: debian/hopenpgp-tools.setup
-	$(checkdir)
-
-	debian/hopenpgp-tools.setup configure --prefix=/usr
-
-	touch stamp-configure
-
-binary: binary-arch
-
-binary-indep:	checkroot build
-
-binary-arch:	checkroot build
-	$(checkdir)
-
-	debian/hopenpgp-tools.setup copy --destdir=$(CURDIR)/debian/$(package)
-	rm -rf debian/$(package)/usr/share/doc/$(package)-*
-	cd debian/$(package) && $(INSTALL_DIR) \
-		usr/bin \
-		usr/share/doc/$(package) \
-		DEBIAN
-
-	$(INSTALL_FILE) debian/copyright debian/$(package)/usr/share/doc/$(package)/copyright
-
-	$(INSTALL_FILE) debian/changelog debian/$(package)/usr/share/doc/$(package)/changelog.Debian
-	gzip -9f debian/$(package)/usr/share/doc/$(package)/changelog.Debian
-
-	dpkg-shlibdeps -Tdebian/substvars -dDepends debian/$(package)/usr/bin/*
-	dpkg-gencontrol -ldebian/changelog -isp -p$(package) -Tdebian/substvars -Pdebian/$(package)
-
-	cd debian/$(package) && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-
-	chown -R root:root debian/$(package)
-	chmod -R go=rX debian/$(package)
-
-	dpkg --build debian/$(package) ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot build build-indep
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
diff --git a/p/haskell-hopenpgp-tools/debian/substvars b/p/haskell-hopenpgp-tools/debian/substvars
deleted file mode 100644
index bede65d90..000000000
--- a/p/haskell-hopenpgp-tools/debian/substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libbz2-1.0, libc6 (>= 2.14), libffi6 (>= 3.0.4), libgmp10, libnettle4, zlib1g (>= 1:1.1.4)