urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

master
Joey Hess 2008-03-19 23:00:21 -04:00
parent 8471c51355 c92e9b34ec
commit b86c40e220
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/UserInfo.pm
View File

@ -17,7 +17,7 @@ sub userinfo_store ($) { #{{{
my $newfile="$config{wikistatedir}/userdb.new";
my $oldmask=umask(077);
my $ret=Storable::lock_store($userinfo, $newfile);
my $ret=Storable::lock_nstore($userinfo, $newfile);
umask($oldmask);
if (defined $ret && $ret) {
if (! rename($newfile, "$config{wikistatedir}/userdb")) {

1
Makefile.PL
View File

@ -101,7 +101,6 @@ WriteMakefile(
'HTML::Template' => 0,
'HTML::Scrubber' => 0,
'CGI::FormBuilder' => 3.02.02,
'Time::Duration' => 0,
'CGI::Session' => 0,
'Mail::Sendmail' => 0,
'HTML::Parser' => 0,

3
debian/changelog vendored
View File

@ -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

2
debian/control vendored
View File

@ -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

6
doc/install.mdwn
View File

@ -11,9 +11,9 @@ perl modules be installed.
It also uses the following perl modules if available: [[cpan
CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer), [[cpan
Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]], [[cpan
RPC::XML]], [[cpan XML::Simple]], [[cpan XML::Feed]], [[cpan
File::MimeInfo]], [[cpan Locale::gettext]] (version 1.04 or newer).
Mail::Sendmail]], [[cpan TimeDate]], [[cpan RPC::XML]],
[[cpan XML::Simple]], [[cpan XML::Feed]], [[cpan File::MimeInfo]],
[[cpan Locale::gettext]] (version 1.04 or newer).
It's recommended you have a C compiler, as ikiwiki uses one to build
wrappers.

2
doc/tips/SharedHosting.mdwn
View File

@ -109,7 +109,7 @@ Install the modules required for Ikiwiki. I install all of the ones required *a
install Text::Markdown URI HTML::Parser HTML::Template
install CGI CGI::Session CGI::FormBuilder
install Mail::Sendmail Time::Duration HTML::Scrubber
install Mail::Sendmail HTML::Scrubber
install RPC::XML XML::Simple XML::Feed File::MimeInfo Locale::gettext
# Changes to Ikiwiki's build/install process