[Pkg-haskell-commits] darcs: darcs: Refresh use-sensible-editor patch and drop all others which are no longer required.
Iain Lane
laney at debian.org
Sat Apr 28 00:06:31 UTC 2012
Mon Apr 2 18:47:07 UTC 2012 Iain Lane <laney at debian.org>
* Refresh use-sensible-editor patch and drop all others which are no longer required.
Ignore-this: 8095f46746ed89e8d399216fcc4b8ea8
M ./changelog +2
R ./patches/disable-test1763
R ./patches/extra-license-file
R ./patches/import-system-from-System.Process
R ./patches/relax-regex-compat-version
R ./patches/relax-version-restrictions
M ./patches/series -5
R ./patches/skip-external.sh-test
R ./patches/system-process-system
R ./patches/tests-use-bash
M ./patches/use-sensible-editor -11 +14
Mon Apr 2 18:47:07 UTC 2012 Iain Lane <laney at debian.org>
* Refresh use-sensible-editor patch and drop all others which are no longer required.
Ignore-this: 8095f46746ed89e8d399216fcc4b8ea8
diff -rN -u old-darcs//changelog new-darcs//changelog
--- old-darcs//changelog 2012-04-28 00:06:30.535251770 +0000
+++ new-darcs//changelog 2012-04-28 00:06:30.819250050 +0000
@@ -8,6 +8,8 @@
+ Build with curl support
+ Use terminfo for better console output
+ Compile with mmap support
+ * Refresh use-sensible-editor patch and drop all others which are no longer
+ required.
-- Iain Lane <laney at debian.org> Mon, 02 Apr 2012 19:11:22 +0100
diff -rN -u old-darcs//patches/disable-test1763 new-darcs//patches/disable-test1763
--- old-darcs//patches/disable-test1763 2012-04-28 00:06:30.535251770 +0000
+++ new-darcs//patches/disable-test1763 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Description: The test harness doesn't seem to be able to run this test, even though it is fine
-Forwarded: not-needed
-Author: Iain Lane <laney at debian.org>
-
-Index: darcs/tests/issue1763-pull-fails-on-non-ascii-filenames.sh
-===================================================================
---- darcs.orig/tests/issue1763-pull-fails-on-non-ascii-filenames.sh 2011-10-10 09:09:05.902661166 +0100
-+++ darcs/tests/issue1763-pull-fails-on-non-ascii-filenames.sh 2011-10-10 09:11:11.805775883 +0100
-@@ -25,6 +25,8 @@
- ## CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- ## SOFTWARE.
-
-+exit 200
-+
- . lib
-
- abort_windows # FIXME! We should figure out what's going on here
diff -rN -u old-darcs//patches/extra-license-file new-darcs//patches/extra-license-file
--- old-darcs//patches/extra-license-file 2012-04-28 00:06:30.535251770 +0000
+++ new-darcs//patches/extra-license-file 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Author: Trent W. Buck <trentbuck at gmail.com>
-Forwarded: not-needed
-Bug-Debian: http://lintian.debian.org/tags/extra-license-file.html
-Description: Prevent cabal installing COPYING in a quick and dirty way.
- Not forwarded because /usr/share/common-lincenses is Debian-specific.
-Index: darcs-2.5.2/darcs.cabal
-===================================================================
---- darcs-2.5.2.orig/darcs.cabal 2011-03-13 22:40:47.000000000 +0000
-+++ darcs-2.5.2/darcs.cabal 2011-04-26 01:23:37.515798788 +0000
-@@ -1,7 +1,6 @@
- Name: darcs
- version: 2.5.2
- License: GPL
--License-file: COPYING
- Author: David Roundy <droundy at darcs.net>, <darcs-users at darcs.net>
- Maintainer: <darcs-users at darcs.net>
-
diff -rN -u old-darcs//patches/import-system-from-System.Process new-darcs//patches/import-system-from-System.Process
--- old-darcs//patches/import-system-from-System.Process 2012-04-28 00:06:30.535251770 +0000
+++ new-darcs//patches/import-system-from-System.Process 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Description: Can no longer import System as of GHC 7.4; use system function
- from System.Process instead
-Author: Iain Lane <laney at debian.org>
-Forwarded: not-needed
-
---- darcs-2.5.2.orig/Distribution/ShellHarness.hs
-+++ darcs-2.5.2/Distribution/ShellHarness.hs
-@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getE
- import System.Exit ( ExitCode (..) )
- import System.FilePath
- import System.IO
--import System( system )
- import System.Process ( ProcessHandle,
- runInteractiveProcess, waitForProcess,
-- getProcessExitCode )
-+ getProcessExitCode, system )
- import Data.Maybe
- import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf )
- import Control.Concurrent
diff -rN -u old-darcs//patches/relax-regex-compat-version new-darcs//patches/relax-regex-compat-version
--- old-darcs//patches/relax-regex-compat-version 2012-04-28 00:06:30.535251770 +0000
+++ new-darcs//patches/relax-regex-compat-version 1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-Description: Backport upstream patch to bump regex-posix and regex-compat BDs
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=642710
-Forwarded: not-needed
-Author: Iain Lane <laney at debian.org>
-
-Index: darcs/darcs.cabal
-===================================================================
---- darcs.orig/darcs.cabal 2011-09-24 20:10:46.000000000 +0100
-+++ darcs/darcs.cabal 2011-09-24 20:24:37.980444885 +0100
-@@ -165,11 +165,11 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.95.1
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.95.1,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -367,14 +367,14 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.95.1
-
- if os(solaris)
- cc-options: -DHAVE_SIGINFO_H
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.95.1,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -515,14 +515,14 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.95.1
-
- if os(solaris)
- cc-options: -DHAVE_SIGINFO_H
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.95.1,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -618,7 +618,7 @@
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-- regex-compat >= 0.71 && < 0.94,
-+ regex-compat >= 0.95.1,
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-@@ -671,7 +671,7 @@
- cpp-options: -DWIN32
- c-sources: src/win32/send_email.c
- build-depends: unix-compat >= 0.1.2,
-- regex-posix >= 0.94.4 && < 0.95
-+ regex-posix >= 0.95.1
-
- if os(solaris)
- cc-options: -DHAVE_SIGINFO_H
diff -rN -u old-darcs//patches/relax-version-restrictions new-darcs//patches/relax-version-restrictions
--- old-darcs//patches/relax-version-restrictions 2012-04-28 00:06:30.531248552 +0000
+++ new-darcs//patches/relax-version-restrictions 1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-Description: Relax version restrictions on required packages to those in GHC 7.4
-Author: Iain Lane <laney at debian.org>
-Forwarded: not-needed
-
-Index: darcs/darcs.cabal
-===================================================================
---- darcs.orig/darcs.cabal 2012-03-01 11:39:16.000000000 +0000
-+++ darcs/darcs.cabal 2012-03-01 11:50:23.144609628 +0000
-@@ -123,7 +123,7 @@
- else
- buildable: True
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10
-
- hs-source-dirs: src
- include-dirs: src
-@@ -173,17 +173,17 @@
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-- filepath >= 1.1.0.0 && < 1.3.0.0,
-+ filepath >= 1.1.0.0 && < 1.4.0.0,
- haskeline >= 0.6.2.2 && < 0.7,
- hashed-storage >= 0.5.2 && < 0.6,
- base >= 3,
- bytestring >= 0.9.0 && < 0.10,
- text == 0.11.*,
-- old-time == 1.0.*,
-+ old-time == 1.1.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process == 1.1.*,
- containers >= 0.1 && < 0.5,
-- array >= 0.1 && < 0.4,
-+ array >= 0.1 && < 0.5,
- random == 1.0.*,
- tar == 0.3.*,
- zlib >= 0.5.1.0 && < 0.6.0.0,
-@@ -191,7 +191,7 @@
- test-framework >= 0.2.2,
- test-framework-quickcheck2 >= 0.2.2
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
- if flag(http)
- build-depends: network >= 2.2 && < 2.4,
- HTTP >= 3000.0 && < 4000.2
-@@ -207,7 +207,7 @@
- else
- buildable: True
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10
-
- hs-source-dirs: src
- include-dirs: src
-@@ -378,22 +378,22 @@
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-- filepath >= 1.1.0.0 && < 1.3.0.0,
-+ filepath >= 1.1.0.0 && < 1.4.0.0,
- haskeline >= 0.6.2.2 && < 0.7,
- hashed-storage >= 0.5.2 && < 0.6,
- tar == 0.3.*
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
-
- build-depends: base >= 3,
- bytestring >= 0.9.0 && < 0.10,
- text == 0.11.*,
-- old-time == 1.0.*,
-+ old-time == 1.1.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process == 1.1.*,
- containers >= 0.1 && < 0.5,
-- array >= 0.1 && < 0.4,
-+ array >= 0.1 && < 0.5,
- random == 1.0.*
-
-
-@@ -482,7 +482,7 @@
- src/umask.c
- src/Crypt/sha2.c
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10
-
- -- We need optimizations, regardless of what Hackage says
- -- Note: "if true" works around a cabal bug with order of flag composition
-@@ -526,22 +526,22 @@
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-- filepath >= 1.1.0.0 && < 1.3.0.0,
-+ filepath >= 1.1.0.0 && < 1.4.0.0,
- haskeline >= 0.6.2.2 && < 0.7,
- hashed-storage >= 0.5.2 && < 0.6,
- tar == 0.3.*
-
- if !os(windows)
-- build-depends: unix >= 1.0 && < 2.5
-+ build-depends: unix >= 1.0 && < 2.6
-
- build-depends: base >= 3,
- bytestring >= 0.9.0 && < 0.10,
- text == 0.11.*,
-- old-time == 1.0.*,
-+ old-time == 1.1.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process == 1.1.*,
- containers >= 0.1 && < 0.5,
-- array >= 0.1 && < 0.4,
-+ array >= 0.1 && < 0.5,
- random == 1.0.*
-
- if flag(curl)
-@@ -614,7 +614,7 @@
- else
- buildable: True
-
-- build-tools: ghc >= 6.10 && < 7.2
-+ build-tools: ghc >= 6.10
-
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
-@@ -622,7 +622,7 @@
- mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.2,
- html == 1.0.*,
-- filepath >= 1.1.0.0 && < 1.3.0.0,
-+ filepath >= 1.1.0.0 && < 1.4.0.0,
- QuickCheck >= 2.1.0.0,
- HUnit >= 1.0,
- test-framework >= 0.2.2,
-@@ -683,11 +683,11 @@
- bytestring >= 0.9.0 && < 0.10,
- haskeline >= 0.6.2.2 && < 0.7,
- text == 0.11.*,
-- old-time == 1.0.*,
-+ old-time == 1.1.*,
- directory >= 1.0.0.0 && < 1.2.0.0,
-- process == 1.0.*,
-+ process == 1.1.*,
- containers >= 0.1 && < 0.5,
-- array >= 0.1 && < 0.4,
-+ array >= 0.1 && < 0.5,
- hashed-storage >= 0.5.2 && < 0.6,
- random == 1.0.*
-
diff -rN -u old-darcs//patches/series new-darcs//patches/series
--- old-darcs//patches/series 2012-04-28 00:06:30.511249851 +0000
+++ new-darcs//patches/series 2012-04-28 00:06:30.611253307 +0000
@@ -1,6 +1 @@
-extra-license-file
use-sensible-editor
-skip-external.sh-test
-relax-regex-compat-version
-tests-use-bash
-disable-test1763
diff -rN -u old-darcs//patches/skip-external.sh-test new-darcs//patches/skip-external.sh-test
--- old-darcs//patches/skip-external.sh-test 2012-04-28 00:06:30.511249851 +0000
+++ new-darcs//patches/skip-external.sh-test 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Description: Disable external.sh test. It requires network access (even though
- it appears to try hard to avoid this).
-Author: Stefano Rivera <stefano at rivera.za.net>
-Bug-Ubuntu: http://launchpad.net/bugs/636603
-Bug-Debian: http://bugs.debian.org/596606
-Last-Update: 2010-09-12
-Index: darcs-2.5.2/tests/external.sh
-===================================================================
---- darcs-2.5.2.orig/tests/external.sh 2011-03-13 22:40:47.000000000 +0000
-+++ darcs-2.5.2/tests/external.sh 2011-04-26 01:31:30.125798818 +0000
-@@ -1,5 +1,8 @@
- #!/usr/bin/env bash
-
-+# Skip: Requires network connectivity
-+exit 200
-+
- # Some tests for launching external commands
-
- . lib
diff -rN -u old-darcs//patches/system-process-system new-darcs//patches/system-process-system
--- old-darcs//patches/system-process-system 2012-04-28 00:06:30.507249156 +0000
+++ new-darcs//patches/system-process-system 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-Description: fix System.Process.system import
- Otherwise the haskell2010 module is needed.
-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: http://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>
-
---- darcs-2.5.2.orig/Distribution/ShellHarness.hs
-+++ darcs-2.5.2/Distribution/ShellHarness.hs
-@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getE
- import System.Exit ( ExitCode (..) )
- import System.FilePath
- import System.IO
--import System( system )
- import System.Process ( ProcessHandle,
- runInteractiveProcess, waitForProcess,
-- getProcessExitCode )
-+ getProcessExitCode, system )
- import Data.Maybe
- import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf )
- import Control.Concurrent
diff -rN -u old-darcs//patches/tests-use-bash new-darcs//patches/tests-use-bash
--- old-darcs//patches/tests-use-bash 2012-04-28 00:06:30.507249156 +0000
+++ new-darcs//patches/tests-use-bash 1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-Description: Use bash explicitly for tests, to work-around FTBFS
-Bug-Debian: http://bugs.debian.org/632494
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/831112
-Author: Matthias Klose <doko at ubuntu.com>
-
---- darcs-2.5.2.orig/tests/issue458.sh
-+++ darcs-2.5.2/tests/issue458.sh
-@@ -16,7 +16,7 @@ cd temp
-
- mkdir repo1
- darcs initialize --repodir repo1
--printf >repo1/x '#!/bin/sh\ntrue' # make a shebang'd script
-+printf >repo1/x '#!/bin/bash\ntrue' # make a shebang'd script
- darcs record --repodir repo1 -lam x x
- umask 077 # DENY ALL access to group, all
- darcs get --set-scripts-executable repo1 repo2
---- darcs-2.5.2.orig/tests/issue885_get_to_match.sh
-+++ darcs-2.5.2/tests/issue885_get_to_match.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- # Issue885: Regression: "darcs get --to-match" does not work anymore under 2.0
-
---- darcs-2.5.2.orig/tests/issue27.sh
-+++ darcs-2.5.2/tests/issue27.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/issue1269_setpref_predist.sh
-+++ darcs-2.5.2/tests/issue1269_setpref_predist.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/send-external.sh
-+++ darcs-2.5.2/tests/send-external.sh
-@@ -18,7 +18,7 @@ darcs add foobar
- darcs rec -a -m add-foobar
-
- cat > saveit.sh <<EOF
--#!/bin/sh
-+#!/bin/bash
- # send-mail1.sh: Test sendmail command for darcs send 1
- # 2008-Oct-06 22.25 / TN
- set -ev
---- darcs-2.5.2.orig/tests/hidden_conflict.sh
-+++ darcs-2.5.2/tests/hidden_conflict.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/failing-issue1317_list-options_subdir.sh
-+++ darcs-2.5.2/tests/failing-issue1317_list-options_subdir.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- # Test for issue1317 - darcs mv --list-options returns results from root, and
- # not from the current directory
---- darcs-2.5.2.orig/tests/nfs-failure.sh
-+++ darcs-2.5.2/tests/nfs-failure.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/issue525_amend_duplicates.sh
-+++ darcs-2.5.2/tests/issue525_amend_duplicates.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/record_editor.sh
-+++ darcs-2.5.2/tests/record_editor.sh
-@@ -49,7 +49,7 @@ touch file.t
- darcs add file.t
- touch '; test-command'
- echo > test-command << FOO
--#!/bin/sh
-+#!/bin/bash
- echo EVIL
- FOO
- chmod u+x test-command
---- darcs-2.5.2.orig/tests/failing-nice-resolutions.sh
-+++ darcs-2.5.2/tests/failing-nice-resolutions.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/issue1162_add_nonexistent_slash.sh
-+++ darcs-2.5.2/tests/issue1162_add_nonexistent_slash.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -ev
-
---- darcs-2.5.2.orig/tests/failing-issue1406.sh
-+++ darcs-2.5.2/tests/failing-issue1406.sh
-@@ -36,7 +36,7 @@ darcs record --repo R -am 'Move d/f t
- darcs push --repo R S -a # Try to push patches between repos.
- darcs push --repo S R
- rm -rf R/ S/ # Clean up after ourselves.
--#!/bin/sh
-+#!/bin/bash
- set -ev
-
- . ../tests/lib
---- darcs-2.5.2.orig/tests/issue538.sh
-+++ darcs-2.5.2/tests/issue538.sh
-@@ -11,7 +11,7 @@ fi
-
- function make_repo_with_test {
- mkdir temp1 ; cd temp1 ; darcs init
-- echo "#!/bin/sh" > test.sh
-+ echo "#!/bin/bash" > test.sh
- echo[...incomplete...]
More information about the Pkg-haskell-commits
mailing list