[Pkg-haskell-commits] darcs: ghc-mod: New upstream release 5.2.1.1

Daneil Gröber dxld at darkboxed.org
Mon Nov 3 22:20:16 UTC 2014


Mon Nov  3 22:18:34 UTC 2014  Daneil Gr[_<U+00F6>_]ber <dxld at darkboxed.org>
  * New upstream release 5.2.1.1

    M ./changelog -2 +3
    M ./control -3 +12
    M ./copyright -26 +43
    R ./emacsen-install
    R ./emacsen-remove
    A ./ghc-mod-el.emacsen-install
    A ./ghc-mod-el.emacsen-remove
    A ./ghc-mod-el.emacsen-startup
    R ./ghc-mod.emacsen-startup
    M ./rules -2 +4

Mon Nov  3 22:18:34 UTC 2014  Daneil Gröber <dxld at darkboxed.org>
  * New upstream release 5.2.1.1
diff -rN -u old-ghc-mod/changelog new-ghc-mod/changelog
--- old-ghc-mod/changelog	2014-11-03 22:20:16.383080651 +0000
+++ new-ghc-mod/changelog	2014-11-03 22:20:16.383080651 +0000
@@ -1,8 +1,9 @@
-ghc-mod (5.1.1.0-1) UNRELEASED; urgency=medium
+ghc-mod (5.2.1.1-1) unstable; urgency=medium
 
   * New upstream release
