[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.2.6-2-14-g5c6eb6e

Iain Lane laney at ubuntu.com
Thu Mar 11 23:22:21 UTC 2010


The following commit has been merged in the master branch:
commit 5c6eb6e9ebef1b804e6ddcb8d6e538c4d15040fd
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Mar 11 23:21:58 2010 +0000

    Remove -prof package and watcher
    
    * debian/control: Remove the profiling package. It is unfortunate that this
      package is proving to be too big to build before exhausting the available
      resources on some architectures. Not having it should allow agda to build
      in many more places though, so this is a win.
    * debian/control, debian/rules, debian/watcher.sh: Remove the ticker which
      should no longer be necessary due to the above.

diff --git a/debian/changelog b/debian/changelog
index 5b66c38..a67b655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 agda (2.2.6-4) unstable; urgency=low
 
-  * debian/control: Add missing procps | hurd build-dep so that ps is available
-    to run the ticker.
+  * debian/control: Remove the profiling package. It is unfortunate that this
+    package is proving to be too big to build before exhausting the available
+    resources on some architectures. Not having it should allow agda to build
+    in many more places though, so this is a win.
+  * debian/control, debian/rules, debian/watcher.sh: Remove the ticker which
+    should no longer be necessary due to the above.
 
  -- Iain Lane <laney at ubuntu.com>  Sat, 27 Feb 2010 20:35:10 +0000
 
diff --git a/debian/control b/debian/control
index f768148..4c1655b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 7.0),
                haskell-devscripts (>= 0.7),
                cdbs (>> 0.4.58),
                ghc6,
-               ghc6-prof,
                libghc6-quickcheck2-dev (>= 2.1.0.2),
                libghc6-quickcheck2-dev (<< 2.2.0.0),
                libghc6-binary-dev (>= 0.4.4),
@@ -22,26 +21,11 @@ Build-Depends: debhelper (>= 7.0),
                libghc6-xhtml-dev (<< 3000.3),
                libghc6-zlib-dev (>= 0.4.0.1),
                libghc6-zlib-dev (<< 1),
-               libghc6-quickcheck2-prof (>= 2.1.0.2),
-               libghc6-quickcheck2-prof (<< 2.2.0.0),
-               libghc6-binary-prof (>= 0.4.4),
-               libghc6-binary-prof (<< 0.6),
-               libghc6-haskeline-prof (>= 0.3),
-               libghc6-haskeline-prof (<< 0.7),
-               libghc6-haskell-src-prof (>= 1.0.1.1),
-               libghc6-haskell-src-prof (<< 2),
-               libghc6-mtl-prof (>= 1.1),
-               libghc6-mtl-prof (<< 2),
-               libghc6-xhtml-prof (>= 3000.2),
-               libghc6-xhtml-prof (<< 3000.3),
-               libghc6-zlib-prof (>= 0.4.0.1),
-               libghc6-zlib-prof (<< 1),
                happy (>= 1.15),
                happy (<< 2),
                alex (>= 2.0.1),
                alex (<< 3),
-               libncurses5-dev,
-               procps | hurd
+               libncurses5-dev
 Build-Depends-Indep: ghc6-doc,
                      libghc6-quickcheck2-doc (>= 2.1.0.2),
                      libghc6-quickcheck2-doc (<< 2.2.0.0),
@@ -86,28 +70,6 @@ Description: a dependently typed functional programming language - development l
  .
  This package contains the normal library files.
 
-Package: libghc6-agda-prof
-Architecture: any
-Section: haskell
-Depends: ${haskell:Depends},
-         ${misc:Depends},
-Recommends: ${haskell:Recommends}
-Provides: ${haskell:Provides}
-Description: a dependently typed functional programming language - profiling libraries
- Agda is a dependently typed functional programming language: It has inductive
- families, which are like Haskell's GADTs, but they can be indexed by values and
- not just types. It also has parameterised modules, mixfix operators, Unicode
- characters, and an interactive Emacs interface (the type checker can assist in
- the development of your code).
- .
- Agda is also a proof assistant: It is an interactive system for writing and
- checking proofs. Agda is based on intuitionistic type theory, a foundational
- system for constructive mathematics developed by the Swedish logician Per
- Martin-Löf. It has many similarities with other proof assistants based on
- dependent types, such as Coq, Epigram and NuPRL.
- .
- This package contains the libraries compiled with profiling enabled.
-
 Package: haskell-agda-doc
 Architecture: all
 Section: doc
diff --git a/debian/copyright b/debian/copyright
index 690ac3b..c358ee4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,15 +13,10 @@ Copyright: Copyright 2002, The University of Glasgow
 License: Other
 
 Files: debian/*
-Copyright: 2009, Iain Lane <laney at ubuntu.com>,
+Copyright: 2009-10, Iain Lane <laney at ubuntu.com>,
            Marco Túlio Gontijo e Silva <marcot at holoscopio.com>
 License: MIT
 
-Files: debian/watcher.sh
-Copyright: Released into the public domain by original author,
-           Ian Lynagh <igloo at debian.org>, and therefore copyright is disclaimed
-License: PD
-
 License: MIT
   Copyright (c) 2005-2009 Ulf Norell, Nils Anders Danielsson, Catarina
     Coquand, Makoto Takeyama, Andreas Abel, Karl Mehltretter, Marcin
diff --git a/debian/rules b/debian/rules
index 7081bd5..5a70c25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,3 @@ DEB_SETUP_GHC6_CONFIGURE_ARGS := --datadir='/usr/share' --datasubdir='libghc6-ag
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
-
-pre-build::
-	sh debian/watcher.sh "$$PPID" "$(CURDIR)" "$(CURDIR)/build-stamp" 'ghc' &
diff --git a/debian/watcher.sh b/debian/watcher.sh
deleted file mode 100644
index 0de582d..0000000
--- a/debian/watcher.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-if [ "$#" -ne 4 ]
-then
-    echo "Watcher: Bad args: $#"
-    exit 1
-fi
-
-CHECK_PID=$1
-DIR="$2"
-FILE="$3"
-GREP_FOR="$4"
-
-echo "Watcher: Check PID: $CHECK_PID"
-echo "Watcher: Directory: $DIR"
-echo "Watcher: File: $FILE"
-echo "Watcher: Grep for: $GREP_FOR"
-
-if [ -d "$DIR" ]; then
-    if [ -f "$DIR/watcher-lock" ]; then
-        echo "Watcher: not spawning as lock in place"
-        exit 1
-    else
-        echo "Watcher: creating lock"
-        touch $DIR/watcher-lock
-    fi
-fi
-
-# If the PID we are told still exists (our caller is still running),
-# the directory we are told (the working directory still exists) and
-# the file we are told doesn't exist (the build stamp hasn't been created)
-# keep going
-while ps "$CHECK_PID" > /dev/null &&
-      [ -d "$DIR" ] &&
-      [ ! -f "$FILE" ]
-do
-    sleep 600
-    echo "Watcher: Tick."
-    ps ux | grep -- "$GREP_FOR" | grep -v grep
-done
-
-echo "Watcher: Terminating."
-echo "Watcher: Removing lock"
-[ -f $DIR/watcher-lock ] && rm $DIR/watcher-lock

-- 
Packaging for Agda



More information about the Pkg-haskell-commits mailing list