Your message dated Tue, 30 Jan 2007 07:47:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#408599: fixed in ikiwiki 1.41
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: ikiwiki
Version: 1.40
Severity: normal
Tags: patch

The GIT backend works only when using the default branches "master" and 
"origin".

Using other branches wrecks havoc, as the working branch is force-overloaded 
with stuff from the 
possibly largely different branches.


The attached patch fixes this (or at least worked for me...).


Keep up the great work on this excellent tool, Joey!


 - Jonas

-- System Information:
Debian Release: 4.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-powerpc
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)

Versions of packages ikiwiki depends on:
ii  gcc [c-compiler]            4:4.1.1-15   The GNU C compiler
ii  gcc-4.1 [c-compiler]        4.1.1-21     The GNU C compiler
ii  libc6-dev [libc-dev]        2.3.6.ds1-10 GNU C Library: Development Librari
ii  libcgi-formbuilder-perl     3.05-1       Easily generate and process statef
ii  libcgi-session-perl         4.20-1       Persistent session data in CGI app
ii  libhtml-parser-perl         3.56-1       A collection of modules that parse
ii  libhtml-scrubber-perl       0.08-3       Perl extension for scrubbing/sanit
ii  libhtml-template-perl       2.8-1        HTML::Template : A module for usin
ii  libmail-sendmail-perl       0.79-4       Send email from a perl script
ii  libtime-duration-perl       1.02-1       Time::Duration -- rounded or exact
ii  libtimedate-perl            1.1600-5     Time and date functions for Perl
ii  liburi-perl                 1.35-2       Manipulates and accesses URI strin
ii  libxml-simple-perl          2.14-5       Perl module for reading and writin
ii  markdown                    1.0.1-6      Text-to-HTML conversion tool
ii  perl                        5.8.8-7      Larry Wall's Practical Extraction 

Versions of packages ikiwiki recommends:
ii  git-core                    1:1.4.4.4-1  content addressable filesystem
ii  hyperestraier               1.4.9-1.1    a full-text search system for comm
ii  mercurial                   0.9.3-2      Scalable distributed version contr
ii  subversion                  1.4.2dfsg1-2 Advanced version control system

-- no debconf information
--- git.pm.orig 2006-11-26 21:06:47.000000000 +0100
+++ git.pm      2007-01-27 10:45:45.000000000 +0100
@@ -8,8 +8,9 @@
 
 package IkiWiki;
 
-my $origin_branch    = 'origin';            # Git ref for main repository
-my $master_branch    = 'master';            # working branch
+# Git ref for main repository (origin) and working branch (master)
+my $origin_branch    = defined($config{origin_branch}) ? 
$config{origin_branch} : 'origin';
+my $master_branch    = defined($config{master_branch}) ? 
$config{master_branch} : 'master';
 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 

--- End Message ---
--- Begin Message ---
Source: ikiwiki
Source-Version: 1.41

We believe that the bug you reported is fixed in the latest version of
ikiwiki, which is due to be installed in the Debian FTP archive:

ikiwiki_1.41.dsc
  to pool/main/i/ikiwiki/ikiwiki_1.41.dsc
ikiwiki_1.41.tar.gz
  to pool/main/i/ikiwiki/ikiwiki_1.41.tar.gz
ikiwiki_1.41_all.deb
  to pool/main/i/ikiwiki/ikiwiki_1.41_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Joey Hess <[EMAIL PROTECTED]> (supplier of updated ikiwiki package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 30 Jan 2007 02:36:53 -0500
Source: ikiwiki
Binary: ikiwiki
Architecture: source all
Version: 1.41
Distribution: unstable
Urgency: low
Maintainer: Joey Hess <[EMAIL PROTECTED]>
Changed-By: Joey Hess <[EMAIL PROTECTED]>
Description: 
 ikiwiki    - a wiki compiler
Closes: 408593 408599
Changes: 
 ikiwiki (1.41) unstable; urgency=low
 .
   * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
     if an older version is installed, just don't gettext strings, instead of
     crashing.
   * Added smileys for Moin Moin compatability.
   * Fix handling of discussion links on discussion pages when l10n is used.
   * Make gitorigin_branch and gitmaster_branch configurable via the setup
     file. Closes: #408599
   * French translation update. Closes: #408593
   * Improve use of svn merge, by specifying the file to merge, rather than
     chdiring to the srcdir (which wasn't right when merging in a subdir).
     Thanks Ethan.
   * Always call rcs_update after a commit during a web edit, to work around
     the problem described in bugs/svn_fails_to_update. Thanks to Ethan for the
     analysis and patch.
   * Replace underscores in shortcut texts with spaces when formatting for
     display. This allows using a shortcut like [[wikipedia War_of_1812]],
     which links to the correct remote page, but is displayed nicely.
   * When building the doc wiki, build with LANG=C.
   * More gettext fun.
   * Fix openid signin secret generation code. This fixes the bug that made
     all openid signins fail the first time, and then succeed the second
     time.
Files: 
 3bc0216d675d86b6f1984de59ee6c4fa 732 web optional ikiwiki_1.41.dsc
 42d899cd0ce2056cdb07c800aca91887 314317 web optional ikiwiki_1.41.tar.gz
 73b40230c4a7ae8c3e271a17ec7b93af 407624 web optional ikiwiki_1.41_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFFvvXE2tp5zXiKP0wRAhTxAKDFcFMFGYSiZ7fnNVab+bMM1rlH9QCcD5sS
knxXeM4O5ASHBRPAfm6shIs=
=lM13
-----END PGP SIGNATURE-----


--- End Message ---

Reply via email to