+  * Split off ghc-mod-el (Closes: #767762)
 
- -- Daniel Gröber <dxld at darkboxed.org>  Tue, 28 Oct 2014 22:10:23 +0100
+ -- Daniel Gröber <dxld at darkboxed.org>  Mon, 03 Nov 2014 23:18:16 +0100
 
 ghc-mod (4.1.2-2) unstable; urgency=medium
 
diff -rN -u old-ghc-mod/control new-ghc-mod/control
--- old-ghc-mod/control	2014-11-03 22:20:16.379080653 +0000
+++ new-ghc-mod/control	2014-11-03 22:20:16.383080651 +0000
@@ -25,6 +25,7 @@
                libghc-text-dev,
                libghc-transformers-dev,
                libghc-transformers-base-dev,
+               libghc-temporary-dev
 Standards-Version: 3.9.5
 Homepage: http://www.mew.org/~kazu/proj/ghc-mod/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/ghc-mod
@@ -32,11 +33,19 @@
 
 Package: ghc-mod
 Architecture: any
+Recommends: ghc-mod-el
+Depends: ${shlibs:Depends}, ${misc:Depends}
+	 ${haskell:ghc-version}, emacsen-common (>= 2.0.8)
+Description: Happy Haskell programming
+ This package provides the executables ghc-mod and ghc-modi. The GNU Emacs
+ integration code is provided by a separate package.
+
+Package: ghc-mod-el
+Architecture: all
 Recommends: haskell-mode
 Depends: ${shlibs:Depends}, ${misc:Depends}
 	 ${haskell:ghc-version}, emacsen-common (>= 2.0.8)
-Description: Happy Haskell programming on Emacs
- This package includes the executables ghc-mod and ghc-modi as well as Emacs Lisp
- code for integration with GNU Emacs.
+Description: Happy Haskell programming with Emacs
+ This package proviceds the GNU Emacs integration code for ghc-mod.
  .
  Note: This package does NOT support xemacs*. Only for emacs*.
diff -rN -u old-ghc-mod/copyright new-ghc-mod/copyright
--- old-ghc-mod/copyright	2014-11-03 22:20:16.379080653 +0000
+++ new-ghc-mod/copyright	2014-11-03 22:20:16.383080651 +0000
@@ -1,29 +1,46 @@
-Copyright (c) 2009, IIJ Innovation Institute Inc.
-All rights reserved.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ghc-mod
+Upstream-Contact: Daniel Gröber <dxld at darkboxed.org>,
+                  Kazu Yamamoto <kazu at iij.ad.jp>
+Source: http://hackage.haskell.org/package/ghc-mod
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Files: *
+Copyright: 2009  IIJ Innovation Institute Inc.
+           2014  Kazu Yamamoto
+           2014  Alejandro Serrano
+           2014  Daniel Gröber
+License: BSD-3-clause
 
-  * 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.
-  * Neither the name of the copyright holders nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+Files: debian/*
+Copyright: 2014 Daniel Gröber <dxld at darkboxed.org>
+License: BSD-3-clause
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"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 OWNER OR CONTRIBUTORS 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.
+License: BSD-3-clause
+ 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.
+   * Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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 OWNER OR CONTRIBUTORS 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.
diff -rN -u old-ghc-mod/emacsen-install new-ghc-mod/emacsen-install
--- old-ghc-mod/emacsen-install	2014-11-03 22:20:16.379080653 +0000
+++ new-ghc-mod/emacsen-install	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/ghc-mod
-
-FLAVOR=$1
-PACKAGE=ghc-mod
-
-case $FLAVOR in
-    emacs|*xemacs*|mule2|emacs23) # not support xemacs
-	exit 0
-	;;
-esac
-
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-FLAVORTEST=`echo $FLAVOR | cut -c-6`
-if [ ${FLAVORTEST} = xemacs ] ; then
-    SITEFLAG="-no-site-file"
-else
-    SITEFLAG="--no-site-file"
-fi
-FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-install -m 755 -d ${ELCDIR}
-cd ${ELDIR}
-FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
-cd ${ELCDIR}
-
-cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
-
-exit 0
diff -rN -u old-ghc-mod/emacsen-remove new-ghc-mod/emacsen-remove
--- old-ghc-mod/emacsen-remove	2014-11-03 22:20:16.379080653 +0000
+++ new-ghc-mod/emacsen-remove	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/ghc-mod
-
-FLAVOR=$1
-PACKAGE=ghc-mod
-
-if [ ${FLAVOR} != emacs ]; then
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff -rN -u old-ghc-mod/ghc-mod-el.emacsen-install new-ghc-mod/ghc-mod-el.emacsen-install
--- old-ghc-mod/ghc-mod-el.emacsen-install	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc-mod/ghc-mod-el.emacsen-install	2014-11-03 22:20:16.383080651 +0000
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/ghc-mod
+
+FLAVOR=$1
+PACKAGE=ghc-mod
+
+case $FLAVOR in
+    emacs|*xemacs*|mule2|emacs23) # not support xemacs
+	exit 0
+	;;
+esac
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+FLAVORTEST=`echo $FLAVOR | cut -c-6`
+if [ ${FLAVORTEST} = xemacs ] ; then
+    SITEFLAG="-no-site-file"
+else
+    SITEFLAG="--no-site-file"
+fi
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
diff -rN -u old-ghc-mod/ghc-mod-el.emacsen-remove new-ghc-mod/ghc-mod-el.emacsen-remove
--- old-ghc-mod/ghc-mod-el.emacsen-remove	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc-mod/ghc-mod-el.emacsen-remove	2014-11-03 22:20:16.383080651 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/ghc-mod
+
+FLAVOR=$1
+PACKAGE=ghc-mod
+
+if [ ${FLAVOR} != emacs ]; then
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff -rN -u old-ghc-mod/ghc-mod-el.emacsen-startup new-ghc-mod/ghc-mod-el.emacsen-startup
--- old-ghc-mod/ghc-mod-el.emacsen-startup	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc-mod/ghc-mod-el.emacsen-startup	2014-11-03 22:20:16.383080651 +0000
@@ -0,0 +1,10 @@
+;; -*-emacs-lisp-*-
+(setq load-path (cons (concat "/usr/share/"
+                              (symbol-name debian-emacs-flavor)
+			      "/site-lisp/ghc-mod") load-path))
+
+(autoload 'ghc-init "ghc" nil t)
+(add-hook 'haskell-mode-hook (lambda () (ghc-init)))
+
+; ghc-mod's C-cC-t conflict with haskell-doc-mode
+(remove-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
diff -rN -u old-ghc-mod/ghc-mod.emacsen-startup new-ghc-mod/ghc-mod.emacsen-startup
--- old-ghc-mod/ghc-mod.emacsen-startup	2014-11-03 22:20:16.375080654 +0000
+++ new-ghc-mod/ghc-mod.emacsen-startup	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-;; -*-emacs-lisp-*-
-(setq load-path (cons (concat "/usr/share/"
-                              (symbol-name debian-emacs-flavor)
-			      "/site-lisp/ghc-mod") load-path))
-
-(autoload 'ghc-init "ghc" nil t)
-(add-hook 'haskell-mode-hook (lambda () (ghc-init)))
-
-; ghc-mod's C-cC-t conflict with haskell-doc-mode
-(remove-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
diff -rN -u old-ghc-mod/rules new-ghc-mod/rules
--- old-ghc-mod/rules	2014-11-03 22:20:16.375080654 +0000
+++ new-ghc-mod/rules	2014-11-03 22:20:16.383080651 +0000
@@ -10,5 +10,7 @@
 	mkdir -p debian/ghc-mod/usr/bin
 	cp debian/tmp-inst-ghc/usr/bin/ghc-mod debian/ghc-mod/usr/bin/
 	cp debian/tmp-inst-ghc/usr/bin/ghc-modi debian/ghc-mod/usr/bin
-	mkdir -p debian/ghc-mod/usr/share/emacs/site-lisp/ghc-mod
-	cp debian/tmp-inst-ghc/usr/share/ghc-mod/*.el debian/ghc-mod/usr/share/emacs/site-lisp/ghc-mod/
+
+install/ghc-mod-el :: debian/tmp-inst-ghc
+	mkdir -p debian/ghc-mod-el/usr/share/emacs/site-lisp/ghc-mod
+	cp debian/tmp-inst-ghc/usr/share/ghc-mod/*.el debian/ghc-mod-el/usr/share/emacs/site-lisp/ghc-mod/




More information about the Pkg-haskell-commits mailing list