[pkgsrc/trunk]: pkgsrc/doc Updated misc/calibre to 2.26.0

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/830945c38c24
branches:  trunk
changeset: 650647:830945c38c24
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Apr 25 11:35:46 2015 +0000

description:
Updated misc/calibre to 2.26.0

diffstat:

 doc/CHANGES-2015 |  7 ++++++-
 doc/TODO         |  3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r eda2ebe7df45 -r 830945c38c24 doc/CHANGES-2015
--- a/doc/CHANGES-2015  Sat Apr 25 11:35:35 2015 +0000
+++ b/doc/CHANGES-2015  Sat Apr 25 11:35:46 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2015,v 1.1919 2015/04/25 10:47:34 adam Exp $
+$NetBSD: CHANGES-2015,v 1.1920 2015/04/25 11:35:46 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2015:
 
@@ -2876,6 +2876,9 @@
        Updated devel/git-svn to 2.3.6 [adam 2015-04-25]
        Updated www/gitweb to 2.3.6 [adam 2015-04-25]
        Updated net/p5-Net to 3.06 [mef 2015-04-25]
+<<<<<<< CHANGES-2015
+       Renamed lang/gcc to lang/gcc2 [wiz 2015-04-25]
+=======
        Added devel/py-pyobjc version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-core version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-framework-Accounts version 3.0.4 [adam 2015-04-25]
@@ -2915,3 +2918,5 @@
        Added devel/py-pyobjc-framework-SyncServices version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-framework-SystemConfiguration version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-framework-WebKit version 3.0.4 [adam 2015-04-25]
+>>>>>>> 1.1919
+       Updated misc/calibre to 2.26.0 [wiz 2015-04-25]
diff -r eda2ebe7df45 -r 830945c38c24 doc/TODO
--- a/doc/TODO  Sat Apr 25 11:35:35 2015 +0000
+++ b/doc/TODO  Sat Apr 25 11:35:46 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.14355 2015/04/24 23:51:51 rodent Exp $
+$NetBSD: TODO,v 1.14356 2015/04/25 11:35:46 wiz Exp $
 
 Suggested new packages
 ======================
@@ -432,7 +432,6 @@
        o c4-1.10 [schmonz]
        o cal3d-0.11.0
        o calcoo-2.1.0
-       o calibre-2.26.0
        o calligra-2.4.3 [in wip; koffice successor]
        o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/]
        o cddbd-1.5.2