[SCM] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302

Francesco Paolo Lovergine frankie at debian.org
Tue Dec 17 09:10:45 UTC 2013


The following commit has been merged in the master branch:
commit 02eec1dd1bec9756694d723e1fffda8da479195d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Dec 17 09:50:06 2013 +0100

    Added back docs/ folder missing.

diff --git a/debian/changelog b/debian/changelog
index 7943bbb..aeaf05d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ libgeotiff-dfsg (1.4.0-1) unstable; urgency=low
   * Added misc-depends to -dev package.
   * Now using dh_ methods to update/restore autotools config.* stuff.
   * Introduced missing recommended build-* targets in debian/rules.
+  * html docs dir is not more distributed in the original tarball,
+    reintroduced as a debian patch (docs).
+  * Annotated all patches.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 16 Dec 2013 16:20:15 +0100
 
diff --git a/debian/geotiff-bin.docs b/debian/geotiff-bin.docs
index 31b6baa..e845566 100644
--- a/debian/geotiff-bin.docs
+++ b/debian/geotiff-bin.docs
@@ -1,3 +1 @@
 README
-docs/geotifcp.html
-docs/listgeo.html
diff --git a/debian/libgeotiff-dev.docs b/debian/libgeotiff-dev.docs
index 38128a1..e845566 100644
--- a/debian/libgeotiff-dev.docs
+++ b/debian/libgeotiff-dev.docs
@@ -1,3 +1 @@
 README
-docs/index.dox
-docs/manual.txt
diff --git a/debian/patches/Makefile.in b/debian/patches/Makefile.in
index 1f87dcf..d89704e 100644
--- a/debian/patches/Makefile.in
+++ b/debian/patches/Makefile.in
@@ -1,3 +1,6 @@
+Description: Drop EPSG data installation
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-12-17
 Index: libgeotiff-dfsg/Makefile.in
 ===================================================================
 --- libgeotiff-dfsg.orig/Makefile.in	2013-12-16 16:38:52.000000000 +0100
