[Pkg-haskell-commits] darcs: haxml: Remove all patches
Joachim Breitner
mail at joachim-breitner.de
Mon Feb 13 21:04:06 UTC 2012
Mon Feb 13 20:51:16 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Remove all patches
Ignore-this: 936112e39e8b79712eeef87022b922ed
R ./patches/
R ./patches/02_change-references.diff
R ./patches/04_no-hugs-package-cmd.diff
R ./patches/08_update-licences.diff
R ./patches/11_haddock-typo.diff
R ./patches/series
Mon Feb 13 20:51:16 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Remove all patches
Ignore-this: 936112e39e8b79712eeef87022b922ed
diff -rN -u old-haxml//patches/02_change-references.diff new-haxml//patches/02_change-references.diff
--- old-haxml//patches/02_change-references.diff 2012-02-13 21:04:06.150755258 +0000
+++ new-haxml//patches/02_change-references.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-## 02_change-references.dpatch by Arjan Oosting <arjanoosting at home.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: haxml-1.20.2/docs/index.html
-===================================================================
---- haxml-1.20.2.orig/docs/index.html 2010-01-14 16:27:40.000000000 +0100
-+++ haxml-1.20.2/docs/index.html 2011-05-27 10:45:35.000000000 +0200
-@@ -97,7 +97,7 @@
- the typed representation (DtdToHaskell/XmlContent) is available here:
- (12 pages of double-column A4)
- <ul>
--<li> <a href="icfp99.dvi">icfp99.dvi</a> (LaTeX dvi format)
-+<li> <a href="icfp99.dvi.gz">icfp99.dvi.gz</a> (LaTeX dvi format - gzipped)
- <li> <a href="icfp99.ps.gz">icfp99.ps.gz</a> (PostScript format - gzipped)
- <li> <a href="icfp99.html">icfp99.html</a> (HTML format)
- </ul>
-@@ -285,7 +285,7 @@
- </ul>
-
- <br>
--<a href="changelog.html">Complete Changelog</a><br>
-+<a href="changelog.html.gz">Complete Changelog (gzipped)</a><br>
-
- <hr>
- <center><h3><a name="who">Contacts</a></h3></center>
-@@ -307,8 +307,8 @@
- for your use, modification, and re-distribution, provided you don't
- restrict anyone else's use of it. The HaXml library is distributed
- under the GNU Lesser General Public Licence (LGPL) - see file
--<a href="LICENCE-LGPL">LICENCE-LGPL</a> for more details. We allow one
--special exception to the LGPL - see <a href="COPYRIGHT">COPYRIGHT</a>.
-+<a href="LICENCE-LGPL">LICENCE-LGPL</a> for more details.
-+We allow one special exception to the LGPL - see <a href="copyright">COPYRIGHT</a>.
- The HaXml tools are distributed under the GNU General Public Licence
- (GPL) - see <a href="LICENCE-GPL">LICENCE-GPL</a>. (If you don't
- like any of these licensing conditions, please contact us to discuss
diff -rN -u old-haxml//patches/04_no-hugs-package-cmd.diff new-haxml//patches/04_no-hugs-package-cmd.diff
--- old-haxml//patches/04_no-hugs-package-cmd.diff 2012-02-13 21:04:06.146753450 +0000
+++ new-haxml//patches/04_no-hugs-package-cmd.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-## 04_no-hugs-package-cmd.dpatch by Arjan Oosting <arjanoosting at home.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: haxml-1.19.7/Makefile
-===================================================================
---- haxml-1.19.7.orig/Makefile
-+++ haxml-1.19.7/Makefile
-@@ -77,7 +77,14 @@
- install-nhc98:
- cd obj/nhc98; $(MAKE) HC=nhc98 install-nhc98
- install-hugs:
-- hugs-package src
-+ mkdir -p $(DESTDIR)/usr/lib/hugs/packages/HaXml/Text/XML/HaXml/Html
-+ mkdir -p $(DESTDIR)/usr/lib/hugs/packages/HaXml/Text/XML/HaXml/Xtract
-+ mkdir -p $(DESTDIR)/usr/lib/hugs/packages/HaXml/Text/XML/HaXml/DtdToHaskell
-+ mkdir -p $(DESTDIR)/usr/lib/hugs/packages/HaXml/Text/ParserCombinators
-+ for file in $(patsubst src/%, %, $(SRCS)); \
-+ do $(CPP) -D__HUGS__ src/$$file > \
-+ $(DESTDIR)/usr/lib/hugs/packages/HaXml/$$file; \
-+ done
- cd obj/hugs; $(MAKE) install-tools-hugs
- install-filesonly-ghc:
- cd obj/ghc; $(MAKE) HC=$(shell cat obj/ghccmd) install-filesonly-ghc
diff -rN -u old-haxml//patches/08_update-licences.diff new-haxml//patches/08_update-licences.diff
--- old-haxml//patches/08_update-licences.diff 2012-02-13 21:04:06.146753450 +0000
+++ new-haxml//patches/08_update-licences.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-## 08_update-licenses.dpatch by Arjan Oosting <arjanoosting at home.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: haxml-1.20.2/LICENCE-GPL
-===================================================================
---- haxml-1.20.2.orig/LICENCE-GPL 2008-03-09 13:41:19.000000000 +0100
-+++ haxml-1.20.2/LICENCE-GPL 2011-05-27 10:46:26.000000000 +0200
-@@ -2,7 +2,7 @@
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-@@ -56,7 +56,6 @@
- The precise terms and conditions for copying, distribution and
- modification follow.
-
--
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-@@ -280,7 +279,6 @@
-
- END OF TERMS AND CONDITIONS
-
--
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-@@ -307,7 +305,7 @@
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
- Also add information on how to contact you by electronic and paper mail.
-@@ -315,7 +313,7 @@
- If the program is interactive, make it output a short notice like this
- when it starts in an interactive mode:
-
-- Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-Index: haxml-1.20.2/LICENCE-LGPL
-===================================================================
---- haxml-1.20.2.orig/LICENCE-LGPL 2008-03-09 13:41:19.000000000 +0100
-+++ haxml-1.20.2/LICENCE-LGPL 2011-05-27 10:46:26.000000000 +0200
-@@ -1,8 +1,9 @@
-+
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-@@ -113,7 +114,6 @@
- former contains code derived from the library, whereas the latter must
- be combined with the library in order to run.
-
--
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-@@ -460,19 +460,20 @@
-
- END OF TERMS AND CONDITIONS
-
--
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
- possible use to the public, we recommend making it free software that
- everyone can redistribute and change. You can do so by permitting
--redistribution under these terms (or, alternatively, under the terms of the
--ordinary General Public License).
-+redistribution under these terms (or, alternatively, under the terms
-+of the ordinary General Public License).
-+
-+ To apply these terms, attach the following notices to the library.
-+It is safest to attach them to the start of each source file to most
-+effectively convey the exclusion of warranty; and each file should
-+have at least the "copyright" line and a pointer to where the full
-+notice is found.
-
-- To apply these terms, attach the following notices to the library. It is
--safest to attach them to the start of each source file to most effectively
--convey the exclusion of warranty; and each file should have at least the
--"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-@@ -489,19 +490,21 @@
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Also add information on how to contact you by electronic and paper mail.
-
--You should also get your employer (if you work as a programmer) or your
--school, if any, to sign a "copyright disclaimer" for the library, if
--necessary. Here is a sample; alter the names:
-+You should also get your employer (if you work as a programmer) or
-+your school, if any, to sign a "copyright disclaimer" for the library,
-+if necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
-- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-+ library `Frob' (a library for tweaking knobs) written by James
-+ Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
- That's all there is to it!
-
-+
diff -rN -u old-haxml//patches/11_haddock-typo.diff new-haxml//patches/11_haddock-typo.diff
--- old-haxml//patches/11_haddock-typo.diff 2012-02-13 21:04:06.146753450 +0000
+++ new-haxml//patches/11_haddock-typo.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-## 11_haddock-typo.dpatch by Arjan Oosting <arjanoosting at home.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a typo.
-
-Index: haxml-1.20.2/src/Text/XML/HaXml/Verbatim.hs
-===================================================================
---- haxml-1.20.2.orig/src/Text/XML/HaXml/Verbatim.hs 2008-03-09 13:41:20.000000000 +0100
-+++ haxml-1.20.2/src/Text/XML/HaXml/Verbatim.hs 2011-05-27 10:46:38.000000000 +0200
-@@ -15,7 +15,7 @@
- but often this is not practical, for instance when the
- literal-layout section contains other elements. Finally, program
- writers could manually format these elements by transforming them
-- into a 'literal' string in their 'CFliter', etc., but this is
-+ into a 'literal' string in their 'CFilter', etc., but this is
- annoying to do and prone to omissions and formatting errors.
-
- As an alternative, this module provides the function 'verbatim',
diff -rN -u old-haxml//patches/series new-haxml//patches/series
--- old-haxml//patches/series 2012-02-13 21:04:06.142752436 +0000
+++ new-haxml//patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-02_change-references.diff
-04_no-hugs-package-cmd.diff
-08_update-licences.diff
-11_haddock-typo.diff
More information about the Pkg-haskell-commits
mailing list