Sun Apr 13 13:42:42 CEST 2008 Mads Lindstroem <[EMAIL PROTECTED]>
* Removed check for Data.Time
Removed the check for Data.Time as it is not needed. I originally
added it as I had somehow overlooked the Debian package
libghc6-time-dev. Sorry about the unneccessary noise :(
Sun Apr 13 15:17:52 CEST 2008 Mads Lindstroem <[EMAIL PROTECTED]>
* Shifted to Pavel's Debian build system
I have changed the current Debian build system to the one made by
Pavel Shramov. It is a lot simpler than the current one. Also it is
similar to what can normally be found in the Debian archieve, and I
therefore assume that it will be easier to some day get an offecial
WxHaskell Debian package.
All of the files in the debian directory is the work of Pavel.
I changed only one thing, as compared to Pavel's version. Namely that
I removed the dependcy on libghc6-time-dev. I did it, as this
dependency makes the package un-buildable on Debian unstable (GHC
6.8). At release 0.10.3, some users requested a GHC 6.8 version, and
it is therefore important that we can provide one.
New patches:
[Removed check for Data.Time
Mads Lindstroem <[EMAIL PROTECTED]>**20080413114242
Removed the check for Data.Time as it is not needed. I originally
added it as I had somehow overlooked the Debian package
libghc6-time-dev. Sorry about the unneccessary noise :(
] {
hunk ./configure 661
-#--------------------------------------------------------------------
-# Support for Data.Time ?
-#--------------------------------------------------------------------
-
-#GHC 6.6 do not support Data.Time and if no seperate Data.Time package
-#is installed we need to use the old System.Time package.
-
-echo -n " Data.Time package "
-
-cat > TestDataTime.hs << EOF
-module Main
-where
-import Data.Time
-main :: IO ()
-main = return ()
-EOF
-
-if runhaskell TestDataTime.hs >/dev/null 2>&1 ; then
- hasdatatime="";
- echo found
-else
- hasdatatime="-DNO_DATA_TIME";
- echo "not found"
-fi
-
-rm TestDataTime.hs
-
hunk ./configure 902
-# WxDirect
-HAS-DATA-TIME = $hasdatatime
-
hunk ./makefile 486
- @$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) -cpp $(HAS-DATA-TIME) $(PKG-TIME),$(WXD-OUTDIR),-i$(WXD-SRCDIR))
+ @$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) $(PKG-TIME),$(WXD-OUTDIR),-i$(WXD-SRCDIR))
hunk ./wxdirect/src/CompileClassTypes.hs 17
-#ifdef NO_DATA_TIME
-import Time( getClockTime)
-#else
hunk ./wxdirect/src/CompileClassTypes.hs 18
-#endif
hunk ./wxdirect/src/CompileClassTypes.hs 23
-#ifdef NO_DATA_TIME
-getCurrentTime = getClockTime
-#endif
-
hunk ./wxdirect/src/CompileClasses.hs 20
-#ifdef NO_DATA_TIME
-import Time( getClockTime)
-#else
hunk ./wxdirect/src/CompileClasses.hs 21
-#endif
hunk ./wxdirect/src/CompileClasses.hs 30
-#ifdef NO_DATA_TIME
-getCurrentTime = getClockTime
-#endif
-
hunk ./wxdirect/src/CompileHeader.hs 19
-#ifdef NO_DATA_TIME
-import Time( getClockTime)
-#else
hunk ./wxdirect/src/CompileHeader.hs 20
-#endif
hunk ./wxdirect/src/CompileHeader.hs 30
-#ifdef NO_DATA_TIME
-getCurrentTime = getClockTime
-#endif
-
hunk ./wxdirect/src/HaskellNames.hs 22
-#ifdef NO_DATA_TIME
-import Time( getClockTime)
-#else
hunk ./wxdirect/src/HaskellNames.hs 23
-#endif
hunk ./wxdirect/src/HaskellNames.hs 25
-#ifdef NO_DATA_TIME
-getCurrentTime = getClockTime
-#endif
hunk ./wxdirect/src/MultiSet.hs 102
--- Comment on line below can be removed when we drop support for GHC 6.6.
-infixl 9 \\ -- Dummy comment to prevent CPP-preprocessor from seeing \\ as newline continuation
+infixl 9 \\
}
[Shifted to Pavel's Debian build system
Mads Lindstroem <[EMAIL PROTECTED]>**20080413131752
I have changed the current Debian build system to the one made by
Pavel Shramov. It is a lot simpler than the current one. Also it is
similar to what can normally be found in the Debian archieve, and I
therefore assume that it will be easier to some day get an offecial
WxHaskell Debian package.
All of the files in the debian directory is the work of Pavel.
I changed only one thing, as compared to Pavel's version. Namely that
I removed the dependcy on libghc6-time-dev. I did it, as this
dependency makes the package un-buildable on Debian unstable (GHC
6.8). At release 0.10.3, some users requested a GHC 6.8 version, and
it is therefore important that we can provide one.
] {
adddir ./debian
hunk ./bin/debian_build.bash 1
-#!/bin/bash
-
-# You have to download wxhaskell-doc-0.10.3.zip from
-# http://sourceforge.net/project/showfiles.php?group_id=73133&package_id=73173&release_id=582361
-# and place it in wxhaskell/ . This is neccesarry as we cannot currently
-# build the Haddock documentation on Debian.
-
-# This script must be run as root :(
-
-PREFIX=/usr/local
-
-case "$1" in
- 6.6)
- chmod 755 configure
- ./configure --enable-split-objs --hcprof --prefix=$PREFIX
- make
- make install
- make wx
- make wx-install
-
- make debdist
- ;;
-
- 6.8)
- chmod 755 configure
- runhaskell Setup configure --enable-split-objs --hcprof --prefix=$PREFIX
- runhaskell Setup build
- runhaskell Setup install
-
- cd wx
- chmod 755 configure
- runhaskell Setup configure --enable-split-objs --enable-library-profiling --prefix=$PREFIX
- runhaskell Setup build
- runhaskell Setup install
-
- cd ..
- make debdist
- ;;
-
- *)
- echo "You must specify either 6.6 or 6.8 as parameter"
- ;;
-
-esac
-
-
rmfile ./bin/debian_build.bash
hunk ./configure 1137
-
-# generate DEB installer files
-
-mkdir config/DEBIAN
-
-case "$hcversion" in
- 6.6*)
- deb_package=libghc6-6-wxhaskell
- deb_ghc_dependency=6.6
- ;;
- 6.8*)
- deb_package=libghc6-8-wxhaskell
- deb_ghc_dependency=$hcversion
- ;;
- *)
- deb_package=libghc6-unknown-wxhaskell
- deb_ghc_dependency=6
- ;;
-esac
-
-cat > config/DEBIAN/control << EOF
-Package: $deb_package
-Version: $version
-Section: devel
-Priority: optional
-Architecture: i386
-Essential: no
-Depends: ghc6 (>= $deb_ghc_dependency), ghc6 (<<$deb_ghc_dependency+), libwxgtk2.6-dev
-Recommends: libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
-Installed-Size: 21238821
-Maintainer: Mads Lindstroem [EMAIL PROTECTED]
-Description: wxHaskell is a portable and native GUI library for Haskell
-EOF
-
-cat > config/DEBIAN/prerm << EOF
-#!/bin/sh
-ghc-pkg -r wx
-ghc-pkg -r wxcore
-ldconfig
-exit 0
-EOF
-
-cat > config/DEBIAN/postinst << EOF
-#!/bin/sh
-cat /usr/local/lib/wxcore.pkg | sed -e "s|\\\${wxhlibdir}|/usr/local/lib|" | ghc-pkg update -
-cat /usr/local/lib/wx.pkg | sed -e "s|\\\${wxhlibdir}|/usr/local/lib|" | ghc-pkg update -
-ldconfig
-EOF
addfile ./debian/changelog
hunk ./debian/changelog 1
+wxhaskell (0.10.3~rc2-3) unstable; urgency=low
+
+ * Get version from wxcore.cabal
+
+ -- Pavel Shramov <[EMAIL PROTECTED]> Wed, 19 Mar 2008 15:02:50 +0300
+
+wxhaskell (0.10.3~rc2-2) unstable; urgency=low
+
+ * Fix unregister script
+
+ -- Pavel Shramov <[EMAIL PROTECTED]> Wed, 19 Mar 2008 14:36:36 +0300
+
+wxhaskell (0.10.3~rc2-1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Packages 0.10.3-rc2 release.
+
+ -- Pavel Shramov <[EMAIL PROTECTED]> Tue, 06 Nov 2007 13:53:05 +0300
+
+wxhaskell (0.8-2) unstable; urgency=low
+
+ * Recompile with ghc 6.2.2
+
+ -- Isaac Jones <[EMAIL PROTECTED]> Mon, 18 Oct 2004 23:23:46 -0400
+
+wxhaskell (0.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Isaac Jones <[EMAIL PROTECTED]> Tue, 27 Jul 2004 15:52:50 -0400
+
+wxhaskell (0.6-0.4) unstable; urgency=low
+
+ * Recompile with ghc 6.2.1
+
+ -- Ian Lynagh (wibble) <[EMAIL PROTECTED]> Sat, 20 Mar 2004 19:44:05 +0000
+
+wxhaskell (0.6-0.3) unstable; urgency=low
+
+ * Make shlibs
+
+ -- Ian Lynagh (wibble) <[EMAIL PROTECTED]> Sat, 20 Mar 2004 19:44:05 +0000
+
+wxhaskell (0.6-0.2) unstable; urgency=low
+
+ * Fix error where postinst wasn't created in debian/
+ * Split into library and dev binary packages.
+
+ -- Ian Lynagh (wibble) <[EMAIL PROTECTED]> Sat, 20 Mar 2004 14:03:20 +0000
+
+wxhaskell (0.6-0.1) unstable; urgency=low
+
+ * Remove hardcoded "6.2" in postinst.
+ * Put the samples in the deb.
+
+ -- Ian Lynagh (wibble) <[EMAIL PROTECTED]> Sun, 14 Mar 2004 23:51:09 +0000
+
+wxhaskell (0.6-0) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Ian Lynagh (wibble) <[EMAIL PROTECTED]> Sun, 14 Mar 2004 18:22:59 +0000
+
addfile ./debian/control
hunk ./debian/control 1
+Source: wxhaskell
+Section: devel
+Priority: optional
+Maintainer: Isaac Jones <[EMAIL PROTECTED]>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), cdbs, ghc6 (>= 6.2.1), libwxgtk2.6-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libghc6-parsec-dev
+XS-Upstream-Depends: git-core
+XS-Vcs-Git: git://grid.pp.ru/psha/wxhaskell/
+XS-Vcs-Browse: http://grid.pp.ru/git/?p=psha/wxhaskell/.git
+
+Package: libghc6-wxhaskell0.10
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Haskell bindings for wxWidgets (runtime)
+ Haskell bindings for wxWidgets.
+
+Package: libghc6-wxhaskell-dev
+Architecture: any
+Depends: libghc6-wxhaskell0.10 (= ${Source-Version}), haskell-utils, ghc6 (>= 6.2.1), ${shlibs:Depends}, ${misc:Depends}
+Description: Haskell bindings for wxWidgets (development)
+ Haskell bindings for wxWidgets.
addfile ./debian/libghc6-wxhaskell-dev.postinst
hunk ./debian/libghc6-wxhaskell-dev.postinst 1
+#! /bin/sh
+# Generic postinst script for Haskell cabal libraries v8 by Ian Lynagh.
+#
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure|abort-upgrade|abort-remove|abort-deconfigure)
+ /usr/lib/libghc6-wxhaskell-dev/register.sh
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
addfile ./debian/libghc6-wxhaskell-dev.prerm
hunk ./debian/libghc6-wxhaskell-dev.prerm 1
+#! /bin/sh
+# Generic prerm.in script for Haskell cabal libraries v8 by Ian Lynagh.
+#
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+ remove|upgrade|deconfigure|failed-upgrade)
+ /usr/lib/libghc6-wxhaskell-dev/unregister.sh
+ ;;
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
addfile ./debian/register.sh
hunk ./debian/register.sh 1
+#!/bin/sh
+
+LIBDIR=$(ghc6 --print-libdir)
+
+/usr/bin/ghc-pkg6 update - < ${LIBDIR}/package.conflets/wxcore.pkg
+/usr/bin/ghc-pkg6 update - < ${LIBDIR}/package.conflets/wx.pkg
addfile ./debian/rules
hunk ./debian/rules 1
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+PWD := $(shell pwd)
+PKG := libghc6-wxhaskell
+LIBDIR := $(shell ghc6 --print-libdir)
+VERSION := $(shell sed -ne "s/^Version: *//Ip" wxcore.cabal)
+
+configure/$(PKG)-dev::
+ ./configure --with-opengl --prefix=/usr --libdir=$(LIBDIR) --hc=ghc6
+
+debian/unregister.sh: debian/unregister.sh.in wxcore.cabal
+ sed 's|$${wxversion}|$(VERSION)|' < $< > $@
+
+install/$(PKG)0.10:: debian/unregister.sh
+ $(MAKE) DESTDIR=$(PWD)/debian/$(PKG)-dev wxcore-install-files
+ mkdir -p $(PWD)/debian/$(PKG)-dev/usr/lib/$(PKG)-dev
+ install -m0755 debian/unregister.sh $(PWD)/debian/$(PKG)-dev/usr/lib/$(PKG)-dev/
+ install -m0755 debian/register.sh $(PWD)/debian/$(PKG)-dev/usr/lib/$(PKG)-dev/
+ mkdir -p $(PWD)/debian/$(PKG)-dev/$(LIBDIR)/package.conflets
+ sed 's|$${wxhlibdir}|$(LIBDIR)|' < config/wxcore.pkg > $(PWD)/debian/$(PKG)-dev/$(LIBDIR)/package.conflets/wxcore.pkg
+ sed 's|$${wxhlibdir}|$(LIBDIR)|' < config/wx.pkg > $(PWD)/debian/$(PKG)-dev/$(LIBDIR)/package.conflets/wx.pkg
+ mkdir -p $(PWD)/debian/$(PKG)0.10/usr/lib
+ mv $(PWD)/debian/$(PKG)-dev/$(LIBDIR)/*.so $(PWD)/debian/$(PKG)0.10/usr/lib
+
+install/$(PKG)-dev:: install/$(PKG)0.10
+ sed 's|$${wxhlibdir}|$(PWD)/debian/$(PKG)-dev/$(LIBDIR)|' < config/wxcore.pkg | ghc-pkg -f out/wxcore.conf update -
+ $(MAKE) HCFLAGS="-package-conf out/wxcore.conf" DESTDIR=$(PWD)/debian/$(PKG)-dev wx wx-install-files
addfile ./debian/unregister.sh.in
hunk ./debian/unregister.sh.in 1
+#!/bin/sh
+
+VERSION="${wxversion}"
+
+/usr/bin/ghc-pkg6 unregister wx-${VERSION}
+/usr/bin/ghc-pkg6 unregister wxcore-${VERSION}
hunk ./makefile 35
- @echo " debdist unix DEB installer (no docs and samples included)"
hunk ./makefile 394
-.PHONY: debdist debdist-clean
-debdist:
-
-debdist:dist-dirs wxc-bindist wxcore-bindist wx-bindist
- @$(call ensure-dir,$(DEBIAN_DIST))
- @$(call cp-echo,config/DEBIAN,$(DEBIAN_DIST)/DEBIAN)
- @$(call ensure-dir,$(DEBIAN_INSTALL_LOCACTION))
- @$(call cp-echo,$(BINDIST-LIBDIR),$(DEBIAN_INSTALL_LOCACTION))
- # copy packages
- @$(call cp-echo,config/wxcore.pkg,$(DEBIAN_INSTALL_LOCACTION)/lib/wxcore.pkg)
- @$(call cp-echo,config/wx.pkg,$(DEBIAN_INSTALL_LOCACTION)/lib/wx.pkg)
- # copy license
- @$(call cp-echo,license.txt,$(DEBIAN_DIST)/DEBIAN/copyright)
- # permissions
- chmod 755 $(DEBIAN_DIST)/DEBIAN/prerm
- chmod 755 $(DEBIAN_DIST)/DEBIAN/postinst
- #extract doc-zip
- @$(call ensure-dir,$(DEB_DOC))
- unzip wxhaskell-doc-0.10.3.zip -d $(DEB_DOC)
- #ownership
- chown --recursive root.root $(DEBIAN_DIST)
- #build
- dpkg --build dist/debian/ $(DEB_NAME)
-
-debdist-clean: bindist-clean
- @$(RM) $(DEB_NAME)
- [EMAIL PROTECTED](call full-remove-dir,$(DEBIAN_DIST))
-
}
Context:
[Fix: samples/wx/makefile's "make clean" doesn't clean Windows things.
shelarcy <[EMAIL PROTECTED]>**20080409133446]
[Fix 1932640: samples/wx/FileBrowse is broken on Windows.
shelarcy <[EMAIL PROTECTED]>**20080409132157]
[Add containers package dependency to wxcore.cabal.
shelarcy <[EMAIL PROTECTED]>**20080328131307]
[Remove IntMap from wxcore. Use the containers version instead.
shelarcy <[EMAIL PROTECTED]>**20080328131144]
[Add containers package to wxcore.
shelarcy <[EMAIL PROTECTED]>**20080328123744]
[Remove Set from wxdirect. Use the containers version instead.
Eric Kow <[EMAIL PROTECTED]>**20080322140544]
[Remove Map from wxdirect. Use the containers version instead.
Eric Kow <[EMAIL PROTECTED]>**20080322140245]
[Add containers package to wxdirect.
Eric Kow <[EMAIL PROTECTED]>**20080322135933]
[Split makefile entry for wxdirect containers into separate lines.
Eric Kow <[EMAIL PROTECTED]>**20080322135824
For more independence between patches which remove Map, Set and
MultiSet in favour of the containers version.
]
[Use string comparison in haddockversion test.
Eric Kow <[EMAIL PROTECTED]>**20080326224059
Again, for the case where haddock is not found.
]
[Fix bug in configure script if Haddock is not found.
Eric Kow <[EMAIL PROTECTED]>**20080324155706
(discovered by S. Doaitse Swierstra)
]
[Add wx/license.txt to srcdist (to avoid build error).
Eric Kow <[EMAIL PROTECTED]>**20080323125315]
[Fix download link typos.
Eric Kow <[EMAIL PROTECTED]>**20080322130605]
[Kill a broken link (we no longer use CVS).
Eric Kow <[EMAIL PROTECTED]>**20080322125822]
[Overwrite 0.10.3rc1 news with proper 0.10.3 news.
Eric Kow <[EMAIL PROTECTED]>**20080322125032]
[TAG 0.10.3
Eric Kow <[EMAIL PROTECTED]>**20080321183613]
Patch bundle hash:
323420531b98deb7debc3560de4ee3d8bf843482
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
wxhaskell-devel mailing list
wxhaskell-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wxhaskell-devel
