diff options
| author | Joey Hess <joey@kitenet.net> | 2008-03-19 23:00:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2008-03-19 23:00:21 -0400 |
| commit | b86c40e220ed5f095f5149fd7d74a65eb570edd1 (patch) | |
| tree | eb2190edfd5e7952e189226b6f6e62c9a4ee3aae /debian | |
| parent | 8471c5135512586dd4944cd4f7ca3de75063a197 (diff) | |
| parent | c92e9b34ec652748af3a07b329e07c4af7f975d5 (diff) | |
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8f505782e..5909f237e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,9 @@ ikiwiki (2.41) UNRELEASED; urgency=low things that need to know the page source or type can query it from there. Fixes previewing of tables when creating a new page. * German translation update. Closes: #471540 + * Time::Duration is no longer used, remove from docs and recommends. + * Store userinfo in network byte order for easy portability. + (Old files will be automatically converted.) -- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100 diff --git a/debian/control b/debian/control index 886456c0f..0bc2cbfde 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all Depends: ${perl:Depends}, markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl -Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl +Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl Suggests: viewvc | gitweb | viewcvs, hyperestraier, librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table |