diff --git a/debian/patches/docs b/debian/patches/docs
new file mode 100644
index 0000000..a40978e
--- /dev/null
+++ b/debian/patches/docs
@@ -0,0 +1,1893 @@
+Description: Add docs/ folder missing in upstream tarball
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-12-17
+diff -urN libgeotiff-dfsg-1.3.0-new/docs/Doxyfile libgeotiff-dfsg-1.3.0/docs/Doxyfile
+--- libgeotiff-dfsg-1.3.0-new/docs/Doxyfile	1970-01-01 01:00:00.000000000 +0100
++++ libgeotiff-dfsg-1.3.0/docs/Doxyfile	2011-11-08 15:00:53.000000000 +0100
+@@ -0,0 +1,1129 @@
++# Doxyfile 1.4.2
++
++# This file describes the settings to be used by the documentation system
++# doxygen (www.doxygen.org) for a project
++#
++# All text after a hash (#) is considered a comment and will be ignored
++# The format is:
++#       TAG = value [value, ...]
++# For lists items can also be appended using:
++#       TAG += value [value, ...]
++# Values that contain spaces should be placed between quotes (" ")
++
++#---------------------------------------------------------------------------
++# Project related configuration options
++#---------------------------------------------------------------------------
++
++# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
++# by quotes) that should identify the project.
++
++PROJECT_NAME           = $(PROJECT)-$(VERSION)
++
++# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
++# This could be handy for archiving the generated documentation or 
++# if some version control system is used.
++
++PROJECT_NUMBER         = 
++
++# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
++# base path where the generated documentation will be put. 
++# If a relative path is entered, it will be relative to the location 
++# where doxygen was started. If left blank the current directory will be used.
++
++OUTPUT_DIRECTORY       = $(DOCDIR)
++
++# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
++# documentation generated by doxygen is written. Doxygen will use this 
++# information to generate all constant output in the proper language. 
++# The default language is English, other supported languages are: 
++# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
++# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
++# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
++# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
++# Swedish, and Ukrainian.
++
++OUTPUT_LANGUAGE        = English
++
++# This tag can be used to specify the encoding used in the generated output. 
++# The encoding is not always determined by the language that is chosen, 
++# but also whether or not the output is meant for Windows or non-Windows users. 
++# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
++# forces the Windows encoding (this is the default for the Windows binary), 
++# whereas setting the tag to NO uses a Unix-style encoding (the default for 
++# all platforms other than Windows).
++
++USE_WINDOWS_ENCODING   = NO
++
++# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
++# include brief member descriptions after the members that are listed in 
++# the file and class documentation (similar to JavaDoc). 
++# Set to NO to disable this.
++
++BRIEF_MEMBER_DESC      = YES
++
++# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
++# the brief description of a member or function before the detailed description. 
++# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
++# brief descriptions will be completely suppressed.
++
++REPEAT_BRIEF           = YES
++
++# This tag implements a quasi-intelligent brief description abbreviator 
++# that is used to form the text in various listings. Each string 
++# in this list, if found as the leading text of the brief description, will be 
++# stripped from the text and the result after processing the whole list, is 
++# used as the annotated text. Otherwise, the brief description is used as-is. 
++# If left blank, the following values are used ("$name" is automatically 
++# replaced with the name of the entity): "The $name class" "The $name widget" 
++# "The $name file" "is" "provides" "specifies" "contains" 
++# "represents" "a" "an" "the"
++
++ABBREVIATE_BRIEF       = 
++
++# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
++# Doxygen will generate a detailed section even if there is only a brief 
++# description.
++
++ALWAYS_DETAILED_SEC    = NO
++
++# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
++# inherited members of a class in the documentation of that class as if those 
++# members were ordinary class members. Constructors, destructors and assignment 
++# operators of the base classes will not be shown.
++
++INLINE_INHERITED_MEMB  = NO
++
++# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
++# path before files name in the file list and in the header files. If set 
++# to NO the shortest path that makes the file name unique will be used.
++
++FULL_PATH_NAMES        = NO
++
++# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
++# the path mentioned in the documentation of a class, which tells 
++# the reader which header file to include in order to use a class. 
++# If left blank only the name of the header file containing the class 
++# definition is used. Otherwise one should specify the include paths that 
++# are normally passed to the compiler using the -I flag.
++
++STRIP_FROM_INC_PATH    = $(SRCDIR)
++
++# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
++# (but less readable) file names. This can be useful is your file systems 
++# doesn't support long names like on DOS, Mac, or CD-ROM.
++
++SHORT_NAMES            = NO
++
++# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
++# will interpret the first line (until the first dot) of a JavaDoc-style 
++# comment as the brief description. If set to NO, the JavaDoc 
++# comments will behave just like the Qt-style comments (thus requiring an 
++# explicit @brief command for a brief description.
++
++JAVADOC_AUTOBRIEF      = YES
++
++# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
++# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
++# comments) as a brief description. This used to be the default behaviour. 
++# The new default is to treat a multi-line C++ comment block as a detailed 
++# description. Set this tag to YES if you prefer the old behaviour instead.
++
++MULTILINE_CPP_IS_BRIEF = NO
++
++# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
++# will output the detailed description near the top, like JavaDoc.
++# If set to NO, the detailed description appears after the member 
++# documentation.
++
++DETAILS_AT_TOP         = NO
++
++# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
++# member inherits the documentation from any documented member that it 
++# re-implements.
++
++INHERIT_DOCS           = YES
++
++# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
++# tag is set to YES, then doxygen will reuse the documentation of the first 
++# member in the group (if any) for the other members of the group. By default 
++# all members of a group must be documented explicitly.
++
++DISTRIBUTE_GROUP_DOC   = NO
++
++# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
++# Doxygen uses this value to replace tabs by spaces in code fragments.
++
++TAB_SIZE               = 8
++
++# This tag can be used to specify a number of aliases that acts 
++# as commands in the documentation. An alias has the form "name=value". 
++# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
++# put the command \sideeffect (or @sideeffect) in the documentation, which 
++# will result in a user-defined paragraph with heading "Side Effects:". 
++# You can put \n's in the value part of an alias to insert newlines.
++
++ALIASES                = 
++
++# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
++# sources only. Doxygen will then generate output that is more tailored for C. 
++# For instance, some of the names that are used will be different. The list 
++# of all members will be omitted, etc.
++
++OPTIMIZE_OUTPUT_FOR_C  = YES
++
++# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
++# only. Doxygen will then generate output that is more tailored for Java. 
++# For instance, namespaces will be presented as packages, qualified scopes 
++# will look different, etc.
++
++OPTIMIZE_OUTPUT_JAVA   = NO
++
++# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
++# the same type (for instance a group of public functions) to be put as a 
++# subgroup of that type (e.g. under the Public Functions section). Set it to 
++# NO to prevent subgrouping. Alternatively, this can be done per class using 
++# the \nosubgrouping command.
++
++SUBGROUPING            = YES
++
++#---------------------------------------------------------------------------
++# Build related configuration options
++#---------------------------------------------------------------------------
++
++# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
++# documentation are documented, even if no documentation was available. 
++# Private class members and static file members will be hidden unless 
++# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
++
++EXTRACT_ALL            = NO
++
++# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
++# will be included in the documentation.
++
++EXTRACT_PRIVATE        = NO
++
++# If the EXTRACT_STATIC tag is set to YES all static members of a file 
++# will be included in the documentation.
++
++EXTRACT_STATIC         = NO
++
++# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
++# defined locally in source files will be included in the documentation. 
++# If set to NO only classes defined in header files are included.
++
++EXTRACT_LOCAL_CLASSES  = YES
++
++# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
++# undocumented members of documented classes, files or namespaces. 
++# If set to NO (the default) these members will be included in the 
++# various overviews, but no documentation section is generated. 
++# This option has no effect if EXTRACT_ALL is enabled.
++
++HIDE_UNDOC_MEMBERS     = NO
++
++# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
++# undocumented classes that are normally visible in the class hierarchy. 
++# If set to NO (the default) these classes will be included in the various 
++# overviews. This option has no effect if EXTRACT_ALL is enabled.
++
++HIDE_UNDOC_CLASSES     = NO
++
++# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
++# friend (class|struct|union) declarations. 
++# If set to NO (the default) these declarations will be included in the 
++# documentation.
++
++HIDE_FRIEND_COMPOUNDS  = NO
++
++# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
++# documentation blocks found inside the body of a function. 
++# If set to NO (the default) these blocks will be appended to the 
++# function's detailed documentation block.
++
++HIDE_IN_BODY_DOCS      = NO
++
++# The INTERNAL_DOCS tag determines if documentation 
++# that is typed after a \internal command is included. If the tag is set 
++# to NO (the default) then the documentation will be excluded. 
++# Set it to YES to include the internal documentation.
++
++INTERNAL_DOCS          = NO
++
++# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
++# file names in lower-case letters. If set to YES upper-case letters are also 
++# allowed. This is useful if you have classes or files whose names only differ 
++# in case and if your file system supports case sensitive file names. Windows 
++# and Mac users are advised to set this option to NO.
++
++CASE_SENSE_NAMES       = YES
++
++# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
++# will show members with their full class and namespace scopes in the 
++# documentation. If set to YES the scope will be hidden.
++
++HIDE_SCOPE_NAMES       = NO
++
++# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
++# will put a list of the files that are included by a file in the documentation 
++# of that file.
++
++SHOW_INCLUDE_FILES     = YES
++
++# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
++# is inserted in the documentation for inline members.
++
++INLINE_INFO            = YES
++
++# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
++# will sort the (detailed) documentation of file and class members 
++# alphabetically by member name. If set to NO the members will appear in 
++# declaration order.
++
++SORT_MEMBER_DOCS       = YES
++
++# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
++# brief documentation of file, namespace and class members alphabetically 
++# by member name. If set to NO (the default) the members will appear in 
++# declaration order.
++
++SORT_BRIEF_DOCS        = NO
++
++# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
++# sorted by fully-qualified names, including namespaces. If set to 
++# NO (the default), the class list will be sorted only by class name, 
++# not including the namespace part. 
++# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
++# Note: This option applies only to the class list, not to the 
++# alphabetical list.
++
++SORT_BY_SCOPE_NAME     = NO
++
++# The GENERATE_TODOLIST tag can be used to enable (YES) or 
++# disable (NO) the todo list. This list is created by putting \todo 
++# commands in the documentation.
++
++GENERATE_TODOLIST      = YES
++
++# The GENERATE_TESTLIST tag can be used to enable (YES) or 
++# disable (NO) the test list. This list is created by putting \test 
++# commands in the documentation.
++
++GENERATE_TESTLIST      = YES
++
++# The GENERATE_BUGLIST tag can be used to enable (YES) or 
++# disable (NO) the bug list. This list is created by putting \bug 
++# commands in the documentation.
++
++GENERATE_BUGLIST       = YES
++
++# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
++# disable (NO) the deprecated list. This list is created by putting 
++# \deprecated commands in the documentation.
++
++GENERATE_DEPRECATEDLIST= YES
++
++# The ENABLED_SECTIONS tag can be used to enable conditional 
++# documentation sections, marked by \if sectionname ... \endif.
++
++ENABLED_SECTIONS       = 
++
++# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
++# the initial value of a variable or define consists of for it to appear in 
++# the documentation. If the initializer consists of more lines than specified 
++# here it will be hidden. Use a value of 0 to hide initializers completely. 
++# The appearance of the initializer of individual variables and defines in the 
++# documentation can be controlled using \showinitializer or \hideinitializer 
++# command in the documentation regardless of this setting.
++
++MAX_INITIALIZER_LINES  = 30
++
++# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
++# at the bottom of the documentation of classes and structs. If set to YES the 
++# list will mention the files that were used to generate the documentation.
++
++SHOW_USED_FILES        = YES
++
++#---------------------------------------------------------------------------
++# configuration options related to warning and progress messages
++#---------------------------------------------------------------------------
++
++# The QUIET tag can be used to turn on/off the messages that are generated 
++# by doxygen. Possible values are YES and NO. If left blank NO is used.
++
++QUIET                  = NO
++
++# The WARNINGS tag can be used to turn on/off the warning messages that are 
++# generated by doxygen. Possible values are YES and NO. If left blank 
++# NO is used.
++
++WARNINGS               = YES
++
++# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
++# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
++# automatically be disabled.
++
++WARN_IF_UNDOCUMENTED   = YES
++
++# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
++# potential errors in the documentation, such as not documenting some 
++# parameters in a documented function, or documenting parameters that 
++# don't exist or using markup commands wrongly.
++
++WARN_IF_DOC_ERROR      = YES
++
++# The WARN_FORMAT tag determines the format of the warning messages that 
++# doxygen can produce. The string should contain the $file, $line, and $text 
++# tags, which will be replaced by the file and line number from which the 
++# warning originated and the warning text. Optionally the format may contain 
++# $version, which will be replaced by the version of the file (if it could 
++# be obtained via FILE_VERSION_FILTER)
++
++WARN_FORMAT            = "$file:$line: $text"
++
++# The WARN_LOGFILE tag can be used to specify a file to which warning 
++# and error messages should be written. If left blank the output is written 
++# to stderr.
++
++WARN_LOGFILE           = 
++
++#---------------------------------------------------------------------------
++# configuration options related to the input files
++#---------------------------------------------------------------------------
++
++# The INPUT tag can be used to specify the files and/or directories that contain 
++# documented source files. You may enter file names like "myfile.cpp" or 
++# directories like "/usr/src/myproject". Separate the files or directories 
++# with spaces.
++
++INPUT                  = $(SRCDIR)
++
++# If the value of the INPUT tag contains directories, you can use the 
++# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
++# and *.h) to filter out the source-files in the directories. If left 
++# blank the following patterns are tested: 
++# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
++# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
++
++FILE_PATTERNS          = *.h \
++                         *.cpp \
++                         *.c \
++                         *.dox
++
++# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
++# should be searched for input files as well. Possible values are YES and NO. 
++# If left blank NO is used.
++
++RECURSIVE              = YES
++
++# The EXCLUDE tag can be used to specify files and/or directories that should 
++# excluded from the INPUT source files. This way you can easily exclude a 
++# subdirectory from a directory tree whose root is specified with the INPUT tag.
++
++EXCLUDE                = .svn
++
++# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
++# directories that are symbolic links (a Unix filesystem feature) are excluded 
++# from the input.
++
++EXCLUDE_SYMLINKS       = NO
++
++# If the value of the INPUT tag contains directories, you can use the 
++# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
++# certain files from those directories.
++
++EXCLUDE_PATTERNS       = 
++
++# The EXAMPLE_PATH tag can be used to specify one or more files or 
++# directories that contain example code fragments that are included (see 
++# the \include command).
++
++EXAMPLE_PATH           = $(SRCDIR)
++
++# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
++# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
++# and *.h) to filter out the source-files in the directories. If left 
++# blank all files are included.
++
++EXAMPLE_PATTERNS       = 
++
++# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
++# searched for input files to be used with the \include or \dontinclude 
++# commands irrespective of the value of the RECURSIVE tag. 
++# Possible values are YES and NO. If left blank NO is used.
++
++EXAMPLE_RECURSIVE      = NO
++
++# The IMAGE_PATH tag can be used to specify one or more files or 
++# directories that contain image that are included in the documentation (see 
++# the \image command).
++
++IMAGE_PATH             = 
++
++# The INPUT_FILTER tag can be used to specify a program that doxygen should 
++# invoke to filter for each input file. Doxygen will invoke the filter program 
++# by executing (via popen()) the command <filter> <input-file>, where <filter> 
++# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
++# input file. Doxygen will then use the output that the filter program writes 
++# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
++# ignored.
++
++INPUT_FILTER           = 
++
++# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
++# INPUT_FILTER) will be used to filter the input files when producing source 
++# files to browse (i.e. when SOURCE_BROWSER is set to YES).
++
++FILTER_SOURCE_FILES    = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to source browsing
++#---------------------------------------------------------------------------
++
++# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
++# be generated. Documented entities will be cross-referenced with these sources. 
++# Note: To get rid of all source code in the generated output, make sure also 
++# VERBATIM_HEADERS is set to NO.
++
++SOURCE_BROWSER         = NO
++
++# Setting the INLINE_SOURCES tag to YES will include the body 
++# of functions and classes directly in the documentation.
++
++INLINE_SOURCES         = YES
++
++# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
++# doxygen to hide any special comment blocks from generated source code 
++# fragments. Normal C and C++ comments will always remain visible.
++
++STRIP_CODE_COMMENTS    = YES
++
++# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
++# then for each documented function all documented 
++# functions referencing it will be listed.
++
++REFERENCED_BY_RELATION = YES
++
++# If the REFERENCES_RELATION tag is set to YES (the default) 
++# then for each documented function all documented entities 
++# called/used by that function will be listed.
++
++REFERENCES_RELATION    = YES
++
++# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
++# will generate a verbatim copy of the header file for each class for 
++# which an include is specified. Set to NO to disable this.
++
++VERBATIM_HEADERS       = YES
++
++#---------------------------------------------------------------------------
++# configuration options related to the alphabetical class index
++#---------------------------------------------------------------------------
++
++# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
++# of all compounds will be generated. Enable this if the project 
++# contains a lot of classes, structs, unions or interfaces.
++
++ALPHABETICAL_INDEX     = NO
++
++# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
++# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
++# in which this list will be split (can be a number in the range [1..20])
++
++COLS_IN_ALPHA_INDEX    = 5
++
++# In case all classes in a project start with a common prefix, all 
++# classes will be put under the same header in the alphabetical index. 
++# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
++# should be ignored while generating the index headers.
++
++IGNORE_PREFIX          = 
++
++#---------------------------------------------------------------------------
++# configuration options related to the HTML output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
++# generate HTML output.
++
++GENERATE_HTML          = $(GENERATE_HTML)
++
++# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
++# put in front of it. If left blank `html' will be used as the default path.
++
++HTML_OUTPUT            = html
++
++# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
++# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
++# doxygen will generate files with .html extension.
++
++HTML_FILE_EXTENSION    = .html
++
++# The HTML_HEADER tag can be used to specify a personal HTML header for 
++# each generated HTML page. If it is left blank doxygen will generate a 
++# standard header.
++
++HTML_HEADER            = 
++
++# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
++# each generated HTML page. If it is left blank doxygen will generate a 
++# standard footer.
++
++HTML_FOOTER            = 
++
++# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
++# style sheet that is used by each HTML page. It can be used to 
++# fine-tune the look of the HTML output. If the tag is left blank doxygen 
++# will generate a default style sheet. Note that doxygen will try to copy 
++# the style sheet file to the HTML output directory, so don't put your own 
++# stylesheet in the HTML output directory as well, or it will be erased!
++
++HTML_STYLESHEET        = 
++
++# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
++# files or namespaces will be aligned in HTML using tables. If set to 
++# NO a bullet list will be used.
++
++HTML_ALIGN_MEMBERS     = YES
++
++# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
++# will be generated that can be used as input for tools like the 
++# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
++# of the generated HTML documentation.
++
++GENERATE_HTMLHELP      = $(GENERATE_CHM)
++
++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
++# be used to specify the file name of the resulting .chm file. You 
++# can add a path in front of the file if the result should not be 
++# written to the html output directory.
++
++CHM_FILE               = ../$(PROJECT).chm
++
++# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
++# be used to specify the location (absolute path including file name) of 
++# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
++# the HTML help compiler on the generated index.hhp.
++
++HHC_LOCATION           = $(HHC_PATH)
++
++# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
++# controls if a separate .chi index file is generated (YES) or that 
++# it should be included in the master .chm file (NO).
++
++GENERATE_CHI           = $(GENERATE_CHI)
++
++# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
++# controls whether a binary table of contents is generated (YES) or a 
++# normal table of contents (NO) in the .chm file.
++
++BINARY_TOC             = NO
++
++# The TOC_EXPAND flag can be set to YES to add extra items for group members 
++# to the contents of the HTML help documentation and to the tree view.
++
++TOC_EXPAND             = NO
++
++# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
++# top of each HTML page. The value NO (the default) enables the index and 
++# the value YES disables it.
++
++DISABLE_INDEX          = NO
++
++# This tag can be used to set the number of enum values (range [1..20]) 
++# that doxygen will group on one line in the generated HTML documentation.
++
++ENUM_VALUES_PER_LINE   = 4
++
++# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
++# generated containing a tree-like index structure (just like the one that 
++# is generated for HTML Help). For this to work a browser that supports 
++# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
++# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
++# probably better off using the HTML help feature.
++
++GENERATE_TREEVIEW      = NO
++
++# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
++# used to set the initial width (in pixels) of the frame in which the tree 
++# is shown.
++
++TREEVIEW_WIDTH         = 250
++
++#---------------------------------------------------------------------------
++# configuration options related to the LaTeX output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
++# generate Latex output.
++
++GENERATE_LATEX         = $(GENERATE_LATEX)
++
++# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
++# put in front of it. If left blank `latex' will be used as the default path.
++
++LATEX_OUTPUT           = 
++
++# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
++# invoked. If left blank `latex' will be used as the default command name.
++
++LATEX_CMD_NAME         = latex
++
++# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
++# generate index for LaTeX. If left blank `makeindex' will be used as the 
++# default command name.
++
++MAKEINDEX_CMD_NAME     = makeindex
++
++# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
++# LaTeX documents. This may be useful for small projects and may help to 
++# save some trees in general.
++
++COMPACT_LATEX          = NO
++
++# The PAPER_TYPE tag can be used to set the paper type that is used 
++# by the printer. Possible values are: a4, a4wide, letter, legal and 
++# executive. If left blank a4wide will be used.
++
++PAPER_TYPE             = $(PAPER_SIZE)
++
++# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
++# packages that should be included in the LaTeX output.
++
++EXTRA_PACKAGES         = 
++
++# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
++# the generated latex document. The header should contain everything until 
++# the first chapter. If it is left blank doxygen will generate a 
++# standard header. Notice: only use this tag if you know what you are doing!
++
++LATEX_HEADER           = 
++
++# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
++# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
++# contain links (just like the HTML output) instead of page references 
++# This makes the output suitable for online browsing using a pdf viewer.
++
++PDF_HYPERLINKS         = NO
++
++# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
++# plain latex in the generated Makefile. Set this option to YES to get a 
++# higher quality PDF documentation.
++
++USE_PDFLATEX           = YES
++
++# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
++# command to the generated LaTeX files. This will instruct LaTeX to keep 
++# running if errors occur, instead of asking the user for help. 
++# This option is also used when generating formulas in HTML.
++
++LATEX_BATCHMODE        = YES
++
++# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
++# include the index chapters (such as File Index, Compound Index, etc.) 
++# in the output.
++
++LATEX_HIDE_INDICES     = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the RTF output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
++# The RTF output is optimized for Word 97 and may not look very pretty with 
++# other RTF readers or editors.
++
++GENERATE_RTF           = $(GENERATE_RTF)
++
++# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
++# put in front of it. If left blank `rtf' will be used as the default path.
++
++RTF_OUTPUT             = rtf
++
++# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
++# RTF documents. This may be useful for small projects and may help to 
++# save some trees in general.
++
++COMPACT_RTF            = NO
++
++# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
++# will contain hyperlink fields. The RTF file will 
++# contain links (just like the HTML output) instead of page references. 
++# This makes the output suitable for online browsing using WORD or other 
++# programs which support those fields. 
++# Note: wordpad (write) and others do not support links.
++
++RTF_HYPERLINKS         = NO
++
++# Load stylesheet definitions from file. Syntax is similar to doxygen's 
++# config file, i.e. a series of assignments. You only have to provide 
++# replacements, missing definitions are set to their default value.
++
++RTF_STYLESHEET_FILE    = 
++
++# Set optional variables used in the generation of an rtf document. 
++# Syntax is similar to doxygen's config file.
++
++RTF_EXTENSIONS_FILE    = 
++
++#---------------------------------------------------------------------------
++# configuration options related to the man page output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
++# generate man pages
++
++GENERATE_MAN           = $(GENERATE_MAN)
++
++# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
++# put in front of it. If left blank `man' will be used as the default path.
++
++MAN_OUTPUT             = man
++
++# The MAN_EXTENSION tag determines the extension that is added to 
++# the generated man pages (default is the subroutine's section .3)
++
++MAN_EXTENSION          = .1
++
++# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
++# then it will generate one additional man file for each entity 
++# documented in the real man page(s). These additional files 
++# only source the real man page, but without them the man command 
++# would be unable to find the correct page. The default is NO.
++
++MAN_LINKS              = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the XML output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_XML tag is set to YES Doxygen will 
++# generate an XML file that captures the structure of 
++# the code including all documentation.
++
++GENERATE_XML           = $(GENERATE_XML)
++
++# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
++# put in front of it. If left blank `xml' will be used as the default path.
++
++XML_OUTPUT             = xml
++
++# The XML_SCHEMA tag can be used to specify an XML schema, 
++# which can be used by a validating XML parser to check the 
++# syntax of the XML files.
++
++XML_SCHEMA             = 
++
++# The XML_DTD tag can be used to specify an XML DTD, 
++# which can be used by a validating XML parser to check the 
++# syntax of the XML files.
++
++XML_DTD                = 
++
++# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
++# dump the program listings (including syntax highlighting 
++# and cross-referencing information) to the XML output. Note that 
++# enabling this will significantly increase the size of the XML output.
++
++XML_PROGRAMLISTING     = YES
++
++#---------------------------------------------------------------------------
++# configuration options for the AutoGen Definitions output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
++# generate an AutoGen Definitions (see autogen.sf.net) file 
++# that captures the structure of the code including all 
++# documentation. Note that this feature is still experimental 
++# and incomplete at the moment.
++
++GENERATE_AUTOGEN_DEF   = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the Perl module output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
++# generate a Perl module file that captures the structure of 
++# the code including all documentation. Note that this 
++# feature is still experimental and incomplete at the 
++# moment.
++
++GENERATE_PERLMOD       = NO
++
++# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
++# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
++# to generate PDF and DVI output from the Perl module output.
++
++PERLMOD_LATEX          = NO
++
++# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
++# nicely formatted so it can be parsed by a human reader.  This is useful 
++# if you want to understand what is going on.  On the other hand, if this 
++# tag is set to NO the size of the Perl module output will be much smaller 
++# and Perl will parse it just the same.
++
++PERLMOD_PRETTY         = YES
++
++# The names of the make variables in the generated doxyrules.make file 
++# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
++# This is useful so different doxyrules.make files included by the same 
++# Makefile don't overwrite each other's variables.
++
++PERLMOD_MAKEVAR_PREFIX = 
++
++#---------------------------------------------------------------------------
++# Configuration options related to the preprocessor   
++#---------------------------------------------------------------------------
++
++# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
++# evaluate all C-preprocessor directives found in the sources and include 
++# files.
++
++ENABLE_PREPROCESSING   = YES
++
++# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
++# names in the source code. If set to NO (the default) only conditional 
++# compilation will be performed. Macro expansion can be done in a controlled 
++# way by setting EXPAND_ONLY_PREDEF to YES.
++
++MACRO_EXPANSION        = YES
++
++# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
++# then the macro expansion is limited to the macros specified with the 
++# PREDEFINED and EXPAND_AS_PREDEFINED tags.
++
++EXPAND_ONLY_PREDEF     = YES
++
++# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
++# in the INCLUDE_PATH (see below) will be search if a #include is found.
++
++SEARCH_INCLUDES        = YES
++
++# The INCLUDE_PATH tag can be used to specify one or more directories that 
++# contain include files that are not input files but should be processed by 
++# the preprocessor.
++
++INCLUDE_PATH           = 
++
++# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
++# patterns (like *.h and *.hpp) to filter out the header-files in the 
++# directories. If left blank, the patterns specified with FILE_PATTERNS will 
++# be used.
++
++INCLUDE_FILE_PATTERNS  = 
++
++# The PREDEFINED tag can be used to specify one or more macro names that 
++# are defined before the preprocessor is started (similar to the -D option of 
++# gcc). The argument of the tag is a list of macros of the form: name 
++# or name=definition (no spaces). If the definition and the = are 
++# omitted =1 is assumed. To prevent a macro definition from being 
++# undefined via #undef or recursively expanded use the := operator 
++# instead of the = operator.
++
++PREDEFINED             = 
++# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
++# this tag can be used to specify a list of macro names that should be expanded. 
++# The macro definition that is found in the sources will be used. 
++# Use the PREDEFINED tag if you want to use a different macro definition.
++
++EXPAND_AS_DEFINED      = 
++
++# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
++# doxygen's preprocessor will remove all function-like macros that are alone 
++# on a line, have an all uppercase name, and do not end with a semicolon. Such 
++# function macros are typically used for boiler-plate code, and will confuse 
++# the parser if not removed.
++
++SKIP_FUNCTION_MACROS   = YES
++
++#---------------------------------------------------------------------------
++# Configuration::additions related to external references   
++#---------------------------------------------------------------------------
++
++# The TAGFILES option can be used to specify one or more tagfiles. 
++# Optionally an initial location of the external documentation 
++# can be added for each tagfile. The format of a tag file without 
++# this location is as follows: 
++#   TAGFILES = file1 file2 ... 
++# Adding location for the tag files is done as follows: 
++#   TAGFILES = file1=loc1 "file2 = loc2" ... 
++# where "loc1" and "loc2" can be relative or absolute paths or 
++# URLs. If a location is present for each tag, the installdox tool 
++# does not have to be run to correct the links.
++# Note that each tag file must have a unique name
++# (where the name does NOT include the path)
++# If a tag file is not located in the directory in which doxygen 
++# is run, you must also specify the path to the tagfile here.
++
++TAGFILES               = 
++
++# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
++# a tag file that is based on the input files it reads.
++
++GENERATE_TAGFILE       = $(DOCDIR)/$(PROJECT).tag
++
++# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
++# in the class index. If set to NO only the inherited external classes 
++# will be listed.
++
++ALLEXTERNALS           = NO
++
++# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
++# in the modules index. If set to NO, only the current project's groups will 
++# be listed.
++
++EXTERNAL_GROUPS        = YES
++
++# The PERL_PATH should be the absolute path and name of the perl script 
++# interpreter (i.e. the result of `which perl').
++
++PERL_PATH              = $(PERL_PATH)
++
++#---------------------------------------------------------------------------
++# Configuration options related to the dot tool   
++#---------------------------------------------------------------------------
++
++# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
++# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
++# or super classes. Setting the tag to NO turns the diagrams off. Note that 
++# this option is superseded by the HAVE_DOT option below. This is only a 
++# fallback. It is recommended to install and use dot, since it yields more 
++# powerful graphs.
++
++CLASS_DIAGRAMS         = YES
++
++# If set to YES, the inheritance and collaboration graphs will hide 
++# inheritance and usage relations if the target is undocumented 
++# or is not a class.
++
++HIDE_UNDOC_RELATIONS   = YES
++
++# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
++# available from the path. This tool is part of Graphviz, a graph visualization 
++# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
++# have no effect if this option is set to NO (the default)
++
++HAVE_DOT               = $(HAVE_DOT)
++
++# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
++# will generate a graph for each documented class showing the direct and 
++# indirect inheritance relations. Setting this tag to YES will force the 
++# the CLASS_DIAGRAMS tag to NO.
++
++CLASS_GRAPH            = YES
++
++# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
++# will generate a graph for each documented class showing the direct and 
++# indirect implementation dependencies (inheritance, containment, and 
++# class references variables) of the class with other documented classes.
++
++COLLABORATION_GRAPH    = YES
++
++# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
++# collaboration diagrams in a style similar to the OMG's Unified Modeling 
++# Language.
++
++UML_LOOK               = NO
++
++# If set to YES, the inheritance and collaboration graphs will show the 
++# relations between templates and their instances.
++
++TEMPLATE_RELATIONS     = NO
++
++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
++# tags are set to YES then doxygen will generate a graph for each documented 
++# file showing the direct and indirect include dependencies of the file with 
++# other documented files.
++
++INCLUDE_GRAPH          = YES
++
++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
++# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
++# documented header file showing the documented files that directly or 
++# indirectly include this file.
++
++INCLUDED_BY_GRAPH      = YES
++
++# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
++# generate a call dependency graph for every global function or class method. 
++# Note that enabling this option will significantly increase the time of a run. 
++# So in most cases it will be better to enable call graphs for selected 
++# functions only using the \callgraph command.
++
++CALL_GRAPH             = NO
++
++# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
++# will graphical hierarchy of all classes instead of a textual one.
++
++GRAPHICAL_HIERARCHY    = YES
++
++# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
++# generated by dot. Possible values are png, jpg, or gif
++# If left blank png will be used.
++
++DOT_IMAGE_FORMAT       = png
++
++# The tag DOT_PATH can be used to specify the path where the dot tool can be 
++# found. If left blank, it is assumed the dot tool can be found in the path.
++
++DOT_PATH               = $(DOT_PATH)
++
++# The DOTFILE_DIRS tag can be used to specify one or more directories that 
++# contain dot files that are included in the documentation (see the 
++# \dotfile command).
++
++DOTFILE_DIRS           = 
++
++# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
++# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
++# this value, doxygen will try to truncate the graph, so that it fits within 
++# the specified constraint. Beware that most browsers cannot cope with very 
++# large images.
++
++MAX_DOT_GRAPH_WIDTH    = 1024
++
++# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
++# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
++# this value, doxygen will try to truncate the graph, so that it fits within 
++# the specified constraint. Beware that most browsers cannot cope with very 
++# large images.
++
++MAX_DOT_GRAPH_HEIGHT   = 1024
++
++# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
++# graphs generated by dot. A depth value of 3 means that only nodes reachable 
++# from the root by following a path via at most 3 edges will be shown. Nodes 
++# that lay further from the root node will be omitted. Note that setting this 
++# option to 1 or 2 may greatly reduce the computation time needed for large 
++# code bases. Also note that a graph may be further truncated if the graph's 
++# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
++# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
++# the graph is not depth-constrained.
++
++MAX_DOT_GRAPH_DEPTH    = 0
++
++# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
++# generate a legend page explaining the meaning of the various boxes and 
++# arrows in the dot generated graphs.
++
++GENERATE_LEGEND        = YES
++
++# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
++# remove the intermediate dot files that are used to generate 
++# the various graphs.
++
++DOT_CLEANUP            = YES
++
++#---------------------------------------------------------------------------
++# Configuration::additions related to the search engine   
++#---------------------------------------------------------------------------
++
++# The SEARCHENGINE tag specifies whether or not a search engine should be 
++# used. If set to NO the values of all tags below this one will be ignored.
++
++SEARCHENGINE           = NO
+diff -urN libgeotiff-dfsg-1.3.0-new/docs/geotifcp.html libgeotiff-dfsg-1.3.0/docs/geotifcp.html
+--- libgeotiff-dfsg-1.3.0-new/docs/geotifcp.html	1970-01-01 01:00:00.000000000 +0100
++++ libgeotiff-dfsg-1.3.0/docs/geotifcp.html	2011-11-08 15:00:53.000000000 +0100
+@@ -0,0 +1,48 @@
++<html>
++<head>
++<title>geotifcp - Copy TIFF, Installing GeoTIFF Metadata</title>
++</head>
++
++<body  BGCOLOR="#FFFFFF">
++
++<h1>geotifcp - Copy TIFF with updated GeoTIFF Metadata</h1>
++
++<pre>
++Syntax:   geotifcp [options] [-e esri_worldfile] [-g metadata] input output
++</pre>
++
++The program geotifcp is identical in function to the LIBTIFF program
++"tiffcp", with the additional feature that if the "-g <metadata>"
++option is used the GeoTIFF information from the file <metadata> 
++will be installed into the output file.  The "-e worldfile" option will 
++override the tiepoint and scale information from the metadata file based
++on the contents of the ESRI worldfile. <p>
++
++If the "-g" option is not used the geotiff information from the source
++file is preserved in the new output file.<p>
++
++"geotifcp" inherits all the other file-transformation capabilities
++of the tiffcp program; for help on the additional parameters give
++the command:<p>
++<pre>
++  %  geotifcp -h
++</pre>
++
++The metadata format is the same as is described in the <a href="listgeo.html">
++listgeo</a> program.  Normally metadata files for use with geotifcp are
++generated from a similar file with listgeo, and then modified by hand
++as required. <p>
++
++<h2>See Also:</h2>
++
++<ol> 
++<li>
++<a href="listgeo.html">listgeo</a> - Dump GeoTIFF Metadata<p>
++
++<li>
++<a href="http://www.remotesensing.org/geotiff/geotiff.html">
++http://www.remotesensing.org/geotiff/geotiff.html</a> - GeoTIFF/libgeotiff Home Page<p>
++
++</ol>
++</body>
++</html>
+diff -urN libgeotiff-dfsg-1.3.0-new/docs/index.dox libgeotiff-dfsg-1.3.0/docs/index.dox
+--- libgeotiff-dfsg-1.3.0-new/docs/index.dox	1970-01-01 01:00:00.000000000 +0100
++++ libgeotiff-dfsg-1.3.0/docs/index.dox	2011-11-08 15:00:53.000000000 +0100
+@@ -0,0 +1,67 @@
++/*! \page index
++
++<center><title>
++LIBGEOTIFF
++</title></center>
++
++<h2>Functions</h2>
++
++<ul>
++<li> GTIFFree(): Free GeoTIFF access handle.
++<li> GTIFGetDefn(): Read and Normalize GeoTIFF Definition.
++<li> GTIFKeyGet(): Read GeoTIFF GeoKey.
++<li> GTIFKeySet(): Write GeoTIFF GeoKey.
++<li> GTIFNew(): Create GeoTIFF access handle.
++<li> GTIFWriteKeys(): Flush GeoTIFF Keys.
++<li> SetCSVFilenameHook(): Override CSV File Searching.
++<li> XTIFFClose(): Close GeoTIFF file.
++<li> XTIFFOpen(): Open GeoTIFF file.
++</ul>
++
++<h2>General Notes</h2>
++
++The libgeotiff library should compile cleanly with most ANSI-C or 
++ANSI C++ compilers.  All headers have appropriate <b>extern "C" {}</b>
++protection to ensure that entry points retain C linkage even if compiled
++with a C++ compiler. <p>
++
++<h2>Source Tree</h2>
++
++The <a href="http://www.remotesensing.org/cgi-bin/cvsweb.cgi/osrs/geotiff">
++current CVS tree</a> is available on the web.  The source can be 
++downloaded anonymously using the <tt>cvs checkout osrs/geotiff/libgeotiff</tt>
++command after logging in using the instructions on the remotesensing.org
++<a href="/docs/howto-cvs.php3">CVS howto page</a>.<p>
++
++<h2>Include Files</h2>
++
++<ul>
++<li> xtiffio.h: the primary interface header file for all TIFF
++routines, using the extended GeoTIFF tags.<p>
++
++<li> geotiffio.h: the primary interface header file for all GTIF 
++routines, keys and code values.<p>
++
++<li> geotiff.h: an interface header file for all GTIF 
++routines, if code values are not required.<p>
++
++<li> geokeys.h:   defines all valid GEOTIFF GeoKeys.<p>
++
++<li> geo_normalize.h: Defined all functions and structures related
++to normalization of GeoTIFF information based on CSV files.<p>
++
++</ul>
++
++<h2>Licensing</h2>
++
++All the source code in this toolkit are either in the public domain, or under 
++an X style license.  In any event it is all considered to be free to use
++for any purpose (including commercial software).  No credit is required 
++though some of the code requires that the specific source code modules 
++retain their existing copyright statements.  The CSV files, and other tables
++derived from the EPSG coordinate system database are also free for commercial
++and non-commercial use.  In particular, no part of this code is 
++<i>copyleft</i>, nor does it imply any requirement for users to disclose
++this or their own source code.<p>
++
++*/
+diff -urN libgeotiff-dfsg-1.3.0-new/docs/listgeo.html libgeotiff-dfsg-1.3.0/docs/listgeo.html
+--- libgeotiff-dfsg-1.3.0-new/docs/listgeo.html	1970-01-01 01:00:00.000000000 +0100
++++ libgeotiff-dfsg-1.3.0/docs/listgeo.html	2011-11-08 15:00:53.000000000 +0100
+@@ -0,0 +1,170 @@
++<html>
++<head>
++<title>listgeo - Dump GeoTIFF Metadata</title>
++</head>
++
++<body  BGCOLOR="#FFFFFF">
++
++<h1>listgeo - Dump GeoTIFF Metadata</h1>
++
++<pre><b>
++Usage: listgeo [-tfw] [-no_norm] [-proj4] [-t tabledir] inputfile
++</b></pre>
++
++The program listgeo takes a GeoTIFF file as input and dumps to
++the standard output a GeoTIFF "metadata" file, which is human
++readable, and may also be used as input to other programs which
++use the "GTIFImport" routine, such as <a href="geotiff.html">geotifcp</a>.<p>
++
++The <b>-tfw</b> flag may be passed to force generation of an ESRI style .tfw
++file as well as the metadata file.  The ESRI world file is always given
++the same basename as the input file, with the extension .tfw.  If one 
++exists already it will be overwritten.<p>
++
++The <b>-no_norm</b> flag will supress reporting of normalized parameters, and
++reporting of corner points. <p>
++
++The <b>-proj4</b> flag forces listgeo to report the PROJ.4 projection
++string it uses for reprojecting corners to lat/long.<p>
++
++The <b>-t tabledir</b> flag overrides the programs concept of how to file the
++EPSG CSV files, causing it to look in directory "tabledir".  <p>
++
++<h2>GeoTIFF Metadata Format</h2>
++
++For the formalist junkies, we will define a GeoTIFF metadata format
++in an unambiguous fashion, and follow that by a concrete example.<p>
++
++The metadata format is defined as follows (all strings not placed
++between <braces> are string literals, case-sensitive, and any entry
++followed by "*" or "*<number>" indicates multiple entries):<p>
++
++<pre>
++<Geotiff_Metadata> = <Geotiff_Header> + <GeoTIFF_Body> + <GeoTIFF_Trailer>
++
++   <Geotiff_Header> = <White_Space> + Geotiff_Information: + <Return>
++   <GeoTIFF_Trailer> = <White_Space> + End_Of_Geotiff. + <Return>
++   <GeoTIFF_Body> = <GeoTIFF_Info> + <GeoTIFF_Tags> + <GeoTIFF_Keys>
++      <GeoTIFF_Info> = <GeoTIFF_Version> + <GeoTIFF_Revision>
++         <GeoTIFF_Version> = Version: + <Single_Space> + <Version> + <Return>
++            <Version> = <Integer>
++         <GeoTIFF_Revision> = Revision: + 
++               <Single_Space> + <Major_Rev> + <Period> + <Minor_Rev> + <Return>
++               <Major_Rev> = <Integer>
++               <Minor_Rev> = <Integer>
++      <GeoTIFF_Tags> =  <Tag_Header> + <Tag_Entry>* + <Tag_Trailer>
++         <Tag_Header> = <White_Space> + Tagged_Information: + <Return>
++         <Tag_Trailer> = <White_Space> + End_Of_Tags. + <Return>
++         <Tag_Entry> = <Tag_Entry_Header> + <Tag_Entry_Row>*
++            <Tag_Entry_Header> = <White_Space> + 
++                     <Tag_Name> + <Tag_Dimension> + <Colon> + <Return>
++               <Tag_Dimension>  = "(" + <NRows> + <Comma> + <NCols> + ")"
++		 	      <NRows> = <Integer>
++		 	      <NCols> = <Integer>
++            <Tag_Entry_Row> = <White_Space> + <Double_Float>*<NCols> + <Return>
++      <GeoTIFF_Keys> =  <Key_Header> + <Key_Entry>* + <Key_Trailer>
++         <Key_Header> = <White_Space> + Keyed_Information: + <Return>
++         <Key_Trailer> = <White_Space> + End_Of_Keys. + <Return>
++         <Key_Entry> = <Key_Entry_Header> + <Key_Entry_Value>
++            <Key_Entry_Header> = <White_Space> + 
++                     <Key_Name> + <Key_Dimension> + <Colon> + <Return>
++              <Key_Dimension> = "(" + <Key_Format> + <Comma> + <Key_Count> + ")"
++            <Key_Entry_Value> = (<Key_Value> | <Numeric_Value> | <Ascii_Value>)
++               <Numeric_Value> = (<Integer> | <Double_Float>)
++               <Ascii_Value> = <Double_Quote> + <String> + <Double_Quote>
++
++   <Tag_Name> = All symbolic tag names defined in GeoTIFF spec.
++   <Key_Name> = All symbolic key names defined in GeoTIFF spec.
++   <Key_Value> = All symbolic value names defined in GeoTIFF spec.
++   <Key_Format> = (Short | Ascii | Double)
++</pre>
++   
++And for the pedantic:
++<pre>
++   <White_Space> = (<Single_Space> | <Tab>)*
++   <Double_Float> = <Mantissa><Exponent>
++   <Mantissa> = <Sign><Integer><Period><Integer>
++   <Exponent> = ( |e<Sign><Integer>)
++   <Sign> = ( |+|-)
++   <Integer> = (0|1|2|3|4|5|6|7|8|9)*
++   ...
++</pre>
++
++Following the formal metadata report, there is an optional (use -no_norm 
++to supress) report on the <i>normalized</i> projection parameters for the
++file.  This is an attempt to lookup PCS and GCS definitions to get detailed
++datum, ellipsoid, and projection definitions for the file.  In general it
++requires access to the EPSG CSV files to work properly.  The GEOTIFF_CSV 
++environment variable can be used to point to directory containing the EPSG
++CSV files (normally distributed with libgeotiff, or this executable).  If
++GEOTIFF_CSV is not defined listgeo will look for a csv subdirectory, or
++the /usr/local/shared/epsg_csv directory.  The -t commandline switch can
++also be used to indicate where the CSV files are located.<p>
++
++Following the normalized projection information listgeo will report the
++positions of the four corner coordinates, and if possible their lat/long
++equivelents.  The corner coordinates are reported for tiepoint+scale and
++transformation matrix formulations of GeoTIFF files, but not for multiple
++tiepoint formulations.  The lat/long coordinates are only available if 
++listgeo is compiled with PROJ.4, if the projection definition can be 
++normalized, and if it is a projection supported by the listgeo PROJ.4 
++binding.<p>
++
++Example (default output of listgeo):<p>
++
++<pre>
++Geotiff_Information:
++   Version: 1
++   Key_Revision: 1.0
++   Tagged_Information:
++      ModelTiepointTag (2,3):
++         0                0                0                
++         440720           3751320          0                
++      ModelPixelScaleTag (1,3):
++         60               60               0                
++      End_Of_Tags.
++   Keyed_Information:
++      GTModelTypeGeoKey (Short,1): ModelTypeProjected
++      GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
++      GTCitationGeoKey (Ascii,17): "UTM    11 S E000"
++      GeogLinearUnitsGeoKey (Short,1): Linear_Meter
++      GeogAngularUnitsGeoKey (Short,1): Angular_Degree
++      ProjectedCSTypeGeoKey (Short,1): PCS_NAD27_UTM_zone_11N
++      End_Of_Keys.
++   End_Of_Geotiff.
++
++PCS = 26711 (NAD27 / UTM zone 11N)
++Projection = 16011 (UTM zone 11N)
++Projection Method: CT_TransverseMercator
++   ProjNatOriginLatGeoKey: 0.000000 (  0d 0' 0.00"N)
++   ProjNatOriginLongGeoKey: -117.000000 (117d 0' 0.00"W)
++   ProjScaleAtNatOriginGeoKey: 0.999600
++   ProjFalseEastingGeoKey: 500000.000000
++   ProjFalseNorthingGeoKey: 0.000000
++GCS: 4267/NAD27
++Datum: 6267/North American Datum 1927
++Ellipsoid: 7008/Clarke 1866 (6378206.40,6356583.80)
++Prime Meridian: 8901/Greenwich (0.000000/  0d 0' 0.00"E)
++Projection Linear Units: 9001/metre (1.000000m)
++
++Corner Coordinates:
++Upper Left    ( 440720.000,3751320.000)  (117d38'28.21"W, 33d54' 8.47"N)
++Lower Left    ( 440720.000,3720600.000)  (117d38'20.79"W, 33d37'31.04"N)
++Upper Right   ( 471440.000,3751320.000)  (117d18'32.07"W, 33d54'13.08"N)
++Lower Right   ( 471440.000,3720600.000)  (117d18'28.50"W, 33d37'35.61"N)
++Center        ( 456080.000,3735960.000)  (117d28'27.39"W, 33d45'52.46"N)
++</pre>
++
++<h2>See Also:</h2>
++
++<ol> 
++<li>
++<a href="geotifcp.html">geotiffcp</a> - Copy TIFF installing GeoTIFF 
++metadata.<p>
++<li>
++<a href="http://www.remotesensing.org/geotiff/geotiff.html">
++http://www.remotesensing.org/geotiff/geotiff.html</a> - GeoTIFF/libgeotiff Home Page<p>
++
++</ol>
++</body>
++</html>
+diff -urN libgeotiff-dfsg-1.3.0-new/docs/manual.txt libgeotiff-dfsg-1.3.0/docs/manual.txt
+--- libgeotiff-dfsg-1.3.0-new/docs/manual.txt	1970-01-01 01:00:00.000000000 +0100
++++ libgeotiff-dfsg-1.3.0/docs/manual.txt	2011-11-08 15:00:53.000000000 +0100
+@@ -0,0 +1,456 @@
++-------------------------------------------------------------
++
++          Manual for Libgeotiff Library and Utilities
++
++-------------------------------------------------------------
++
++Documentation Author: Niles Ritter
++Last Modified: 31 Jul 95
++  
++See: http://www.remotesensing.org/geotiff/api/index.html 
++  for up to date API documentation
++  
++-------------------------------------------------------------
++Contents:
++
++  1. The LibGeoTIFF library
++  
++     1.1 Preliminaries
++     1.2 Calling Sequences
++	 1.3 Examples
++
++  2. The LibGeoTIFF Utilities
++  
++     2.1 listgeo   - dump a GeoTIFF metadata file
++	 2.2 geotifcp  - install GeoTIFF from metadata
++
++-------------------------------------------------------------
++1. The LibGeoTIFF library
++
++-------------------------------------------------------------
++1.1 Preliminaries
++
++-------------------
++1.1.1 Compliance:
++
++    ANSI-C:  The GeoTIFF library is fully ANSI compliant and
++	   should compile under any ANSI compiler. It is not guaranteed
++	   to compile under K&R compilers.
++	
++	C++:   All headers have the appropriate C++ bindings permitting
++	   the correct linkage to C++ routines.
++	   
++-------------------
++1.1.2 Interfaces:
++
++	xtiffio.h: the primary interface header file for all TIFF
++				routines, using the extended GeoTIFF tags.
++				
++	geotiffio.h: the primary interface header file for all GTIF 
++				 routines, keys and code values.
++
++	geotiff.h:  an interface header file for all GTIF 
++				 routines, if code values are not required.
++
++	geokeys.h:   defines all valid GEOTIFF GeoKeys.
++	
++-------------------
++1.1.3 Defined macros:
++
++  All of the tag, key and key-value symbolic names in the GeoTIFF spec are
++  supported and defined by the inclusion of "geotiffio.h". In addition,
++  the following useful values are defined:
++  
++	GvCurrentVersion:  The current GeoTIFF Directory version. Should always be 1.
++	GvCurrentRevision: The current GeoTIFF Key Revision.
++	GvCurrentMinorRev: The current GeoTIFF Key-Value (minor) Revision.
++	
++	KvUndefined:      The universal Key value for "undefined" items.
++	KvUserDefined:    The universal Key value for "user-defined" items.
++
++	
++-------------------
++1.1.4 Defined Types:  
++
++	TIFF             the type of a TIFF file descriptor (if LIBTIFF is used).
++	GTIF             the type of a GeoTIFF file descriptor.
++	GTIFPrintMethod  the type of a print method passed to GTIFPrint().
++	GTIFReadMethod   the type of a read method passed to GTIFImport().
++	geokey_t         the type of a GeoTIFF key variable.
++	tagtype_t        the type of a TIFF tag variable, such as TYPE_DOUBLE.
++
++
++-------------------
++1.1.5 Key and Code Databases:
++
++	All geokeys are defined and named in the database file
++	"geokeys.inc", which in turn is included in "geokeys.h"
++	and several other files. The symbolic enumerated names are identical
++	to those used in the Appendix of the GeoTIFF spec.
++	
++	The geokey code values are stored in the other database files
++	having the ".inc" suffix, which in turn are all referenced by
++	the file "geovalues.h". The ones with names beginning with
++	"epsg_" are codes registered in the EPSG/POSC tables, while
++	those beginning with "geo_" are specific to GeoTIFF.
++	
++
++-------------------------------------------------------------
++1.2 Calling Sequences
++
++-------------------
++1.2.1 TIFF-level interface
++
++
++1.2.1.1  GTIFNew  -- Set up a new GeoTIFF file Descriptor
++	GTIF*     GTIFNew(void *tif);
++
++GTIFNew() takes an existing TIFF file descriptor and creates
++a GTIF GeoTIFF file-I/O object for reading and writing
++GeoTIFF keys and values. The TIFF file must currently be open,
++though it may be either read or write mode.
++
++
++1.2.1.2 GTIFFree
++	void      GTIFFree(GTIF *gtif);
++
++Destroys the GeoTIFF file descriptor following reading or writing
++the keys.
++
++
++1.2.1.3 GTIFWriteKeys
++	int       GTIFWriteKeys(GTIF *gtif);
++
++This routine must be called for a new GeoTIFF file after all of 
++the desired Keys are defined and set with GTIFSetKey(). This does
++not explicitly write anything out to the file, but it does call
++the TIFF-level routines to install the TIFF tag values, which
++in turn are written to the file when the TIFF file descriptor
++is closed. A GeoTIFF file cannot be opened for updating; only
++pure read or write is supported.
++
++
++1.2.1.4 GTIFDirectoryInfo
++	void      GTIFDirectoryInfo(GTIF *gtif, int *versions, int *keycount);
++
++Returns header information about the GeoTIFF file directory. The <versions>
++is an array of 3 integers, giving the GeoTIFF Version, followed by
++the major and minor revisions. The <keycount> argument returns the number
++of keys currently defined in this file. 
++
++-------------------
++1.2.2 GeoKey Access 
++
++
++1.2.2.1 GTIFKeyInfo
++	int       GTIFKeyInfo(GTIF *gtif, geokey_t key, int *size, tagtype_t* type);
++
++Returns the number of values defined for key <key> if currently defined in the file, and 
++returns in <size> the size of individual key values, and the <type>. If the
++key is not defined, 0 is returned. You may pass in NULL pointers to any parameters
++you do not need (such as the type).
++
++
++1.2.2.1 GTIFKeyGet
++	int       GTIFKeyGet(GTIF *gtif, geokey_t key, void *val, int index, int count);
++
++Accesses the key value(s). If there are multiple values (such as ASCII), they
++may be accessed individually, starting at <index> and returning <count> values.
++The total number of values accessed is returned. Note: unline TIFFGetField() 
++memory is not allocated for multiple-value arrays such as ASCII. To get the
++length of an array call GTIFKeyInfo first, which returns the size and count
++of the data.  If the values are key-codes they should be declared of type
++"geocode_t", which is unsigned SHORT.
++
++
++1.2.2.1 GTIFKeySet
++	int       GTIFKeySet(GTIF *gtif, geokey_t keyID, tagtype_t type, int count,...);
++
++Defines and sets the specified key values. Note that this does not install the
++tag-level information in the file; to do that you must call GTIFWriteKeys().
++For single-valued non-ASCII keys (which are most of them), you must pass the
++values in by value not reference. You must use the correct type for the
++values: doubles for floating point, strings for ASCII, and "geocode_t" for
++SHORT codes (the symbolic names may be used in most cases).
++
++
++1.2.3 Metadata Import-Export utilities 
++
++	void      GTIFPrint(GTIF *gtif, GTIFPrintMethod print, void *fd);
++	int       GTIFImport(GTIF *gtif, GTIFReadMethod scan, void *fd);
++	
++	char*     GTIFKeyName(geokey_t key);
++	char*     GTIFValueName(geokey_t key,int value);
++	char*     GTIFTypeName(tagtype_t type);
++	char*     GTIFTagName(int tag);
++	int       GTIFKeyCode(char * key);
++	int       GTIFValueCode(geokey_t key,char *value);
++	int       GTIFTypeCode(char *type);
++	int       GTIFTagCode(char *tag);
++
++The GTIFPrint() routine dumps a GeoTIFF metadata stream out to
++a specified file <fd>, either for human interpretation or for
++input to another program. If <fd> is NULL the data is written
++to the standard output.  
++
++The GTIFImport() routine performs the inverse; given a metadata file
++specified by <fd> (or stdin if <fd> is NULL) install the corresponding
++tags and keys into the current GeoTIFF file. Note that the 
++import routine only calls GTIFKeySet(), and so it is up to the
++client program to call GTIFWriteKey() in order to explicitly
++write the keys out to the file.
++
++The GTIFxxxName() routines all take a numeric code, key or tag and
++return a pointer to a static string name associated with the value.
++In the case of Key-Values, the key must be explicitly defined in
++order to establish the scope of the name-search. A string is always
++returned; however, if the code is not recognized the string is
++of the format "Unknown-%d", where %d is the input code value.
++
++The GTIFxxxCode() routines perform the reverse operation; given
++an ASCII string name it tries to find the corresponding code,
++key or tag numerical value, in a case-sensitive manner. If the
++string is not recognized the value -1 is return (no valid codes
++are negative). For consistency, any strings of the form "Unknown-%d"
++where %d is a decimal integer will return the specified integer. 
++
++Note: be careful when assigning variables to GTIFxxxCode; for example,
++the geokey_t type is unsigned, and so if -1 is returned, this will
++result in a value of 65535. To be safe, always use signed integers
++for the assignment, and pass them on to an unsigned type after
++checking that the value is positive.
++
++
++-------------------------------------------------------------
++1.3 Examples
++
++
++A typical use of LIBGEOTIFF for creating a GeoTIFF file is
++
++	#include "xtiffio.h"  /* for TIFF */
++	#include "geotiffio.h" /* for GeoTIFF */
++	void main()
++	{
++		TIFF *tif=(TIFF*)0;  /* TIFF-level descriptor */
++		GTIF *gtif=(GTIF*)0; /* GeoKey-level descriptor */
++		
++		/* Open TIFF descriptor to write GeoTIFF tags */
++		tif=XTIFFOpen(fname,"w");  
++		if (!tif) goto failure;
++		
++		/* Open GTIF Key parser */
++		gtif = GTIFNew(tif);
++		if (!gtif) goto failure;
++		
++		/* Set up standar TIFF file */
++		TIFFSetField(tif,TIFFTAG_IMAGEWIDTH,    WIDTH);
++		/* set other TIFF tags and write out image ... */
++				
++		/* Set GeoTIFF information */
++		GTIFKeySet(gtif, GTModelTypeGeoKey, TYPE_SHORT, 1, ModelGeographic);
++		/* set other GeoTIFF keys ... */
++		
++		/* Store the keys into the TIFF Tags */
++		GTIFWriteKeys(gtif);
++		
++		/* get rid of the key parser */
++		GTIFFree(gtif);
++		
++		/* save and close the TIFF file descriptor */
++		XTIFFClose(tif);
++		
++		exit (0);
++	failure:
++		exit (-1);
++	}
++
++While a typical use of the code for reading tags is:
++
++	#include "xtiffio.h"  /* for TIFF */
++	#include "geotiffio.h" /* for GeoTIFF */
++	enum {VERSION=0,MAJOR,MINOR};
++	void main()
++	{
++		TIFF *tif=(TIFF*)0;  /* TIFF-level descriptor */
++		GTIF *gtif=(GTIF*)0; /* GeoKey-level descriptor */
++		int versions[3];
++		int cit_length;
++		geocode_t model;    /* all key-codes are of this type */
++		char *citation;
++		
++		/* Open TIFF descriptor to read GeoTIFF tags */
++		tif=XTIFFOpen(fname,"r");  
++		if (!tif) goto failure;
++		
++		/* Open GTIF Key parser; keys will be read at this time. */
++		gtif = GTIFNew(tif);
++		if (!gtif) goto failure;
++
++		/* Get the GeoTIFF directory info */
++		GTIFDirectoryInfo(gtif,versions,0);
++		if (versions[MAJOR] > 1)
++		{
++			printf("this file is too new for me\n"); goto failure;
++		}
++		if (!GTIFKeyGet(gtif, GTModelTypeGeoKey, &model, 0, 1))
++		{
++			printf("Yikes! no Model Type\n") goto failure;
++		}
++		
++		/* ASCII keys are variable-length; compute size */
++		cit_length = GTIFKeyInfo(gtif,GTCitationGeoKey,&size,&type);
++		if (cit_length > 0)
++		{
++			citation = malloc(size*cit_length);
++			if (!citation) goto failure;
++			GTIFKeyGet(gtif, GTCitationGeoKey, citation, 0, cit_length);
++			printf("Citation:%s\n",citation);
++		}
++
++		/* Get some TIFF info on this image */
++		TIFFGetField(tif,TIFFTAG_IMAGEWIDTH,    &width);
++		
++		/* get rid of the key parser */
++		GTIFFree(gtif);
++		
++		/* close the TIFF file descriptor */
++		XTIFFClose(tif);
++		
++		exit (0);
++	failure:
++		exit (-1);
++	}
++
++
++
++-------------------------------------------------------------
++2. The LibGeoTIFF Utilities
++
++-------------------------------------------------------------
++2.1 listgeo   - dump a GeoTIFF metadata file
++
++Syntax:   listgeo [-tfw] [-no_norm] [-t tabledir] inputfile
++
++The program listgeo takes a GeoTIFF file as input and dumps to
++the standard output a GeoTIFF "metadata" file, which is human
++readable, and may also be used as input to other programs which
++use the "GTIFImport" routine, such as geotifcp, below.
++
++The -tfw flag may be passed to force generation of an ESRI style .tfw
++file as well as the metadata file.  
++
++The -no_norm flag will supress reporting of normalized parameters, and
++reporting of corner points. 
++
++The "-t tabledir" flag overrides the programs concept of how to file the
++EPSG CSV files, causing it to look in directory "tabledir". 
++
++------------------------
++GeoTIFF Metadata Format:
++
++For the formalist junkies, we will define a GeoTIFF metadata format
++in an unambiguous fashion, and follow that by a concrete example.
++
++The metadata format is defined as follows (all strings not placed
++between <braces> are string literals, case-sensitive, and any entry
++followed by "*" or "*<number>" indicates multiple entries):
++
++<Geotiff_Metadata> = <Geotiff_Header> + <GeoTIFF_Body> + <GeoTIFF_Trailer>
++
++   <Geotiff_Header> = <White_Space> + Geotiff_Information: + <Return>
++   <GeoTIFF_Trailer> = <White_Space> + End_Of_Geotiff. + <Return>
++   <GeoTIFF_Body> = <GeoTIFF_Info> + <GeoTIFF_Tags> + <GeoTIFF_Keys>
++      <GeoTIFF_Info> = <GeoTIFF_Version> + <GeoTIFF_Revision>
++         <GeoTIFF_Version> = Version: + <Single_Space> + <Version> + <Return>
++            <Version> = <Integer>
++         <GeoTIFF_Revision> = Revision: + 
++               <Single_Space> + <Major_Rev> + <Period> + <Minor_Rev> + <Return>
++               <Major_Rev> = <Integer>
++               <Minor_Rev> = <Integer>
++      <GeoTIFF_Tags> =  <Tag_Header> + <Tag_Entry>* + <Tag_Trailer>
++         <Tag_Header> = <White_Space> + Tagged_Information: + <Return>
++         <Tag_Trailer> = <White_Space> + End_Of_Tags. + <Return>
++         <Tag_Entry> = <Tag_Entry_Header> + <Tag_Entry_Row>*
++            <Tag_Entry_Header> = <White_Space> + 
++                     <Tag_Name> + <Tag_Dimension> + <Colon> + <Return>
++               <Tag_Dimension>  = "(" + <NRows> + <Comma> + <NCols> + ")"
++		 	      <NRows> = <Integer>
++		 	      <NCols> = <Integer>
++            <Tag_Entry_Row> = <White_Space> + <Double_Float>*<NCols> + <Return>
++      <GeoTIFF_Keys> =  <Key_Header> + <Key_Entry>* + <Key_Trailer>
++         <Key_Header> = <White_Space> + Keyed_Information: + <Return>
++         <Key_Trailer> = <White_Space> + End_Of_Keys. + <Return>
++         <Key_Entry> = <Key_Entry_Header> + <Key_Entry_Value>
++            <Key_Entry_Header> = <White_Space> + 
++                     <Key_Name> + <Key_Dimension> + <Colon> + <Return>
++              <Key_Dimension> = "(" + <Key_Format> + <Comma> + <Key_Count> + ")"
++            <Key_Entry_Value> = (<Key_Value> | <Numeric_Value> | <Ascii_Value>)
++               <Numeric_Value> = (<Integer> | <Double_Float>)
++               <Ascii_Value> = <Double_Quote> + <String> + <Double_Quote>
++
++   <Tag_Name> = All symbolic tag names defined in GeoTIFF spec.
++   <Key_Name> = All symbolic key names defined in GeoTIFF spec.
++   <Key_Value> = All symbolic value names defined in GeoTIFF spec.
++   <Key_Format> = (Short | Ascii | Double)
++   
++And for the pedantic:
++   <White_Space> = (<Single_Space> | <Tab>)*
++   <Double_Float> = <Mantissa><Exponent>
++   <Mantissa> = <Sign><Integer><Period><Integer>
++   <Exponent> = ( |e<Sign><Integer>)
++   <Sign> = ( |+|-)
++   <Integer> = (0|1|2|3|4|5|6|7|8|9)*
++   ...
++
++
++Example (default output of listgeo):
++
++Geotiff_Information:
++   Version: 1
++   Key_Revision: 0.2
++   Tagged_Information:
++      ModelTiepointTag (2,3):
++         0                  0                  0
++       130                 32                  0
++      ModelPixelScaleTag (1,3):
++         1                  1                  0
++      End_Of_Tags.
++   Keyed_Information:
++      GTModelTypeGeoKey (Short,1): ModelTypeGeographic
++      GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
++      GTCitationGeoKey (Ascii,16): "Just An Example"
++      GeographicTypeGeoKey (Short,1): User-Defined
++      GeogCitationGeoKey (Ascii,24): "Everest Ellipsoid Used."
++      GeogGeodeticDatumGeoKey (Short,1): User-Defined
++      GeogLinearUnitsGeoKey (Short,1): Linear_Meter
++      GeogAngularUnitsGeoKey (Short,1): Angular_Degree
++      GeogEllipsoidGeoKey (Short,1): Ellipse_Everest_1830_1967_Definition
++      GeogSemiMajorAxisGeoKey (Double,1): 6377298.556
++      GeogInvFlatteningGeoKey (Double,1): 300.8017
++      End_Of_Keys.
++   End_Of_Geotiff.
++   
++   
++-------------------------------------------------------------
++2.2 geotifcp  - Copy a TIFF file and install GeoTIFF info from metadata.
++
++Syntax:   geotifcp [options] [-e esri_worldfile] [-g metadata] input output
++
++The program geotifcp is identical in function to the LIBTIFF program
++"tiffcp", with the additional feature that if the "-g <metadata>"
++option is used the GeoTIFF information from the file <metadata> 
++will be installed into the output file.  The "-e worldfile" option will 
++override the tiepoint and scale information from the metadata file based
++on the contents of the ESRI worldfile. 
++
++If the "-g" option is not used, the opposite effect occurs: all 
++GeoTIFF information is filtered out of the input file before being
++written to the new output file.
++
++"geotifcp" inherits all the other file-transformation capabilities
++of the tiffcp program; for help on the additional parameters give
++the command:
++
++  %  geotifcp -h
++
++-------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index 70845e0..1a602ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Makefile.in
+docs

-- 
The GeoTIFF library



More information about the Pkg-grass-devel mailing list