[Pkg-haskell-commits] darcs: haskell-devscripts: Use ghc instead of ghc6
Marco Silva
marcot at marcot.eti.br
Sat Jan 15 15:53:37 UTC 2011
Sat Jan 15 15:11:33 UTC 2011 Marco Silva <marcot at marcot.eti.br>
* Use ghc instead of ghc6
Ignore-this: 8820907e50f43b760e344eead16219df
M ./Dh_Haskell.sh -13 +13
M ./README -2 +2
M ./debian/changelog +1
M ./debian/control -1 +1
M ./dh_haskell_depends -8 +8
M ./dh_haskell_depends.pod -1 +1
M ./dh_haskell_provides -6 +6
M ./dh_haskell_provides.pod -2 +2
M ./dh_haskell_shlibdeps -5 +5
M ./dh_haskell_shlibdeps.pod -1 +1
M ./hlibrary.mk -26 +26
Sat Jan 15 15:11:33 UTC 2011 Marco Silva <marcot at marcot.eti.br>
* Use ghc instead of ghc6
Ignore-this: 8820907e50f43b760e344eead16219df
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog 2011-01-15 15:53:37.413692996 +0000
+++ new-haskell-devscripts/debian/changelog 2011-01-15 15:53:37.429693839 +0000
@@ -5,6 +5,7 @@
file to -doc package. (Closes: #586723)
* Update Uploader name.
* debian/copyright: Update name.
+ * Use ghc instead of ghc6
-- Marco Silva <marcot at debian.org> Fri, 14 Jan 2011 12:37:29 -0200
diff -rN -u old-haskell-devscripts/debian/control new-haskell-devscripts/debian/control
--- old-haskell-devscripts/debian/control 2011-01-15 15:53:37.413692996 +0000
+++ new-haskell-devscripts/debian/control 2011-01-15 15:53:37.429693839 +0000
@@ -13,7 +13,7 @@
Architecture: all
Depends: dctrl-tools
, debhelper
- , ghc6 (>= 6.12.1-10)
+ , ghc
, xutils-dev
, cdbs
, ${misc:Depends}
diff -rN -u old-haskell-devscripts/dh_haskell_depends new-haskell-devscripts/dh_haskell_depends
--- old-haskell-devscripts/dh_haskell_depends 2011-01-15 15:53:37.413692996 +0000
+++ new-haskell-devscripts/dh_haskell_depends 2011-01-15 15:53:37.421693418 +0000
@@ -61,9 +61,9 @@
touch $sfile
case "$pkg" in
- libghc6-*-dev|libghc6-*-prof)
+ libghc-*-dev|libghc-*-prof)
if [ -z "$files" ] ; then
- cfiles=`find_config_for_ghc6 $pkg`
+ cfiles=`find_config_for_ghc $pkg`
else
cfiles="$files"
fi
@@ -72,13 +72,13 @@
exit 1
fi
case "$pkg" in
- libghc6-*-dev)
+ libghc-*-dev)
grep -v \
-e ^haskell:Depends \
-e ^haskell:Recommends \
-e ^haskell:Suggests \
$sfile > $sfile.tmp || true
- echo "haskell:Depends=`depends_for_ghc6 $cfiles`" >> $sfile.tmp
+ echo "haskell:Depends=`depends_for_ghc $cfiles`" >> $sfile.tmp
echo "haskell:Recommends=" >> $sfile.tmp
doc=`echo $pkg | sed -e 's/-dev$/-doc/'`
prof=`echo $pkg | sed -e 's/-dev$/-prof/'`
@@ -93,7 +93,7 @@
fi
echo "haskell:Suggests=$suggests" >> $sfile.tmp
;;
- libghc6-*-prof)
+ libghc-*-prof)
grep -v \
-e ^haskell:Depends \
-e ^haskell:Recommends \
@@ -101,7 +101,7 @@
$sfile > $sfile.tmp || true
dev=`echo $pkg | sed -e 's/-prof$/-dev/'`
version='(=${binary:Version})'
- depends="$dev ${version}, `depends_for_ghc6_prof $cfiles`"
+ depends="$dev ${version}, `depends_for_ghc_prof $cfiles`"
echo "haskell:Depends=$depends" >> $sfile.tmp
echo "haskell:Recommends=" >> $sfile.tmp
echo "haskell:Suggests=" >> $sfile.tmp
@@ -120,7 +120,7 @@
echo "haskell:Suggests=" >> $sfile.tmp
mv $sfile.tmp $sfile
;;
- libghc6-*-doc|haskell-*-doc)
+ libghc-*-doc|haskell-*-doc)
grep -v \
-e ^haskell:Depends \
-e ^haskell:Recommends \
@@ -137,7 +137,7 @@
| sort -u \
| sed -e :a -e '$!N; s/\n/, /; ta'`
echo "haskell:Recommends=$recommends" >> $sfile.tmp
- dev=`echo $pkg | sed -e 's/^[^-]\+-\(.\+\)-doc/libghc6-\1-dev/'`
+ dev=`echo $pkg | sed -e 's/^[^-]\+-\(.\+\)-doc/libghc-\1-dev/'`
grep -v '^#' debian/control | grep $dev > /dev/null \
&& suggests="$dev" \
|| suggests=""
diff -rN -u old-haskell-devscripts/dh_haskell_depends.pod new-haskell-devscripts/dh_haskell_depends.pod
--- old-haskell-devscripts/dh_haskell_depends.pod 2011-01-15 15:53:37.405692574 +0000
+++ new-haskell-devscripts/dh_haskell_depends.pod 2011-01-15 15:53:37.421693418 +0000
@@ -24,7 +24,7 @@
=head1 BUGS
-hugs and ghc6 are the only supported targets at the moment. Cabal does
+hugs and ghc are the only supported targets at the moment. Cabal does
not yet support nhc98.
=head1 SEE ALSO
diff -rN -u old-haskell-devscripts/dh_haskell_provides new-haskell-devscripts/dh_haskell_provides
--- old-haskell-devscripts/dh_haskell_provides 2011-01-15 15:53:37.405692574 +0000
+++ new-haskell-devscripts/dh_haskell_provides 2011-01-15 15:53:37.417693207 +0000
@@ -67,9 +67,9 @@
touch $sfile
case "$pkg" in
- libghc6-*-dev|libghc6-*-prof|ghc6|ghc6-prof)
+ libghc-*-dev|libghc-*-prof|ghc|ghc-prof)
if [ -z "$files" ] ; then
- cfiles=`find_config_for_ghc6 $pkg`
+ cfiles=`find_config_for_ghc $pkg`
else
cfiles="$files"
fi
@@ -78,17 +78,17 @@
exit 1
fi
case "$pkg" in
- libghc6-*-dev|ghc6)
+ libghc-*-dev|ghc)
grep -v \
-e ^haskell:Provides \
$sfile > $sfile.tmp || true
- echo "haskell:Provides=`provides_for_ghc6 $cfiles`" >> $sfile.tmp
+ echo "haskell:Provides=`provides_for_ghc $cfiles`" >> $sfile.tmp
;;
- libghc6-*-prof|ghc6-prof)
+ libghc-*-prof|ghc-prof)
grep -v \
-e ^haskell:Provides \
$sfile > $sfile.tmp || true
- echo "haskell:Provides=`provides_for_ghc6_prof $cfiles`" >> $sfile.tmp
+ echo "haskell:Provides=`provides_for_ghc_prof $cfiles`" >> $sfile.tmp
;;
esac
mv $sfile.tmp $sfile
diff -rN -u old-haskell-devscripts/dh_haskell_provides.pod new-haskell-devscripts/dh_haskell_provides.pod
--- old-haskell-devscripts/dh_haskell_provides.pod 2011-01-15 15:53:37.405692574 +0000
+++ new-haskell-devscripts/dh_haskell_provides.pod 2011-01-15 15:53:37.417693207 +0000
@@ -15,8 +15,8 @@
package to provide, so that dependencies can guarantee ABI stability.
For a package with an idea of package-version-longhashstring, it generates a
-virtual package of the form libghc6-package-dev-version-longh for the -dev
-package and libghc6-package-prof-version-longh for the prof package
+virtual package of the form libghc-package-dev-version-longh for the -dev
+package and libghc-package-prof-version-longh for the prof package
respectively.
This script writes the debian/$package.substvars file, including in it the
diff -rN -u old-haskell-devscripts/Dh_Haskell.sh new-haskell-devscripts/Dh_Haskell.sh
--- old-haskell-devscripts/Dh_Haskell.sh 2011-01-15 15:53:37.413692996 +0000
+++ new-haskell-devscripts/Dh_Haskell.sh 2011-01-15 15:53:37.417693207 +0000
@@ -24,7 +24,7 @@
ghc-pkg6 --global field $@ | head -n1
}
-providing_package_for_ghc6(){
+providing_package_for_ghc(){
local package
local dep
local dir
@@ -42,7 +42,7 @@
echo $package
}
-providing_package_for_ghc6_prof(){
+providing_package_for_ghc_prof(){
local package
local dep
local dir
@@ -109,7 +109,7 @@
fi
}
-depends_for_ghc6(){
+depends_for_ghc(){
local dep
local packages
local pkgid
@@ -117,7 +117,7 @@
dep=`hashed_dependency dev $pkgid`
if [ -z "$dep" ]
then
- pkg=`providing_package_for_ghc6 $pkgid`
+ pkg=`providing_package_for_ghc $pkgid`
if [ -n "$pkg" ]
then
dep=`dependency $pkg`
@@ -133,7 +133,7 @@
echo $packages | sed -e 's/^,[ ]*//'
}
-depends_for_ghc6_prof(){
+depends_for_ghc_prof(){
local dep
local packages
local pkgid
@@ -141,7 +141,7 @@
dep=`hashed_dependency prof $pkgid`
if [ -z "$dep" ]
then
- pkg=`providing_package_for_ghc6_prof $pkgid`
+ pkg=`providing_package_for_ghc_prof $pkgid`
if [ -n "$pkg" ]
then
dep=`dependency $pkg`
@@ -157,7 +157,7 @@
echo $packages | sed -e 's/^,[ ]*//'
}
-provides_for_ghc6(){
+provides_for_ghc(){
local dep
local packages
for package_id in `cabal_package_ids $@` ; do
@@ -166,7 +166,7 @@
echo $packages | sed -e 's/^,[ ]*//'
}
-provides_for_ghc6_prof(){
+provides_for_ghc_prof(){
local dep
local packages
for package_id in `cabal_package_ids $@` ; do
@@ -180,7 +180,7 @@
type="$1"
echo $2 | tr A-Z a-z | \
grep '[a-z0-9]\+-[0-9\.]\+-................................' | \
- perl -pe 's/([a-z0-9-]+)-([0-9\.]+)-(.....).........................../libghc6-\1-'$type'-\2-\3/'
+ perl -pe 's/([a-z0-9-]+)-([0-9\.]+)-(.....).........................../libghc-\1-'$type'-\2-\3/'
}
depends_for_hugs(){
@@ -191,15 +191,15 @@
echo "hugs (>= $upstream_version)"
}
-find_config_for_ghc6(){
+find_config_for_ghc(){
local f
local pkg
pkg=$1
case "$pkg" in
- ghc6-prof)
- pkg=ghc6
+ ghc-prof)
+ pkg=ghc
;;
- libghc6-*-prof)
+ libghc-*-prof)
pkg=`echo $pkg | sed -e 's/-prof$/-dev/'`
;;
*)
diff -rN -u old-haskell-devscripts/dh_haskell_shlibdeps new-haskell-devscripts/dh_haskell_shlibdeps
--- old-haskell-devscripts/dh_haskell_shlibdeps 2011-01-15 15:53:37.405692574 +0000
+++ new-haskell-devscripts/dh_haskell_shlibdeps 2011-01-15 15:53:37.417693207 +0000
@@ -30,9 +30,9 @@
for pkg in $pkgs
do
case "$pkg" in
- libghc6-*-dev)
+ libghc-*-dev)
if [ -z "$files" ] ; then
- files=`find_config_for_ghc6 $pkg`
+ files=`find_config_for_ghc $pkg`
fi
;;
esac
@@ -53,7 +53,7 @@
pkgconflocal=$T_DIR/$pkg.package.conf
cat $file | sed -e \
"/^\(import\|library\|include\)-dirs: / { \
- s#/usr/lib/haskell-packages#$PWD/debian/libghc6-$pkg-dev/usr/lib/haskell-packages#g }" \
+ s#/usr/lib/haskell-packages#$PWD/debian/libghc-$pkg-dev/usr/lib/haskell-packages#g }" \
> $pkgconflocal
ghc-pkg -f $T_DIR/package.conf register $pkgconflocal --force \
2>&1 > /dev/null || true
@@ -61,9 +61,9 @@
for pkg in $pkgs
do
case "$pkg" in
- libghc6-*-dev)
+ libghc-*-dev)
sfile=debian/$pkg.substvars
- pkgname=`basename debian/$pkg/usr/lib/haskell-packages/ghc6/lib/* | sed -e 's/-[^-]\+$//'`
+ pkgname=`basename debian/$pkg/usr/lib/haskell-packages/ghc/lib/* | sed -e 's/-[^-]\+$//'`
touch $sfile
echo "module Main where main = return ()" > $T_DIR/a.hs
ghc --make $T_DIR/a.hs -o $T_DIR/a.out -package-conf \
diff -rN -u old-haskell-devscripts/dh_haskell_shlibdeps.pod new-haskell-devscripts/dh_haskell_shlibdeps.pod
--- old-haskell-devscripts/dh_haskell_shlibdeps.pod 2011-01-15 15:53:37.405692574 +0000
+++ new-haskell-devscripts/dh_haskell_shlibdeps.pod 2011-01-15 15:53:37.417693207 +0000
@@ -24,7 +24,7 @@
=head1 BUGS
-hugs and ghc6 are the only supported targets at the moment. Cabal does
+hugs and ghc are the only supported targets at the moment. Cabal does
not yet support nhc98.
=head1 SEE ALSO
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk 2011-01-15 15:53:37.405692574 +0000
+++ new-haskell-devscripts/hlibrary.mk 2011-01-15 15:53:37.421693418 +0000
@@ -25,7 +25,7 @@
CABAL_PACKAGE=$(DEB_CABAL_PACKAGE)
CABAL_VERSION=$(shell cat *.cabal | egrep -i '^\s*version:' | head -n1 | sed -r 's,^\s*version:\s*,,i'| sed -r 's,\s*$$,,i')
-ENABLE_PROFILING = $(shell egrep -qe '^Package: libghc6-.*-prof$$' debian/control && echo --enable-library-profiling; exit 0)
+ENABLE_PROFILING = $(shell egrep -qe '^Package: libghc-.*-prof$$' debian/control && echo --enable-library-profiling; exit 0)
DEB_COMPRESS_EXCLUDE += .haddock
@@ -36,7 +36,7 @@
# - get this included in the cdbs package once this gets mature enough (maybe?)
DEB_SETUP_BIN_NAME ?= debian/hlibrary.setup
-DEB_HADDOCK_HTML_DIR ?= /usr/share/doc/libghc6-$(CABAL_PACKAGE)-doc/html/
+DEB_HADDOCK_HTML_DIR ?= /usr/share/doc/libghc-$(CABAL_PACKAGE)-doc/html/
# most likely you don't need to touch this one
GHC6_VERSION = $(shell ghc --numeric-version)
@@ -63,35 +63,35 @@
clean::
[ ! -x "$(DEB_SETUP_BIN_NAME)" ] || $(DEB_SETUP_BIN_NAME) clean
- rm -rf dist dist-ghc6 dist-hugs $(DEB_SETUP_BIN_NAME) Setup.hi Setup.ho Setup.o .*config*
- rm -f build-ghc6-stamp build-hugs-stamp build-haddock-stamp
- rm -rf debian/tmp-inst-ghc6
+ rm -rf dist dist-ghc dist-hugs $(DEB_SETUP_BIN_NAME) Setup.hi Setup.ho Setup.o .*config*
+ rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
+ rm -rf debian/tmp-inst-ghc
rm -f $(MAKEFILE)
rm -rf debian/dh_haskell_shlibdeps
$(DEB_SETUP_BIN_NAME):
if test ! -e Setup.lhs -a ! -e Setup.hs; then echo "No setup script found!"; exit 1; fi
- for setup in Setup.lhs Setup.hs; do if test -e $$setup; then ghc6 --make $$setup -o $(DEB_SETUP_BIN_NAME); exit 0; fi; done
+ for setup in Setup.lhs Setup.hs; do if test -e $$setup; then ghc --make $$setup -o $(DEB_SETUP_BIN_NAME); exit 0; fi; done
-dist-ghc6: $(DEB_SETUP_BIN_NAME)
+dist-ghc: $(DEB_SETUP_BIN_NAME)
$(DEB_SETUP_BIN_NAME) configure --ghc -v2 \
- --prefix=/usr --libdir=/usr/lib/haskell-packages/ghc6/lib \
- --builddir=dist-ghc6 \
+ --prefix=/usr --libdir=/usr/lib/haskell-packages/ghc/lib \
+ --builddir=dist-ghc \
--haddockdir=$(DEB_HADDOCK_DIR) \
--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) \
$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(OPTIMIZATION)
-build-ghc6-stamp: dist-ghc6
- $(BUILD_GHC6) --builddir=dist-ghc6
- touch build-ghc6-stamp
+build-ghc-stamp: dist-ghc
+ $(BUILD_GHC6) --builddir=dist-ghc
+ touch build-ghc-stamp
-build/libghc6-$(CABAL_PACKAGE)-prof build/libghc6-$(CABAL_PACKAGE)-dev:: build-ghc6-stamp
+build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp
build-haddock-stamp:
- [ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc6 $(DEB_HADDOCK_OPTS)
+ [ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc $(DEB_HADDOCK_OPTS)
touch build-haddock-stamp
-build/haskell-$(CABAL_PACKAGE)-doc build/libghc6-$(CABAL_PACKAGE)-doc:: dist-ghc6 build-haddock-stamp
+build/haskell-$(CABAL_PACKAGE)-doc build/libghc-$(CABAL_PACKAGE)-doc:: dist-ghc build-haddock-stamp
dist-hugs: $(DEB_SETUP_BIN_NAME)
$(DEB_SETUP_BIN_NAME) configure --hugs --prefix=/usr -v2 --builddir=dist-hugs $(DEB_SETUP_HUGS_CONFIGURE_ARGS)
@@ -99,14 +99,14 @@
build/libhugs-$(CABAL_PACKAGE):: dist-hugs
$(DEB_SETUP_BIN_NAME) build --builddir=dist-hugs
-debian/tmp-inst-ghc6: $(DEB_SETUP_BIN_NAME) dist-ghc6
- $(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc6 --destdir=debian/tmp-inst-ghc6
+debian/tmp-inst-ghc: $(DEB_SETUP_BIN_NAME) dist-ghc
+ $(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
-install/libghc6-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc6
- cd debian/tmp-inst-ghc6 ; find usr/lib/haskell-packages/ghc6/lib/ \
+install/libghc-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc
+ cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
\( ! -name "*_p.a" ! -name "*.p_hi" \) \
-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
- pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc6 --gen-pkg-config | sed -r 's,.*: ,,'`; \
+ pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \
$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc-$(GHC6_VERSION)/package.conf.d/$$pkg_config; \
rm -f $$pkg_config
@@ -114,21 +114,21 @@
dh_haskell_depends -p$(notdir $@)
dh_haskell_shlibdeps -p$(notdir $@)
-install/libghc6-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc6 install/libghc6-$(CABAL_PACKAGE)-dev
- cd debian/tmp-inst-ghc6 ; find usr/lib/haskell-packages/ghc6/lib/ \
+install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc install/libghc-$(CABAL_PACKAGE)-dev
+ cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
! \( ! -name "*_p.a" ! -name "*.p_hi" \) \
-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
dh_haskell_provides -p$(notdir $@)
dh_haskell_depends -p$(notdir $@)
-install/haskell-$(CABAL_PACKAGE)-doc install/libghc6-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc6
+install/haskell-$(CABAL_PACKAGE)-doc install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR)
- cd debian/tmp-inst-ghc6/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
+ cd debian/tmp-inst-ghc/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
! -name "*.haddock" -exec install -Dm 644 '{}' \
../$(notdir $@)/'{}' ';'
mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
- [ 0 = `ls debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
- cp -r debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/*.haddock \
+ [ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
+ cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \
debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
dh_haskell_depends -p$(notdir $@)
diff -rN -u old-haskell-devscripts/README new-haskell-devscripts/README
--- old-haskell-devscripts/README 2011-01-15 15:53:37.413692996 +0000
+++ new-haskell-devscripts/README 2011-01-15 15:53:37.417693207 +0000
@@ -20,7 +20,7 @@
dh_haskell assumes that your packages are adhering to the draft Haskell policy.
Your control file must build the binary library files using packages
-named libghc6-<name>-<variation>, where <name> is the name of your package; and
+named libghc-<name>-<variation>, where <name> is the name of your package; and
<variation> is dev, prof or doc. These packages should be Architecture: any
(dev, and proc) or all (doc).
@@ -61,7 +61,7 @@
BUGS
----
-hugs and ghc6 are the only supported targets at the moment. Cabal does
+hugs and ghc are the only supported targets at the moment. Cabal does
not yet support nhc98.
SEE ALSO
More information about the Pkg-haskell-commits
mailing list