[Pkg-haskell-commits] darcs: haskell-hipmunk: Remove patch, already applied upstream

[Joachim Breitner]

Thu Oct 13 20:11:28 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove patch, already applied upstream
  Ignore-this: e038d4f57861270ff5ce3b64f3eb62ad

    M ./changelog -1
    R ./patches/
    R ./patches/series
    R ./patches/system-lib-chipmunk

Thu Oct 13 20:11:28 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove patch, already applied upstream
  Ignore-this: e038d4f57861270ff5ce3b64f3eb62ad
diff -rN -u old-haskell-hipmunk//changelog new-haskell-hipmunk//changelog
--- old-haskell-hipmunk//changelog	2011-10-13 20:13:43.510329486 +0000
+++ new-haskell-hipmunk//changelog	2011-10-13 20:13:43.526345031 +0000
@@ -1,6 +1,5 @@
 haskell-hipmunk (5.2.0.4-1) UNRELEASED; urgency=low
 
   * Initial release.
-  * New upstream release
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 13 Oct 2011 22:10:15 +0200
diff -rN -u old-haskell-hipmunk//patches/series new-haskell-hipmunk//patches/series
--- old-haskell-hipmunk//patches/series	2011-10-13 20:13:43.518330078 +0000
+++ new-haskell-hipmunk//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-system-lib-chipmunk
diff -rN -u old-haskell-hipmunk//patches/system-lib-chipmunk new-haskell-hipmunk//patches/system-lib-chipmunk
--- old-haskell-hipmunk//patches/system-lib-chipmunk	2011-10-13 20:13:43.518330078 +0000
+++ new-haskell-hipmunk//patches/system-lib-chipmunk	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-Thu Oct 13 20:51:01 CEST 2011  Joachim Breitner <mail at joachim-breitner.de>
-  * Introduce a Cabal flag to build against a system installation of chipmunk
-Index: haskell-hipmunk-5.2.0.3/Hipmunk.cabal
-===================================================================
---- haskell-hipmunk-5.2.0.3.orig/Hipmunk.cabal	2011-10-13 20:57:57.000000000 +0200
-+++ haskell-hipmunk-5.2.0.3/Hipmunk.cabal	2011-10-13 20:59:25.000000000 +0200
-@@ -115,6 +115,9 @@
-   Description: Enable debugging.
-   Default: False
- 
-+Flag system-chipmunk
-+  Description: Use the system-wide installed chipmunk library
-+  Default: False
- 
- Library
-   Exposed-Modules:
-@@ -129,38 +132,47 @@
-   Other-Modules:
-       Physics.Hipmunk.Internal
-   Include-Dirs:
--      Physics/Hipmunk,
--      Chipmunk-5.3.5/include/chipmunk
-+      Physics/Hipmunk
-   Includes:
-       wrapper.h
--  C-Sources:
--      Chipmunk-5.3.5/src/chipmunk.c,
--      Chipmunk-5.3.5/src/constraints/cpConstraint.c,
--      Chipmunk-5.3.5/src/constraints/cpDampedRotarySpring.c,
--      Chipmunk-5.3.5/src/constraints/cpDampedSpring.c,
--      Chipmunk-5.3.5/src/constraints/cpGearJoint.c,
--      Chipmunk-5.3.5/src/constraints/cpGrooveJoint.c,
--      Chipmunk-5.3.5/src/constraints/cpPinJoint.c,
--      Chipmunk-5.3.5/src/constraints/cpPivotJoint.c,
--      Chipmunk-5.3.5/src/constraints/cpRatchetJoint.c,
--      Chipmunk-5.3.5/src/constraints/cpRotaryLimitJoint.c,
--      Chipmunk-5.3.5/src/constraints/cpSimpleMotor.c,
--      Chipmunk-5.3.5/src/constraints/cpSlideJoint.c,
--      Chipmunk-5.3.5/src/cpArbiter.c,
--      Chipmunk-5.3.5/src/cpArray.c,
--      Chipmunk-5.3.5/src/cpBB.c,
--      Chipmunk-5.3.5/src/cpBody.c,
--      Chipmunk-5.3.5/src/cpCollision.c,
--      Chipmunk-5.3.5/src/cpHashSet.c,
--      Chipmunk-5.3.5/src/cpPolyShape.c,
--      Chipmunk-5.3.5/src/cpShape.c,
--      Chipmunk-5.3.5/src/cpSpace.c,
--      Chipmunk-5.3.5/src/cpSpaceComponent.c,
--      Chipmunk-5.3.5/src/cpSpaceHash.c,
--      Chipmunk-5.3.5/src/cpSpaceQuery.c,
--      Chipmunk-5.3.5/src/cpSpaceStep.c,
--      Chipmunk-5.3.5/src/cpVect.c,
--      Physics/Hipmunk/wrapper.c
-+
-+  if flag(system-chipmunk)
-+    Include-Dirs:
-+        /usr/include/chipmunk
-+    Extra-libraries:
-+        chipmunk
-+  else
-+    Include-Dirs:
-+        Chipmunk-5.3.5/include/chipmunk
-+    C-Sources:
-+        Chipmunk-5.3.5/src/chipmunk.c,
-+        Chipmunk-5.3.5/src/constraints/cpConstraint.c,
-+        Chipmunk-5.3.5/src/constraints/cpDampedRotarySpring.c,
-+        Chipmunk-5.3.5/src/constraints/cpDampedSpring.c,
-+        Chipmunk-5.3.5/src/constraints/cpGearJoint.c,
-+        Chipmunk-5.3.5/src/constraints/cpGrooveJoint.c,
-+        Chipmunk-5.3.5/src/constraints/cpPinJoint.c,
-+        Chipmunk-5.3.5/src/constraints/cpPivotJoint.c,
-+        Chipmunk-5.3.5/src/constraints/cpRatchetJoint.c,
-+        Chipmunk-5.3.5/src/constraints/cpRotaryLimitJoint.c,
-+        Chipmunk-5.3.5/src/constraints/cpSimpleMotor.c,
-+        Chipmunk-5.3.5/src/constraints/cpSlideJoint.c,
-+        Chipmunk-5.3.5/src/cpArbiter.c,
-+        Chipmunk-5.3.5/src/cpArray.c,
-+        Chipmunk-5.3.5/src/cpBB.c,
-+        Chipmunk-5.3.5/src/cpBody.c,
-+        Chipmunk-5.3.5/src/cpCollision.c,
-+        Chipmunk-5.3.5/src/cpHashSet.c,
-+        Chipmunk-5.3.5/src/cpPolyShape.c,
-+        Chipmunk-5.3.5/src/cpShape.c,
-+        Chipmunk-5.3.5/src/cpSpace.c,
-+        Chipmunk-5.3.5/src/cpSpaceComponent.c,
-+        Chipmunk-5.3.5/src/cpSpaceHash.c,
-+        Chipmunk-5.3.5/src/cpSpaceQuery.c,
-+        Chipmunk-5.3.5/src/cpSpaceStep.c,
-+        Chipmunk-5.3.5/src/cpVect.c,
-+        Physics/Hipmunk/wrapper.c
-+
-   if flag(small_base)
-     Build-Depends: base >= 3 && < 5,
-                    array >= 0.1 && < 0.4,
-@@ -179,4 +191,4 @@
-     CC-Options:  -g
-   else
-     CC-Options:  -DNDEBUG
--  Extra-Libraries: m
-\ No newline at end of file
-+  Extra-Libraries: m