From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 23:55:50 +0000 (-0400)
Subject: Merge commit '97de9bb8605eaeb47edd4d80b444605676bb83e2' into slop
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7399b073a794fa941a88d75a89753f72998d1913

Merge commit '97de9bb8605eaeb47edd4d80b444605676bb83e2' into slop

For some reason, when I run:

gitk $(git for-each-ref --format='%(refname)' 'refs/remotes/'; git
for-each-ref --format='^%(refname)' 'refs/heads/' 'refs/remotes/origin/'
'refs/tags/')

It shows a bunch of commits, that are present in master, along the way to
this commit, in intigreti's remote.

AFAICS, there is nothing in there that I should be considering merging, so
rather than debug why it does that, I'll just merge it into this branch.
The command above will actually notice it's merged to one of my branches
then, and will avoid cluttering the display of other, unmerged stuff with
it.

I earlier merged a few branches into this one that I had deleted, but that
are still present in other's repos, so that they also don't show up in the
above gitk.
---

7399b073a794fa941a88d75a89753f72998d1913
diff --cc debian/control
index 96ba221ff,3f12dccf3..adf11c31a
--- a/debian/control
+++ b/debian/control
@@@ -16,27 -12,13 +16,28 @@@ Vcs-Browser: http://git.ikiwiki.info/?p
  
  Package: ikiwiki
  Architecture: all
 -Depends: ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
 -Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | 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, libauthen-passphrase-perl
 -<<<<<<< HEAD:debian/control
 +Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 
 +  libtext-markdown-perl | markdown,
 +  libhtml-scrubber-perl, libhtml-template-perl,
 +  libhtml-parser-perl, liburi-perl
 +Recommends: gcc | c-compiler, 
 +  libc6-dev | libc-dev,
 +  subversion | git-core (>= 1:1.5.0) | 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, libauthen-passphrase-perl, libterm-readline-gnu-perl
 +Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
 +  xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl,
 +  python, python-docutils, polygen, tidy, libhtml-tree-perl,
 +  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, libnet-amazon-s3-perl,
 +  sparkline-php, texlive, dvipng, libtext-wikicreole-perl,
 +  libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
 +  po4a (>= 0.35-1), gettext
+ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, 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, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng
 -=======
 -Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), 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, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, po4a
 ->>>>>>> origin/master:debian/control
  Conflicts: ikiwiki-plugin-table
  Replaces: ikiwiki-plugin-table
  Provides: ikiwiki-plugin-table