[agda] 05/08: Remove patches which are applied upstream

Iain Lane laney at moszumanska.debian.org
Mon Jan 4 13:02:30 UTC 2016


This is an automated email from the git hooks/post-receive script.

laney pushed a commit to branch master
in repository agda.

commit 7d835fa96bf4c100c772f632c57db987890f4b19
Author: Iain Lane <laney at debian.org>
Date:   Mon Jan 4 11:38:07 2016 +0000

    Remove patches which are applied upstream
---
 .../0001-.cabal-Supporting-only-cpphs-1.19.patch   | 22 -------------
 debian/patches/hashtables-dep                      | 37 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 61 deletions(-)

diff --git a/debian/patches/0001-.cabal-Supporting-only-cpphs-1.19.patch b/debian/patches/0001-.cabal-Supporting-only-cpphs-1.19.patch
deleted file mode 100644
index bcc8cc8..0000000
--- a/debian/patches/0001-.cabal-Supporting-only-cpphs-1.19.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f41911c09ee8f8c81bde21710cc7ce205cda02f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr at eafit.edu.co>
-Date: Mon, 30 Mar 2015 11:41:40 -0500
-Subject: [PATCH] [ .cabal ] Supporting only cpphs >= 1.19.
-
----
- Agda.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Agda.cabal
-===================================================================
---- a/Agda.cabal
-+++ b/Agda.cabal
-@@ -408,7 +408,7 @@
-                     -fwarn-warnings-deprecations
- 
-   if flag(cpphs)
--    build-tools: cpphs >= 1.18.6 && < 1.19
-+    build-tools: cpphs >= 1.19 && < 1.20
-     ghc-options: -pgmPcpphs -optP--cpp
- 
-   -- The Cabal-generated module Paths_Agda triggers a warning under
diff --git a/debian/patches/hashtables-dep b/debian/patches/hashtables-dep
deleted file mode 100644
index df8711b..0000000
--- a/debian/patches/hashtables-dep
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- agda (2.4.2.2-3) unstable; urgency=medium
- .
-   * Fix dependency on hashtables
-Author: Joachim Breitner <nomeata at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- agda-2.4.2.2.orig/Agda.cabal
-+++ agda-2.4.2.2/Agda.cabal
-@@ -98,7 +98,8 @@ library
-     -- fixed in hashable 1.2.1.0.
-     -- https://github.com/tibbe/hashable/issues/57.
-     , hashable >= 1.1.2.3 && < 1.2 || >= 1.2.1.0 && < 1.3
--    , hashtables >= 1.0 && < 1.2
-+    -- http://hackage.haskell.org/package/Agda-2.4.2.2/revisions/
-+    , hashtables >=1.0 && <1.2 || >=1.2.0.2 && <1.3
-     , haskeline >= 0.7 && < 0.8
-     , haskell-src-exts >= 1.9.6 && < 1.17
-     -- mtl-2.1 contains a severe bug.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 030ccaa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-.cabal-Supporting-only-cpphs-1.19.patch
-hashtables-dep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/agda.git



More information about the Pkg-haskell-commits mailing list