* Debian packaging changes:
+ Migrate to GHC 6.8.2. Closes: #461606 + Add new dependencies libghc6-regex-compat-dev and libghc6-uulib-dev. + Remove the code in debian/rules which attempts to remove empty ghc6.6 include directory. This code may cause an installation failure for the -dev package. Closes: #460658 + Fix doc-base to prevent a lintian warning. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1197 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
parent
76c49ebc63
commit
1a80813009
4 changed files with 21 additions and 9 deletions
15
debian/changelog
vendored
15
debian/changelog
vendored
|
@ -1,3 +1,18 @@
|
|||
pandoc (0.47) unstable; urgency=low
|
||||
|
||||
[ Recai Oktaş ]
|
||||
|
||||
* Debian packaging changes:
|
||||
|
||||
+ Migrate to GHC 6.8.2. Closes: #461606
|
||||
+ Add new dependencies libghc6-regex-compat-dev and libghc6-uulib-dev.
|
||||
+ Remove the code in debian/rules which attempts to remove empty ghc6.6
|
||||
include directory. This code may cause an installation failure for the
|
||||
-dev package. Closes: #460658
|
||||
+ Fix doc-base to prevent a lintian warning.
|
||||
|
||||
-- Recai Oktaş <roktas@debian.org> Sat, 09 Feb 2008 04:41:46 +0200
|
||||
|
||||
pandoc (0.46) unstable; urgency=low
|
||||
|
||||
[ John MacFarlane ]
|
||||
|
|
5
debian/control
vendored
5
debian/control
vendored
|
@ -2,9 +2,8 @@ Source: pandoc
|
|||
Section: text
|
||||
Priority: optional
|
||||
Maintainer: Recai Oktaş <roktas@debian.org>
|
||||
Build-Depends: debhelper (>= 4.0.0), haskell-devscripts (>=0.5.12), ghc6 (>= 6.6-1), libghc6-xhtml-dev, libghc6-mtl-dev, libghc6-network-dev, perl
|
||||
Build-Depends: debhelper (>= 4.0.0), haskell-devscripts (>=0.5.12), ghc6 (>= 6.8.2-1), libghc6-xhtml-dev, libghc6-mtl-dev, libghc6-network-dev, libghc6-regex-compat-dev, libghc6-uulib-dev, perl
|
||||
Build-Depends-Indep: haddock
|
||||
Build-Conflicts: ghc6 (>= 6.8), ghc6 (<= 6.4)
|
||||
Standards-Version: 3.7.3
|
||||
Homepage: http://johnmacfarlane.net/pandoc/
|
||||
XS-Vcs-Svn: http://pandoc.googlecode.com/svn/trunk
|
||||
|
@ -38,7 +37,7 @@ Description: general markup converter
|
|||
Package: libghc6-pandoc-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Depends: ${haskell:Depends}, libghc6-xhtml-dev, libghc6-mtl-dev, libghc6-network-dev
|
||||
Depends: ${haskell:Depends}, libghc6-xhtml-dev, libghc6-mtl-dev, libghc6-network-dev, libghc6-regex-compat-dev, libghc6-uulib-dev
|
||||
Suggests: pandoc-doc
|
||||
Description: general markup converter
|
||||
Pandoc is a Haskell library for converting from one markup format to
|
||||
|
|
4
debian/pandoc-doc.doc-base
vendored
4
debian/pandoc-doc.doc-base
vendored
|
@ -7,5 +7,5 @@ Abstract: This is the documentation of Pandoc, which includes the API
|
|||
Section: Apps/Programming
|
||||
|
||||
Format: html
|
||||
Index: /usr/share/doc/pandoc-doc/html/index.html
|
||||
Files: /usr/share/doc/pandoc-doc/html/*.html
|
||||
Index: /usr/share/doc/pandoc-doc/html/pandoc/index.html
|
||||
Files: /usr/share/doc/pandoc-doc/html/pandoc/*.html
|
||||
|
|
6
debian/rules
vendored
6
debian/rules
vendored
|
@ -38,13 +38,13 @@ configure-stamp:
|
|||
dh_testdir
|
||||
$(MAKE) configure
|
||||
|
||||
touch configure-stamp
|
||||
touch $@
|
||||
|
||||
build: build-stamp
|
||||
build-stamp: configure-stamp
|
||||
dh_testdir
|
||||
|
||||
touch build-stamp
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
|
@ -63,8 +63,6 @@ install: build
|
|||
|
||||
dh_haskell -a
|
||||
|
||||
# Remove empty directories, which lintian complains about.
|
||||
find debian/libghc6-$(THIS)-dev -type d -name 'include' -empty -delete
|
||||
# Hack! Cabal builds executables while building libraries. Move these
|
||||
# files to top dir where the Makefile install target expects to find.
|
||||
# See "BUGS" section at the following document:
|
||||
|
|
Loading…
Add table
Reference in a new issue