[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:42:44 UTC 2010
The following commit has been merged in the master branch:
commit ad6482e1ac8e1ed6945995f3f97e79835d0f771e
Author: John Goerzen <jgoerzen at complete.org>
Date: Wed Oct 6 03:52:37 2004 +0100
More debian/ work
Keywords:
(jgoerzen at complete.org--projects/missingh--head--1.0--patch-28)
diff --git a/debian/control b/debian/control
index 1355176..06a6b37 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
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: debhelper (>= 4.0.0), ghc6 (>= 6.2.1), ghc6 (<< 6.2.2), ssed
Build-Depends-Indep: debhelper (>= 4.0.0), haddock
Standards-Version: 3.6.1
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/libghc6-missingh-dev.dirs
similarity index 100%
copy from debian/docs
copy to debian/libghc6-missingh-dev.dirs
diff --git a/debian/libghc6-missingh-dev.postinst b/debian/libghc6-missingh-dev.postinst.tmpl
similarity index 91%
rename from debian/libghc6-missingh-dev.postinst
rename to debian/libghc6-missingh-dev.postinst.tmpl
index ea7f9d0..c6e1dd1 100644
--- a/debian/libghc6-missingh-dev.postinst
+++ b/debian/libghc6-missingh-dev.postinst.tmpl
@@ -20,7 +20,7 @@ set -e
case "$1" in
configure)
ghc-pkg -g --add-package \
- < /usr/share/doc/libghc6-missingh-dev/installed-pkg-config
+ < /usr/lib/haskell-packages/ghc6/lib/MissingH-@@VERSION@@/installed-pkg-config
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/libghc6-missingh-prerm b/debian/libghc6-missingh-dev.prerm.tmpl
similarity index 92%
rename from debian/libghc6-missingh-prerm
rename to debian/libghc6-missingh-dev.prerm.tmpl
index ac0db17..661794b 100644
--- a/debian/libghc6-missingh-prerm
+++ b/debian/libghc6-missingh-dev.prerm.tmpl
@@ -20,7 +20,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
ghc-pkg -r MissingH
- rm /usr/lib/haskell-packages/ghc6/lib/MissingH-0.1.0/HSMissingH*.o
+ rm /usr/lib/haskell-packages/ghc6/lib/MissingH-@@VERSION@@/HSMissingH*.o
# install-info --quiet --remove /usr/info/missingh.info.gz
;;
failed-upgrade)
diff --git a/debian/missingh-dev.dirs b/debian/missingh-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/missingh-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/missingh-doc.docs b/debian/missingh-doc.docs
new file mode 100644
index 0000000..cf7cb60
--- /dev/null
+++ b/debian/missingh-doc.docs
@@ -0,0 +1 @@
+html/*
diff --git a/debian/missingh1.dirs b/debian/missingh1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/missingh1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/rules b/debian/rules
index 13a5135..8a832a1 100644
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,9 @@ 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
@@ -65,7 +66,7 @@ clean:
# Add here commands to clean up after the build process.
-$(MAKE) clean
- rm -f .*config*
+ rm -f .*config* debian/$(PACKAGE).postinst debian/$(PACKAGE).prerm
dh_clean
@@ -77,7 +78,13 @@ install: build
# 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)/usr/share/doc/$(PACKAGE)/installed-pkg-config
+ cp .installed-pkg-config $(CURDIR)/debian/$(PACKAGE)$(LIBPATH)/lib/$(LIBNAME)/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
builddocs: builddocs-stamp
builddocs-stamp:
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list