tags 575863 + patch
thanks
Dear maintainer,
I've prepared an NMU for tagcoll2 (versioned as 2.0.11-1.1). The diff
is attached to this message. (Uploaded directly as per NMU ACK
from the maintainer.)
Regards.
diff -Nru tagcoll2-2.0.11/debian/changelog tagcoll2-2.0.11/debian/changelog
--- tagcoll2-2.0.11/debian/changelog 2010-05-11 22:04:50.000000000 -0700
+++ tagcoll2-2.0.11/debian/changelog 2010-05-11 21:53:17.000000000 -0700
@@ -1,3 +1,36 @@
+tagcoll2 (2.0.11-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/compat
+ - Update to 7.
+ * Non-maintainer upload.
+ * debian/control
+ - (Build-Depends): update obsolete gs to shostscript
+ (important; Closes: #575863).
+ Update to debhelper 7.1. Remove dpatch
+ - (Depends): Add ${misc:Depends}.
+ - (Standards-Version): Update to 3.8.4.
+ - (Tag): Remove debtags; unknown to debuilder.
+ - (libtagcoll2-dev::Section): Remove inherited field.
+ * debian/copyright
+ - Update layout.
+ * debian/patches
+ - (Number 10): Fix hyphens and spelling i manual.
+ - (Number 20): Fix spelling in code.
+ - (Number 30): Fix spelling in *.tex
+ * debian/rules
+ - Remove dpatch; obsoleted by new package format.
+ - (buid-stamp): use newest config.* files.
+ - (install): Update dh_clean to dh_prep.
+ - (clean): Fix lintian debian-rules-ignores-make-clean-error.
+ - Update to dh(1).
+ * debian/source/format
+ - New file.
+ * debian/watch
+ - New file.
+
+ -- Jari Aalto <[email protected]> Tue, 11 May 2010 09:53:10 +0300
+
tagcoll2 (2.0.11-1) unstable; urgency=low
* New upstream version.
diff -Nru tagcoll2-2.0.11/debian/compat tagcoll2-2.0.11/debian/compat
--- tagcoll2-2.0.11/debian/compat 2010-05-11 22:04:50.000000000 -0700
+++ tagcoll2-2.0.11/debian/compat 2010-05-10 10:50:12.000000000 -0700
@@ -1 +1 @@
-4
+7
diff -Nru tagcoll2-2.0.11/debian/control tagcoll2-2.0.11/debian/control
--- tagcoll2-2.0.11/debian/control 2010-05-11 22:04:50.000000000 -0700
+++ tagcoll2-2.0.11/debian/control 2010-05-10 23:52:31.000000000 -0700
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Enrico Zini <[email protected]>
Uploaders: Arnaud Fontaine <[email protected]>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config,
libwibble-dev (>= 0.1.16), libwibble-dev (<<0.2), flex, bison, doxygen,
graphviz, texlive-base, gs, libtut-dev, zlib1g-dev
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 7.1), dh-buildinfo, pkg-config,
libwibble-dev (>= 0.1.16), libwibble-dev (<<0.2), flex, bison, doxygen,
graphviz, texlive-base, ghostscript, libtut-dev, zlib1g-dev
+Standards-Version: 3.8.4
Homepage: http://debtags.alioth.debian.org
Vcs-Svn: svn://svn.debian.org/debtags/tagcoll/2.0
Vcs-Browser: http://svn.debian.org/viewsvn/debtags/tagcoll/2.0/
@@ -12,7 +12,6 @@
Package: tagcoll
Architecture: any
Section: misc
-Tag: implemented-in::c++, interface::commandline, role::program,
scope::utility, use::organizing, use::searching
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Commandline tool to perform operations on tagged collections
tagcoll takes a collection of items categorized with multiple tags and
@@ -29,11 +28,9 @@
.
tagcoll has been written with the purpose of studying tagged collections and
experiment with tagged collection algorithms.
-
+
Package: libtagcoll2-dev
-Section: libdevel
-Tag: implemented-in::c++, devel::library
-Depends: zlib1g-dev, libwibble-dev (>= 0.1.7), libwibble-dev (<< 0.2)
+Depends: ${misc:Depends}, zlib1g-dev, libwibble-dev (>= 0.1.7), libwibble-dev
(<< 0.2)
Architecture: any
Recommends: pkg-config
Description: Functions used to manipulate tagged collections (development
version)
diff -Nru tagcoll2-2.0.11/debian/copyright tagcoll2-2.0.11/debian/copyright
--- tagcoll2-2.0.11/debian/copyright 2010-05-11 22:04:50.000000000 -0700
+++ tagcoll2-2.0.11/debian/copyright 2010-05-10 10:50:12.000000000 -0700
@@ -10,7 +10,7 @@
This software is distributed under the GNU General Public License,
which can be found at /usr/share/common-licenses/GPL-2.
-The Debian packaging is (C) 2006-2008, Arnaud Fontaine
+The Debian packaging is Copyright (C) 2006-2008, Arnaud Fontaine
<[email protected]>, Enrico Zini <[email protected]>, Jeroen van
Wolffelaar <[email protected]> and is licensed under the GPL, see
above.
diff -Nru tagcoll2-2.0.11/debian/patches/10-doc--tagcoll-man-hooks.patch
tagcoll2-2.0.11/debian/patches/10-doc--tagcoll-man-hooks.patch
--- tagcoll2-2.0.11/debian/patches/10-doc--tagcoll-man-hooks.patch
1969-12-31 16:00:00.000000000 -0800
+++ tagcoll2-2.0.11/debian/patches/10-doc--tagcoll-man-hooks.patch
2010-05-10 10:50:12.000000000 -0700
@@ -0,0 +1,118 @@
+From 211b8405a2485af83f4bdd55228f80ef2fbb9617 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Mon, 10 May 2010 20:43:34 +0300
+Subject: [PATCH] doc/tagcoll-man-hooks: Misc fixes
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ doc/tagcoll-man-hooks | 42 +++++++++++++++++++++---------------------
+ 1 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/doc/tagcoll-man-hooks b/doc/tagcoll-man-hooks
+index 248c3f1..f9074fa 100644
+--- a/doc/tagcoll-man-hooks
++++ b/doc/tagcoll-man-hooks
+@@ -105,13 +105,13 @@ OPTIONS end
+ |
+ |.nf
+ | cappuccino: +essential
+-| emacs: +otheros, -editor
++| emacs: +otheros, \-editor
+ |.fi
+ |
+ |.SH Format for the derived tag list
+ |
+ |The format for the derived tag list is a line-oriented format with a derived
+-|tag per line. The derived tag name starts as the begining of the line and is
++|tag per line. The derived tag name starts as the beginning of the line and
is
+ |separated by his tag expression by colon and space, just like the tagged
+ |collection items.
+ |.P
+@@ -131,61 +131,61 @@ OPTIONS end
+ |.P
+ |.nf
+ |# Output the collection in normal form
+-|tagcoll copy collection-file
++|tagcoll copy collection\-file
+ |
+ |# Output the items associated to a given tag
+-|tagcoll reverse collection-file | grep ^tag:
++|tagcoll reverse collection\-file | grep ^tag:
+ |
+ |# Produce tag patch data describing the tag difference between two
collections
+ |tagcoll diff coll1 coll2
+ |
+ |# Apply a tag patch file to coll1
+-|tagcoll --patch-with=tagpatch copy coll1 > collection-file
++|tagcoll \-\-patch\-with=tagpatch copy coll1 > collection\-file
+ |
+ |# Show the minimal set of implicit implications contained in the collection
+-|tagcoll implications collection-file
++|tagcoll implications collection\-file
+ |
+ |# Show the implicit implications contained in the collection, fully expanded
+-|tagcoll --expanded-output implications collection-file
++|tagcoll \-\-expanded\-output implications collection\-file
+ |
+ |# Build a smart hierarchy with the collection
+-|tagcoll hierarchy collection-file
++|tagcoll hierarchy collection\-file
+ |
+ |# Build a cleaner smart hierarchy with the collection (yoy might like to
tweak
+ |# the parameters)
+-|tagcoll -f 5 --flatten-threshold=5 cleanhierarchy collection-file
++|tagcoll \-f 5 \-\-flatten\-threshold=5 cleanhierarchy collection\-file
+ |
+ |# Apply some transformations to the collection and build a smart hierarchy
with
+ |# them
+-|tagcoll --implications-from=explicit-implications-file \\
+-| --rename-from=rename-map \\
+-| --patch-with=patch-file \\
+-| hierarchy collection-file
++|tagcoll \-\-implications\-from=explicit\-implications\-file \\
++| \-\-rename\-from=rename\-map \\
++| \-\-patch\-with=patch\-file \\
++| hierarchy collection\-file
+ |
+ |# Merge the contents two collections
+ |cat coll1 coll2 | tagcoll copy > merged
+ |
+ |# Merge the contents two collections and apply an external patch
+-|cat coll1 coll2 | tagcoll --patch-with=patch-file copy > merged
++|cat coll1 coll2 | tagcoll \-\-patch\-with=patch\-file copy > merged
+ |
+ |# Build a smart hierarchy out of the implicit implications contained in the
+ |# collection
+-|tagcoll implications collection-file | tagcoll hierarchy
++|tagcoll implications collection\-file | tagcoll hierarchy
+ |
+ |# Build a smart hierarchy out of the combination of explicit implications and
+ |# the implicit implications contained in the collection
+-|tagcoll --implications-from=explicit-implications-file \\
+-| implications collection-file | tagcoll hierarchy
++|tagcoll \-\-implications\-from=explicit\-implications\-file \\
++| implications collection\-file | tagcoll hierarchy
+ |
+ |# Show all the items similar to "mutt"
+-|tagcoll related mutt collection-file
++|tagcoll related mutt collection\-file
+ |
+-|# Show all the items similar to "mutt" and "mozilla-browser"
+-|tagcoll related mutt,mozilla-browser collection-file
++|# Show all the items similar to "mutt" and "mozilla\-browser"
++|tagcoll related mutt,mozilla\-browser collection\-file
+ |
+ |# Show all the items similar to "mutt", with at most two differences
+ |# in the tag set
+-|tagcoll --distance=2 related mutt collection-file
++|tagcoll \-\-distance=2 related mutt collection\-file
+ |
+ |.fi
+
+--
+1.7.0
+
diff -Nru tagcoll2-2.0.11/debian/patches/20-code-spelling.patch
tagcoll2-2.0.11/debian/patches/20-code-spelling.patch
--- tagcoll2-2.0.11/debian/patches/20-code-spelling.patch 1969-12-31
16:00:00.000000000 -0800
+++ tagcoll2-2.0.11/debian/patches/20-code-spelling.patch 2010-05-10
10:58:08.000000000 -0700
@@ -0,0 +1,67 @@
+From c5275e535fab8fd2ac7400d8ecfd69c51f9cd174 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Mon, 10 May 2010 19:10:45 +0300
+Subject: [PATCH] Fix spelling
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ tools/TagcollParser.h | 2 +-
+ tools/Timing.h | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tools/TagcollParser.h b/tools/TagcollParser.h
+index e1540da..5768843 100644
+--- a/tools/TagcollParser.h
++++ b/tools/TagcollParser.h
+@@ -290,7 +290,7 @@ struct TagcollOptions : public MainParser<CommandParser>
+ Help(TagcollOptions* cp) : OptionParser("help")
+ {
+ usage = "[command]";
+- description = "print help informations";
++ description = "print help information";
+ }
+ } help;
+
+diff --git a/tools/Timing.h b/tools/Timing.h
+index 3761162..1de0da6 100644
+--- a/tools/Timing.h
++++ b/tools/Timing.h
+@@ -53,7 +53,7 @@ public:
+ tag(tag)
+ {
+ if (times(&firsttms) == -1)
+- throw wibble::exception::System("reading timing
informations");
++ throw wibble::exception::System("reading timing
information");
+ lasttms = firsttms;
+ }
+
+@@ -61,12 +61,12 @@ public:
+ {
+ struct tms curtms;
+ if (times(&curtms) == -1)
+- throw wibble::exception::System("reading timing
informations");
++ throw wibble::exception::System("reading timing
information");
+
+ std::string res = format(curtms, lasttms);
+
+ if (times(&lasttms) == -1)
+- throw wibble::exception::System("reading timing
informations");
++ throw wibble::exception::System("reading timing
information");
+
+ return res;
+ }
+@@ -75,7 +75,7 @@ public:
+ {
+ struct tms curtms;
+ if (times(&curtms) == -1)
+- throw wibble::exception::System("reading timing
informations");
++ throw wibble::exception::System("reading timing
information");
+
+ return format(curtms, firsttms);
+ }
+--
+1.7.0
+
diff -Nru tagcoll2-2.0.11/debian/patches/30-doc--tagbk-draft.tex.patch
tagcoll2-2.0.11/debian/patches/30-doc--tagbk-draft.tex.patch
--- tagcoll2-2.0.11/debian/patches/30-doc--tagbk-draft.tex.patch
1969-12-31 16:00:00.000000000 -0800
+++ tagcoll2-2.0.11/debian/patches/30-doc--tagbk-draft.tex.patch
2010-05-10 11:56:10.000000000 -0700
@@ -0,0 +1,53 @@
+From b9544ff8e9f4e1e0b5890887c2f3a8e5e20a41ec Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Mon, 10 May 2010 21:39:39 +0300
+Subject: [PATCH] doc/tagbk-draft.tex: fix spelling
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ doc/tagbk-draft.tex | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/tagbk-draft.tex b/doc/tagbk-draft.tex
+index d60368c..980f392 100644
+--- a/doc/tagbk-draft.tex
++++ b/doc/tagbk-draft.tex
+@@ -91,7 +91,7 @@ To do this, they usually navigate their collection until
they find the
+ required item. Furnas, in \cite{evn}, describes four properties that can
allow an
+ information structure to be effectively view navigable, that is, like in the
+ case with the current ways to move in a collection, to navigate selecting
+-informations in the current view of the structure.
++information in the current view of the structure.
+
+ The four properties are:
+ \begin{description}
+@@ -143,7 +143,7 @@ half showing the matching items.
+ \section{Deploying the alternative approach}
+
+ While this could be an interesting idea for a specialized application to store
+-bookmarks or similar informations, it could be interested to use the tagging
++bookmarks or similar information, it could be interested to use the tagging
+ method with current software.
+
+ Existing web browsers all use a hierarchical organization. If this hierarchy
+@@ -264,11 +264,11 @@ Effectively View Navigable.
+
+ This is enough to produce a tool to manage bookmarks in a smart way and
+ interact transparently with any given browser, with no need to store
+-informations in external databases.
++information in external databases.
+
+ \section{Future work}
+
+-The generated hierarchy is good to find informations, but it is not likely to
++The generated hierarchy is good to find information, but it is not likely to
+ be suited for maintaining it.
+
+ Maintaining a tagged collection would mean to:
+--
+1.7.0
+
diff -Nru tagcoll2-2.0.11/debian/patches/40-Makefile.in-manpage.patch
tagcoll2-2.0.11/debian/patches/40-Makefile.in-manpage.patch
--- tagcoll2-2.0.11/debian/patches/40-Makefile.in-manpage.patch 1969-12-31
16:00:00.000000000 -0800
+++ tagcoll2-2.0.11/debian/patches/40-Makefile.in-manpage.patch 2010-05-10
21:41:49.000000000 -0700
@@ -0,0 +1,33 @@
+From 5ac0140edaa33cfef85d701be97f87330d390c34 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Mon, 10 May 2010 22:05:15 +0300
+Subject: [PATCH] Makefile.in: Fix manual page spelling
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ Makefile.in | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8532e62..919cdcc 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -742,7 +742,10 @@ uninstall-man: uninstall-man1
+ #tagidx.1
+
+ tagcoll.1: tools/tagcoll $(srcdir)/doc/tagcoll-man-hooks
+- tools/tagcoll --manpage=$(srcdir)/doc/tagcoll-man-hooks > $@ || rm $@
++ tools/tagcoll --manpage=$(srcdir)/doc/tagcoll-man-hooks | \
++ sed -e 's/informations/information/' \
++ -e 's/begining/beginning/' \
++ > $@ || rm $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--
+1.7.0
+
diff -Nru tagcoll2-2.0.11/debian/patches/series
tagcoll2-2.0.11/debian/patches/series
--- tagcoll2-2.0.11/debian/patches/series 1969-12-31 16:00:00.000000000
-0800
+++ tagcoll2-2.0.11/debian/patches/series 2010-05-10 12:32:03.000000000
-0700
@@ -0,0 +1,4 @@
+10-doc--tagcoll-man-hooks.patch
+20-code-spelling.patch
+30-doc--tagbk-draft.tex.patch
+40-Makefile.in-manpage.patch
diff -Nru tagcoll2-2.0.11/debian/source/format
tagcoll2-2.0.11/debian/source/format
--- tagcoll2-2.0.11/debian/source/format 1969-12-31 16:00:00.000000000
-0800
+++ tagcoll2-2.0.11/debian/source/format 2010-05-10 11:03:18.000000000
-0700
@@ -0,0 +1 @@
+3.0 (quilt)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
