[Pkg-haskell-commits] darcs: haskell-qt: Initial check-in

Filip Brcic brcha at gna.org
Sun May 29 18:47:07 UTC 2011


Sat May 28 18:10:32 UTC 2011  Filip Brcic <brcha at gna.org>
  * Initial check-in
  Ignore-this: 242652260fd35eaad4c6a51544070273

    A ./changelog
    A ./compat
    A ./control
    A ./copyright
    A ./libhaskell-qt.dirs
    A ./patches/
    A ./patches/fix_build_system
    A ./patches/fix_qws_libdir
    A ./patches/fixes-for-ghc7
    A ./patches/series
    A ./rules
    A ./source/
    A ./source/format
    A ./watch

Sat May 28 18:10:32 UTC 2011  Filip Brcic <brcha at gna.org>
  * Initial check-in
  Ignore-this: 242652260fd35eaad4c6a51544070273
diff -rN -u old-haskell-qt//changelog new-haskell-qt//changelog
--- old-haskell-qt//changelog	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//changelog	2011-05-29 18:47:07.621281998 +0000
@@ -0,0 +1,10 @@
+haskell-qt (1.1.4.1-1) unstable; urgency=low
+
+  * Fixed libqws install path
+  * Added libqt4-opengl-dev to buildreqs
+  * Added libghc6-opengl-* to buildreqs
+  * Addapted the package for Debian Haskell Group
+  * Renamed libqws into libhaskell-qt to make the name more clear
+  * Fixed the build system to work in a way compatible with hlibrary.mk
+
+ -- Filip Brcic <brcha at gna.org>  Sat, 28 May 2011 20:05:34 +0200
diff -rN -u old-haskell-qt//compat new-haskell-qt//compat
--- old-haskell-qt//compat	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//compat	2011-05-29 18:47:07.577278336 +0000
@@ -0,0 +1 @@
+7
diff -rN -u old-haskell-qt//control new-haskell-qt//control
--- old-haskell-qt//control	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//control	2011-05-29 18:47:07.577278336 +0000
@@ -0,0 +1,102 @@
+Source: haskell-qt
+Section: haskell
+Priority: optional
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Filip Brcic <brcha at gna.org>
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7)
+  , cdbs
+  , haskell-devscripts (>= 0.7)
+  , ghc
+  , ghc-prof
+  , libqt4-dev
+  , libqt4-opengl-dev
+  , libghc-opengl-dev
+  , libghc-opengl-prof
+  , perl
+Build-Depends-Indep: ghc-doc
+  , libghc-opengl-doc
+  , qt4-doc
+Homepage: http://qthaskell.berlios.de/
+Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-qt/
+Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-qt
+
+Package: libhaskell-qt
+Architecture: any
+Depends: ${haskell:Depends}
+  , ${shlibs:Depends}
+  , ${misc:Depends}
+  , libqt4-gui
+  , libqt4-opengl
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: Haskell bindings for Qt framework for GHC; C bits
+ This package provides a library for the Haskell programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ qtHaskell is a set of Haskell bindings for the Qt framework.
+ Haskell programmers can now access the Qt "Signals and Slots" interface
+ logic, design interfaces using Qt Designer and write scripted applications
+ using the Qt ECMA/Javascript engine.
+
+Package: libghc-qt-dev
+Architecture: any
+Depends: ${haskell:Depends}
+  , ${shlibs:Depends}
+  , ${misc:Depends}
+  , libqt4-dev
+  , libqt4-opengl-dev
+  , libhaskell-qt
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: Haskell bindings for Qt framework for GHC
+ This package provides a library for the Haskell programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ qtHaskell is a set of Haskell bindings for the Qt framework.
+ Haskell programmers can now access the Qt "Signals and Slots" interface
+ logic, design interfaces using Qt Designer and write scripted applications
+ using the Qt ECMA/Javascript engine.
+
+Package: libghc-qt-prof
+Architecture: any
+Depends: ${haskell:Depends}
+  , ${misc:Depends}
+  , libqt4-gui
+  , libqt4-opengl
+  , libhaskell-qt
+  , libghc-opengl-dev
+  , libghc-opengl-prof
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: Haskell bindings for Qt framework for GHC; profiling libraries
+ This package provides a library for the Haskell programming language,
+ compiled for profiling.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ qtHaskell is a set of Haskell bindings for the Qt framework.
+ Haskell programmers can now access the Qt "Signals and Slots" interface
+ logic, design interfaces using Qt Designer and write scripted applications
+ using the Qt ECMA/Javascript engine.
+
+Package: libghc-qt-doc
+Section: doc
+Architecture: all
+Depends: ${haskell:Depends}
+  , ${misc:Depends}
+  , qt4-doc
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Description: Haskell bindings for Qt framework for GHC; documentation
+ This package provides the documentation for a library for the Haskell
+ programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ qtHaskell is a set of Haskell bindings for the Qt framework.
+ Haskell programmers can now access the Qt "Signals and Slots" interface
+ logic, design interfaces using Qt Designer and write scripted applications
+ using the Qt ECMA/Javascript engine.
+
diff -rN -u old-haskell-qt//copyright new-haskell-qt//copyright
--- old-haskell-qt//copyright	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//copyright	2011-05-29 18:47:07.577278336 +0000
@@ -0,0 +1,36 @@
+Format-Specification: # http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: qtHaskell
+Maintainer: Filip Brcic <brcha at gna.org>
+Source: http://download.berlios.de/qthaskell/qtHaskell-1.1.4.1.tar.bz2
+
+Copyright 2009 David Harley.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright:
+ 2011, Filip Brcic <brcha at gna.org>
+License: GPL-2+
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff -rN -u old-haskell-qt//libhaskell-qt.dirs new-haskell-qt//libhaskell-qt.dirs
--- old-haskell-qt//libhaskell-qt.dirs	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//libhaskell-qt.dirs	2011-05-29 18:47:07.577278336 +0000
@@ -0,0 +1 @@
+usr/lib
diff -rN -u old-haskell-qt//patches/fix_build_system new-haskell-qt//patches/fix_build_system
--- old-haskell-qt//patches/fix_build_system	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//patches/fix_build_system	2011-05-29 18:47:07.609312807 +0000
@@ -0,0 +1,68 @@
+Index: haskell-qt-1.1.4.1/Makefile_612px
+===================================================================
+--- haskell-qt-1.1.4.1.orig/Makefile_612px	2011-05-28 19:01:50.156951967 +0200
++++ haskell-qt-1.1.4.1/Makefile_612px	2011-05-28 19:02:59.424951993 +0200
+@@ -15,13 +15,13 @@
+ GHC_VERSION = 6.12.1
+ VANILLA_WAY = YES
+ WAYS = 
+-odir = dist/build
++odir = dist-ghc/build
+ package = qt-1.1.4
+-GHC_OPTS = -package-name qt-1.1.4 -hide-all-packages $(CFUSR) -i -idist/build -i. -idist/build/autogen -Idist/build/autogen -Idist/build -optP-include -optPdist/build/autogen/cabal_macros.h -odir dist/build -hidir dist/build -stubdir dist/build -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -O -XForeignFunctionInterface
++GHC_OPTS = -package-name qt-1.1.4 -hide-all-packages $(CFUSR) -i -idist-ghc/build -i. -idist-ghc/build/autogen -Idist-ghc/build/autogen -Idist-ghc/build -optP-include -optPdist-ghc/build/autogen/cabal_macros.h -odir dist-ghc/build -hidir dist-ghc/build -stubdir dist-ghc/build -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -O -XForeignFunctionInterface
+ MAKEFILE = Makefile_612px
+ C_SRCS = 
+-GHC_CC_OPTS = -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -optc-O2 -odir dist/build
+-GHCI_LIB = dist/build/HSqt-1.1.4.o
++GHC_CC_OPTS = -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -optc-O2 -odir dist-ghc/build
++GHCI_LIB = dist-ghc/build/HSqt-1.1.4.o
+ soext = .so
+ LIB_LD_OPTS = -package-name qt-1.1.4 -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -lqtc_core -lqtc_gui -lqtc_network -lqtc_opengl -lqtc_tools -lqtc_script
+ AR = /usr/bin/ar
+Index: haskell-qt-1.1.4.1/Makefile_612pxd
+===================================================================
+--- haskell-qt-1.1.4.1.orig/Makefile_612pxd	2011-05-28 19:01:50.020951966 +0200
++++ haskell-qt-1.1.4.1/Makefile_612pxd	2011-05-28 19:03:34.452952004 +0200
+@@ -15,13 +15,13 @@
+ GHC_VERSION = 6.12.1
+ VANILLA_WAY = YES
+ WAYS = 
+-odir = dist/build
++odir = dist-ghc/build
+ package = qt-1.1.4
+-GHC_OPTS = -package-name qt-1.1.4 -hide-all-packages $(CFUSR) -i -idist/build -i. -idist/build/autogen -Idist/build/autogen -Idist/build -optP-include -optPdist/build/autogen/cabal_macros.h -odir dist/build -hidir dist/build -stubdir dist/build -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -O -XForeignFunctionInterface
++GHC_OPTS = -package-name qt-1.1.4 -hide-all-packages $(CFUSR) -i -idist-ghc/build -i. -idist-ghc/build/autogen -Idist-ghc/build/autogen -Idist-ghc/build -optP-include -optPdist-ghc/build/autogen/cabal_macros.h -odir dist-ghc/build -hidir dist-ghc/build -stubdir dist-ghc/build -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -O -XForeignFunctionInterface
+ MAKEFILE = Makefile_612pxd
+ C_SRCS = 
+-GHC_CC_OPTS = -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -optc-O2 -odir dist/build
+-GHCI_LIB = dist/build/HSqt-1.1.4.o
++GHC_CC_OPTS = -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -optc-O2 -odir dist-ghc/build
++GHCI_LIB = dist-ghc/build/HSqt-1.1.4.o
+ soext = .so
+ LIB_LD_OPTS = -package-name qt-1.1.4 -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -lqtc_core -lqtc_gui -lqtc_network -lqtc_opengl -lqtc_tools -lqtc_script
+ AR = /usr/bin/ar
+Index: haskell-qt-1.1.4.1/build.pl
+===================================================================
+--- haskell-qt-1.1.4.1.orig/build.pl	2011-05-28 19:01:50.160951967 +0200
++++ haskell-qt-1.1.4.1/build.pl	2011-05-28 19:02:08.468951974 +0200
+@@ -305,8 +305,8 @@
+ 	$ghcmv = $2;
+ 	$ghcsv = $3;
+ 	die "$ghc version $ghcv too old" if (($ghcmv < 6) || (($ghcmv == 6) && ($ghcsv < 8)));
+-	$ghcdv = (($ghcmv >= 6) && ($ghcsv >= 12)) ? 1 : 0;
+-	$ghcfv = (($ghcmv >= 6) && ($ghcsv < 12)) ? 1 : 0;
++	$ghcdv = ((($ghcmv == 6) && ($ghcsv >= 12)) || ($ghcmv > 6)) ? 1 : 0;
++	$ghcfv = (($ghcmv == 6) && ($ghcsv < 12)) ? 1 : 0;
+ }
+ else { die "$ghc not found" };
+ my $ghclib = `$ghc --print-libdir`;
+@@ -928,7 +928,7 @@
+ 				sys_ds_pmf $mk, $mk612d, $xld, $hp, $hpv, $vogl, $vbse, $vh98, "NO", "way=dyn", $mngar, $mngld;
+ 			}
+ 			if ($iswin && $weld) {
+-				sys_ds "$rgSu build";
++				sys_ds "$rgSu build --builddir=dist-ghc";
+ 			}
+ 		}
+ 		else {
diff -rN -u old-haskell-qt//patches/fixes-for-ghc7 new-haskell-qt//patches/fixes-for-ghc7
--- old-haskell-qt//patches/fixes-for-ghc7	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//patches/fixes-for-ghc7	2011-05-29 18:47:07.589330850 +0000
@@ -0,0 +1,13 @@
+Index: haskell-qt-1.1.4.1/Qtc/Core/Attributes.hs
+===================================================================
+--- haskell-qt-1.1.4.1.orig/Qtc/Core/Attributes.hs	2011-05-28 18:20:22.636951068 +0200
++++ haskell-qt-1.1.4.1/Qtc/Core/Attributes.hs	2011-05-28 18:55:36.436951831 +0200
+@@ -580,7 +580,7 @@
+ 
+ instance (Qstt a (QDialogSc b)) => QsaSlotReject (a) where
+   slotReject' = (Qslot "reject()", \_ -> ())
+-  reject' = slotReject'
++  reject' = (Qslot "reject()", \_ -> ())
+ 
+ class QsaSignalRejected_nt_f w x f where
+   signalRejected', rejected' :: x -> SltConf w f
diff -rN -u old-haskell-qt//patches/fix_qws_libdir new-haskell-qt//patches/fix_qws_libdir
--- old-haskell-qt//patches/fix_qws_libdir	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//patches/fix_qws_libdir	2011-05-29 18:47:07.581276217 +0000
@@ -0,0 +1,80 @@
+Description: Fix libdir in qws qmake .pro files.
+  By default the qws c-to-haskell wrapper of the qtHaskell installs
+  it's libraries into /usr/local/lib directory which is not very
+  nice if it would remain in the package like that.
+Author: Filip Brcic <brcha at gna.org>
+Origin: vendor
+Last-Update: 2011-05-23
+
+Index: qthaskell-1.1.4.1/qws/qtc_gui/qtc_gui.pro
+===================================================================
+--- qthaskell-1.1.4.1.orig/qws/qtc_gui/qtc_gui.pro	2011-05-24 01:27:29.000000000 +0200
++++ qthaskell-1.1.4.1/qws/qtc_gui/qtc_gui.pro	2011-05-24 02:02:50.125116613 +0200
+@@ -30,6 +30,6 @@
+   target = qtc_gui 
+ }
+ 
+-target.path = /usr/local/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
+Index: qthaskell-1.1.4.1/qws/qtc_script/qtc_script.pro
+===================================================================
+--- qthaskell-1.1.4.1.orig/qws/qtc_script/qtc_script.pro	2011-05-24 01:27:29.000000000 +0200
++++ qthaskell-1.1.4.1/qws/qtc_script/qtc_script.pro	2011-05-24 02:02:50.135116613 +0200
+@@ -30,6 +30,6 @@
+   target = qtc_script 
+ }
+ 
+-target.path = /usr/local/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
+Index: qthaskell-1.1.4.1/qws/qtc_tools/qtc_tools.pro
+===================================================================
+--- qthaskell-1.1.4.1.orig/qws/qtc_tools/qtc_tools.pro	2011-05-24 01:27:29.000000000 +0200
++++ qthaskell-1.1.4.1/qws/qtc_tools/qtc_tools.pro	2011-05-24 02:02:50.135116613 +0200
+@@ -30,6 +30,6 @@
+   target = qtc_tools 
+ }
+ 
+-target.path = /usr/local/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
+Index: qthaskell-1.1.4.1/qws/qtc_core/qtc_core.pro
+===================================================================
+--- qthaskell-1.1.4.1.orig/qws/qtc_core/qtc_core.pro	2011-05-24 01:27:29.000000000 +0200
++++ qthaskell-1.1.4.1/qws/qtc_core/qtc_core.pro	2011-05-24 02:02:50.125116613 +0200
+@@ -36,6 +36,6 @@
+   target = qtc_core 
+ }
+ 
+-target.path = /usr/local/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
+Index: qthaskell-1.1.4.1/qws/qtc_network/qtc_network.pro
+===================================================================
+--- qthaskell-1.1.4.1.orig/qws/qtc_network/qtc_network.pro	2011-05-24 01:27:29.000000000 +0200
++++ qthaskell-1.1.4.1/qws/qtc_network/qtc_network.pro	2011-05-24 02:02:50.135116613 +0200
+@@ -30,6 +30,6 @@
+   target = qtc_network 
+ }
+ 
+-target.path = /usr/local/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
+Index: qthaskell-1.1.4.1/qws/qtc_opengl/qtc_opengl.pro
+===================================================================
+--- qthaskell-1.1.4.1.orig/qws/qtc_opengl/qtc_opengl.pro	2011-05-24 01:27:29.000000000 +0200
++++ qthaskell-1.1.4.1/qws/qtc_opengl/qtc_opengl.pro	2011-05-24 02:02:50.135116613 +0200
+@@ -32,6 +32,6 @@
+   target = qtc_opengl 
+ }
+ 
+-target.path = /usr/local/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
diff -rN -u old-haskell-qt//patches/series new-haskell-qt//patches/series
--- old-haskell-qt//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//patches/series	2011-05-29 18:47:07.581276217 +0000
@@ -0,0 +1,3 @@
+fix_qws_libdir
+fix_build_system
+fixes-for-ghc7
diff -rN -u old-haskell-qt//rules new-haskell-qt//rules
--- old-haskell-qt//rules	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//rules	2011-05-29 18:47:07.585277020 +0000
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+DEB_BUILD_DEPENDENCIES = build-arch
+DEB_SETUP_GHC6_CONFIGURE_ARGS = --extra-lib-dirs=$(CURDIR)/qws/bin
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
+
+clean::
+	[ ! -f qws/Makefile ] || $(MAKE) -C qws distclean
+
+build/libhaskell-qt::
+	(cd qws;qmake -recursive)
+	$(MAKE) -C qws release
+
+install/libhaskell-qt::
+	$(MAKE) -C qws INSTALL_ROOT=$(CURDIR)/debian/libhaskell-qt install
diff -rN -u old-haskell-qt//source/format new-haskell-qt//source/format
--- old-haskell-qt//source/format	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//source/format	2011-05-29 18:47:07.581276217 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -rN -u old-haskell-qt//watch new-haskell-qt//watch
--- old-haskell-qt//watch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-qt//watch	2011-05-29 18:47:07.581276217 +0000
@@ -0,0 +1,5 @@
+version=3
+opts=downloadurlmangle=s/prdownload/download/ \
+  http://developer.berlios.de/project/showfiles.php?group_id=10072 \
+  http://prdownload.berlios.de/qthaskell/qtHaskell-(.+).tar.bz2
+





More information about the Pkg-haskell-commits mailing list