[Pkg-haskell-commits] darcs: gitit: Package nearly ready for new release.
Giovanni Mascellani
gio at debian.org
Wed Jun 1 11:42:01 UTC 2011
Sat May 28 08:20:51 UTC 2011 Giovanni Mascellani <gio at debian.org>
* Package nearly ready for new release.
Ignore-this: 6d442faba062d7c035d88cb35d6dbb16
M ./changelog -1 +9
M ./control -48 +49
M ./copyright -4 +43
M ./rules -3 +3
Sat May 28 08:20:51 UTC 2011 Giovanni Mascellani <gio at debian.org>
* Package nearly ready for new release.
Ignore-this: 6d442faba062d7c035d88cb35d6dbb16
diff -rN -u old-gitit//changelog new-gitit//changelog
--- old-gitit//changelog 2011-06-01 11:42:01.029274250 +0000
+++ new-gitit//changelog 2011-06-01 11:42:01.093273815 +0000
@@ -4,7 +4,15 @@
* Use ghc instead of ghc6
[ Giovanni Mascellani ]
- * New upstream release.
+ * New upstream release (closes: #626710, LP: #749185).
+ * debian/control:
+ + removing references to GHC 6;
+ + Standards-Version bumped to 3.9.2 (no changes required);
+ + build dependencies updated.
+ * debian/copyright:
+ + copyright years updated;
+ + a few new files added.
+ * debian/rules: minor fixes.
-- Giovanni Mascellani <gio at debian.org> Tue, 24 May 2011 19:29:39 +0200
diff -rN -u old-gitit//control new-gitit//control
--- old-gitit//control 2011-06-01 11:42:01.029274250 +0000
+++ new-gitit//control 2011-06-01 11:42:01.083799155 +0000
@@ -8,58 +8,59 @@
haskell-devscripts (>= 0.7),
cdbs,
ghc,
- ghc-prof,
- libghc-cautious-file-dev,
- libghc-cgi-dev,
- libghc-configfile-dev,
- libghc-feed-dev,
- libghc-filestore-dev,
- libghc-happstack-server-dev,
- libghc-happstack-util-dev,
- libghc-highlighting-kate-dev,
- libghc-hslogger-dev,
- libghc-hstringtemplate-dev,
- libghc-http-dev,
- libghc-mtl-dev,
- libghc-network-dev,
- libghc-pandoc-dev,
- libghc-parsec3-dev,
- libghc-recaptcha-dev,
+ libghc-pandoc-dev (>= 1.8),
+ libghc-pandoc-types-dev (>= 1.8),
libghc-safe-dev,
- libghc-sha-dev,
- libghc-texmath-dev,
- libghc-text-dev,
- libghc-unix-compat-dev,
- libghc-url-dev,
+ libghc-parsec3-dev,
libghc-xhtml-dev,
- libghc-xml-dev
+ libghc-mtl-dev,
+ libghc-cgi-dev,
+ libghc-network-dev (>= 2.1.0.0),
+ libghc-highlighting-kate-dev (>= 0.2.7.1),
+ libghc-utf8-string-dev (>= 0.3),
+ libghc-sha-dev (>= 1.1),
+ libghc-http-dev (>= 4000.0),
+ libghc-hstringtemplate-dev (>= 0.6),
+ libghc-recaptcha-dev (>= 0.1),
+ libghc-filestore-dev (>= 0.4.0.2),
+ libghc-zlib-dev (>= 0.5),
+ libghc-url-dev (>= 2.1),
+ libghc-happstack-server-dev (>= 6.0),
+ libghc-happstack-util-dev (>= 6.0),
+ libghc-xml-dev (>= 1.3.5),
+ libghc-hslogger-dev (>= 1),
+ libghc-configfile-dev (>= 1),
+ libghc-feed-dev (>= 0.3.6),
+ libghc-xss-sanitize-dev (>= 0.2),
+ libghc-json-dev (>= 0.4)
Build-Depends-Indep:
ghc-doc,
- libghc-cautious-file-doc,
- libghc-cgi-doc,
- libghc-configfile-doc,
- libghc-feed-doc,
- libghc-filestore-doc,
- libghc-happstack-server-doc,
- libghc-happstack-util-doc,
- libghc-highlighting-kate-doc,
- libghc-hslogger-doc,
- libghc-hstringtemplate-doc,
- libghc-http-doc,
- libghc-mtl-doc,
- libghc-network-doc,
- libghc-pandoc-doc,
- libghc-parsec3-doc,
- libghc-recaptcha-doc,
+ libghc-pandoc-doc (>= 1.8),
+ libghc-pandoc-types-doc (>= 1.8),
libghc-safe-doc,
- libghc-sha-doc,
- libghc-texmath-doc,
- libghc-text-doc,
- libghc-unix-compat-doc,
- libghc-url-doc,
+ libghc-parsec3-doc,
libghc-xhtml-doc,
- libghc-xml-doc
-Standards-Version: 3.9.1
+ libghc-mtl-doc,
+ libghc-cgi-doc,
+ libghc-network-doc (>= 2.1.0.0),
+ libghc-highlighting-kate-doc (>= 0.2.7.1),
+ libghc-utf8-string-doc (>= 0.3),
+ libghc-sha-doc (>= 1.1),
+ libghc-http-doc (>= 4000.0),
+ libghc-hstringtemplate-doc (>= 0.6),
+ libghc-recaptcha-doc (>= 0.1),
+ libghc-filestore-doc (>= 0.4.0.2),
+ libghc-zlib-doc (>= 0.5),
+ libghc-url-doc (>= 2.1),
+ libghc-happstack-server-doc (>= 6.0),
+ libghc-happstack-util-doc (>= 6.0),
+ libghc-xml-doc (>= 1.3.5),
+ libghc-hslogger-doc (>= 1),
+ libghc-configfile-doc (>= 1),
+ libghc-feed-doc (>= 0.3.6),
+ libghc-xss-sanitize-doc (>= 0.2),
+ libghc-json-doc (>= 0.4)
+Standards-Version: 3.9.2
Homepage: http://hackage.haskell.org/package/gitit
Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/gitit
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/gitit
@@ -104,7 +105,7 @@
Suggests: ${haskell:Suggests}
Recommends: ${haskell:Recommends}
Provides: ${haskell:Provides}
-Description: Wiki engine backed by a git or darcs filestore - GHC 6 libraries
+Description: Wiki engine backed by a git or darcs filestore - GHC libraries
Gitit is a wiki backed by a git or darcs filestore. Pages and uploaded files
can be modified either directly via the VCS’s command-line tools or through
the wiki’s web interface. Pandoc is used for markup processing, so pages may
@@ -126,7 +127,7 @@
any happstack application;
* pages can be written directly in literate Haskell.
.
- This package contains the libraries compiled for GHC 6.
+ This package contains the libraries compiled for GHC.
Package: libghc-gitit-doc
Section: doc
diff -rN -u old-gitit//copyright new-gitit//copyright
--- old-gitit//copyright 2011-06-01 11:42:00.817481534 +0000
+++ new-gitit//copyright 2011-06-01 11:42:01.037273475 +0000
@@ -12,9 +12,48 @@
On Debian systems, the text of the GPL-2 license can be found in the
file `/usr/share/common-licenses/GPL-2'.
+Files: Network/Gitit/Rpxnow.hs
+Copyright: © 2008, Michael Snoyman <michael at snoyman.com>
+License: BSD_1
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+X-Origin: http://hackage.haskell.org/package/authenticate
+
+Files: plugins/Interwiki.hs,
+ plugins/WebArchiver.hs
+Copyright: written by Gwern Brawnen and put into the public domain
+License: public-domain
+
+Files: plugins/ImgTex.hs
+Copyright: © Kohei OZAKI <i at smly.org>
+ © John MacFarlane <jgm at berkeley.edu>
+License: GPL
+ On Debian systems, the text of the GPL-2 license can be found in the
+ file `/usr/share/common-licenses/GPL-2'.
+
Files: data/static/css/reset-fonts-grids.css
Copyright: © 2009, Yahoo! Inc.
-License: BSD
+License: BSD_2
Redistribution and use of this software in source and binary forms,
with or without modification, are permitted provided that the following
conditions are met:
@@ -54,7 +93,7 @@
On Debian systems, the text of the GPL-2 license can be found in the
file `/usr/share/common-licenses/GPL-2'.
X-Origin: http://jquery.com/
-X-Comment: jQuery is already packaged in Debian: this embedded copy isn't
+Comment: jQuery is already packaged in Debian: this embedded copy isn't
used by gitit, a symbolic link to the Debian package is made instead.
Files: data/static/js/jquery-ui.packed.js
@@ -86,7 +125,7 @@
On Debian systems, the text of the GPL-2 license can be found in the
file `/usr/share/common-licenses/GPL-2'.
X-Origin: http://jqueryui.com/
-X-Comment: jQuery UI is already packaged in Debian: this embedded copy isn't
+Comment: jQuery UI is already packaged in Debian: this embedded copy isn't
used by gitit, a symbolic link to the Debian package is made instead.
Files: data/static/js/jquery.hotkeys-0.7.9.min.js
@@ -97,7 +136,7 @@
X-Origin: http://code.google.com/p/js-hotkeys/
Files: debian/*
-Copyright: © 2010 Giovanni Mascellani <gio at debian.org>
+Copyright: © 2010 - 2011, Giovanni Mascellani <gio at debian.org>
License: GPL-3+
The Debian packaging information is under the GPL, version 3 or later. On
Debian GNU/Linux systems, the complete text of the GNU General Public License
diff -rN -u old-gitit//rules new-gitit//rules
--- old-gitit//rules 2011-06-01 11:42:00.697387213 +0000
+++ new-gitit//rules 2011-06-01 11:42:01.081275479 +0000
@@ -20,9 +20,9 @@
echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
# Removes a few files, that are not necessary and make lintian cry
- rm -f debian/gitit/usr/share/gitit-0.7.3.6/data/post-update
- rm -f debian/gitit/usr/share/gitit-0.7.3.6/BLUETRIP-LICENSE
- rm -f debian/gitit/usr/share/gitit-0.7.3.6/YUI-LICENSE
+ rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/data/post-update
+ rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/BLUETRIP-LICENSE
+ rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/YUI-LICENSE
# Not used at the moment
#install/libghc-gitit-dev:: debian/tmp-inst-ghc
More information about the Pkg-haskell-commits
mailing list