[Pkg-haskell-commits] darcs: darcs: Rewrite patch headers per DEP-3.
Trent W. Buck
trentbuck at gmail.com
Sat Mar 20 16:46:47 UTC 2010
Mon Nov 23 06:03:18 UTC 2009 Trent W. Buck <trentbuck at gmail.com>
* Rewrite patch headers per DEP-3.
Ignore-this: 40d56838b598a32d7e7fe5e454b87171
M ./patches/extra-license-file -1 +5
M ./patches/make-threaded-optional -4 +7
M ./patches/manpage-cleanup -3 +11
M ./patches/no-hspwd -4 +6
M ./patches/no-libHSdarcs -14 +15
M ./patches/spelling-error-in-binary -1 +4
M ./patches/use-sensible-editor -6 +11
Mon Nov 23 06:03:18 UTC 2009 Trent W. Buck <trentbuck at gmail.com>
* Rewrite patch headers per DEP-3.
Ignore-this: 40d56838b598a32d7e7fe5e454b87171
diff -rN -u -purd old-darcs/patches/extra-license-file new-darcs/patches/extra-license-file
--- old-darcs/patches/extra-license-file 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/extra-license-file 2010-03-20 16:46:47.108879632 +0000
@@ -1,4 +1,8 @@
-Prevent cabal installing COPYING in a quick and dirty way.
+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.3.0/darcs.cabal
===================================================================
--- darcs-2.3.0.orig/darcs.cabal 2009-08-03 14:26:04.336565560 +1000
diff -rN -u -purd old-darcs/patches/make-threaded-optional new-darcs/patches/make-threaded-optional
--- old-darcs/patches/make-threaded-optional 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/make-threaded-optional 2010-03-20 16:46:47.108879632 +0000
@@ -1,7 +1,10 @@
-Sat Oct 31 19:37:17 EST 2009 Trent W. Buck <trentbuck at gmail.com>
- * Resolve issue1554: allow opt-out of -threaded (fix ARM builds).
- GHC doesn't support -threaded on some architectures.
- This patch allows -f-threaded, so Darcs will compile again.
+Author: Trent W. Buck <trentbuck at gmail.com>
+Forwarded: http://bugs.darcs.net/patch22
+Bug: http://bugs.darcs.net/issue1554
+Bug-Debian: http://bugs.debian.org/541848
+Description: Resolve issue1554: allow opt-out of -threaded (fix ARM builds).
+ GHC doesn't support -threaded on some architectures.
+ This patch allows -f-threaded, so Darcs will compile again.
Index: darcs-2.3.0/darcs.cabal
===================================================================
--- darcs-2.3.0.orig/darcs.cabal 2009-11-01 21:19:58.451735608 +1100
diff -rN -u -purd old-darcs/patches/manpage-cleanup new-darcs/patches/manpage-cleanup
--- old-darcs/patches/manpage-cleanup 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/manpage-cleanup 2010-03-20 16:46:47.108879632 +0000
@@ -1,6 +1,14 @@
-Escape hyphens and backslashes when creating the manpage.
-This avoids numerous groff/man warnings from lintian.
-This patch has since been submitted and accepted upstream.
+Author: Trent W. Buck <trentbuck at gmail.com>
+Bug-Debian: http://lintian.debian.org/tags/manpage-has-errors-from-man.html
+Bug-Debian: http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
+Forwarded: yes
+Description: Avoid unescaped hyphens and backslashes in manpage.
+ Fixes these bugs:
+
+ W: darcs: manpage-has-errors-from-man darcs.1.gz:
+ 297: a tab character is not allowed in an escape name
+ I: darcs: hyphen-used-as-minus-sign darcs.1.gz (87 times)
+
Index: darcs-2.3.0/src/Darcs/Commands/Help.lhs
===================================================================
--- darcs-2.3.0.orig/src/Darcs/Commands/Help.lhs 2009-08-03 16:10:27.186565722 +1000
diff -rN -u -purd old-darcs/patches/no-hspwd new-darcs/patches/no-hspwd
--- old-darcs/patches/no-hspwd 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/no-hspwd 2010-03-20 16:46:47.104879422 +0000
@@ -1,7 +1,9 @@
-Darcs 2.3b1 shipped without hspwd.hs, which is used by "./Setup test".
-It replaces pwd(1) on systems with a broken implementation of same.
-Since Debian doesn't have a broken pwd(1), just remove the use of
-hspwd so "./Setup test" still works.
+Author: Trent W. Buck <trentbuck at gmail.com>
+Forwarded: not-needed
+Description: Don't use (missing) hspwd.hs for tests.
+ Darcs 2.3b1 shipped without hspwd.hs, which broke ./Setup test.
+ Since Debian's pwd builtin isn't buggy, simply use it.
+ Not forwarded because a working pwd builtin is Debian-specific.
Index: darcs-2.3.0~beta1/tests/lib
===================================================================
--- darcs-2.3.0~beta1.orig/tests/lib 2009-06-25 13:32:06.996566001 +1000
diff -rN -u -purd old-darcs/patches/no-libHSdarcs new-darcs/patches/no-libHSdarcs
--- old-darcs/patches/no-libHSdarcs 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/no-libHSdarcs 2010-03-20 16:46:47.104879422 +0000
@@ -1,17 +1,18 @@
-I have unilaterally decided to disable compilation and installation of
-libHSdarcs. My reasons are as follows:
-
- - no API exists yet; it's just exposing Darcs' internals;
-
- - no Debian packages need it yet; and
-
- - at this point, I don't want to spend time learning how to package
- Haskell libraries properly. Particularly, I don't want to regress
- from dh(1) to CDBS :-(
-
-If you want libHSdarcs, file a wishlist bug explaining why you need
-it. Until then, please get the library via cabal-install. Sorry for
-the inconvenience!
+Author: Trent W. Buck <trentbuck at gmail.com>
+Forwarded: not-needed
+Bug: http://bugs.darcs.net/issue1508
+Description: Disable libHSdarcs.
+ I have unilaterally decided to disable compilation and installation of
+ libHSdarcs. My reasons are as follows:
+ .
+ * no Debian package needs it;
+ * the API is not stable; and
+ * I do not with to switch back to CDBS (for hlibrary.mk).
+ .
+ If you need libHSdarcs, file a wishlist bug against Darcs explaining why, and
+ in the meantime use "cabal install".
+ .
+ Not forwarded because upstream prefer to wait for a proper fix in Cabal 1.8.
Index: darcs-2.3.0/darcs.cabal
===================================================================
--- darcs-2.3.0.orig/darcs.cabal 2009-08-03 15:11:11.556565825 +1000
diff -rN -u -purd old-darcs/patches/spelling-error-in-binary new-darcs/patches/spelling-error-in-binary
--- old-darcs/patches/spelling-error-in-binary 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/spelling-error-in-binary 2010-03-20 16:46:47.096879000 +0000
@@ -1,4 +1,7 @@
-Fix a typo in online documentation.
+Author: Trent W. Buck <trentbuck at gmail.com>
+Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
+Forwarded: yes
+Description: Typo: s/comand/command/.
Index: darcs-2.3.0/src/Darcs/Commands/WhatsNew.lhs
===================================================================
--- darcs-2.3.0.orig/src/Darcs/Commands/WhatsNew.lhs 2009-08-03 13:55:18.469071072 +1000
diff -rN -u -purd old-darcs/patches/use-sensible-editor new-darcs/patches/use-sensible-editor
--- old-darcs/patches/use-sensible-editor 2010-03-20 16:46:47.052876683 +0000
+++ new-darcs/patches/use-sensible-editor 2010-03-20 16:46:47.096879000 +0000
@@ -1,9 +1,14 @@
-Follow Debian Policy §11.4 - honour VISUAL, EDITOR and PAGER, but fall
-back on editor and pager respectively. This allows the sysadmin to
-define site-local editor/pager defaults. It also means things work
-when less and vi/emacs/nano aren't installed -- which is the case on a
-new Debian installation if you uncheck the "standard" tasksel task.
-
+Author: Trent W. Buck <trentbuck at gmail.com>
+Forwarded: not-needed
+Bug-Debian: http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.4
+Description: use editor(1) and pager(1) instead of specific editors/pagers.
+ Follow Debian Policy §11.4 - honour VISUAL, EDITOR and PAGER, but fall back on
+ editor and pager respectively. This allows the sysadmin to define site-local
+ editor/pager defaults. It also means things work when less and vi/emacs/nano
+ aren't installed -- which is the case on a new Debian installation if you
+ uncheck the "standard" tasksel task.
+ .
+ Not forwarded because editor(1) and pager(1) are Debian-specific.
Index: darcs-2.3.0~beta1/src/Darcs/Utils.hs
===================================================================
--- darcs-2.3.0~beta1.orig/src/Darcs/Utils.hs 2009-06-24 17:13:28.000000000 +1000
More information about the Pkg-haskell-commits
mailing list