[DebianGIS-dev] [SCM] mapnik-viewer branch, master, updated. upstream/0.0.svn1351-1-ge2176e0
David Paleino
dapal at debian.org
Tue Mar 16 09:30:37 UTC 2010
The following commit has been merged in the master branch:
commit e2176e006fd16a20e79fe973407b2dc5c54d406c
Author: David Paleino <dapal at debian.org>
Date: Tue Mar 16 10:29:55 2010 +0100
First debianization
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..de48cc3
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,6 @@
+mapnik-viewer for Debian
+------------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- David Paleino <d.paleino at gmail.com> Mon, 02 Nov 2009 12:43:22 +0100
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c587d07
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,17 @@
+mapnik-viewer for Debian
+------------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build. Please see:
+
+ /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
+
+
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e8f1766
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mapnik-viewer (0.0~svn1351-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #447622)
+
+ -- David Paleino <d.paleino at gmail.com> Mon, 02 Nov 2009 12:43:22 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..3ab7ffe
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,29 @@
+Source: mapnik-viewer
+Section: utils
+Priority: optional
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Uploaders: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>,
+ David Paleino <dapal at debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50),
+ qt4-qmake,
+ libmapnik-dev,
+ libboost-thread-dev
+Standards-Version: 3.8.4
+Homepage: http://trac.mapnik.org/wiki/MapnikViewer
+
+Package: mapnik-viewer
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: mapnik-utils
+Description: GUI for rendering and viewing maps based on Mapnik mapfiles
+ The Mapnik Viewer is a GUI tool for rendering and viewing maps based
+ on Mapnik XML mapfiles.
+ .
+ It can:
+ - view tile images on-the-fly
+ - debug information on bad config files, points to the erroneous line
+ - shows scale and envelope for current view
+ - fast zooming and point-based attribute queries
+ - export to a variety of formats including tif
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5594237
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,54 @@
+This work was packaged for Debian by:
+
+ David Paleino <d.paleino at gmail.com> on Mon, 02 Nov 2009 12:43:22 +0100
+
+It was downloaded from:
+
+ <url://example.com>
+
+Upstream Author(s):
+
+ <put author's name and email here>
+ <likewise for another author>
+
+Copyright:
+
+ <Copyright (C) YYYY Firtname Lastname>
+ <likewise for another author>
+
+License:
+
+### SELECT: ###
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+### OR ###
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+##########
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is:
+
+ Copyright (C) 2009 David Paleino <d.paleino at gmail.com>
+
+you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex
new file mode 100644
index 0000000..ece176e
--- /dev/null
+++ b/debian/manpage.xml.ex
@@ -0,0 +1,291 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+
+<!--
+
+`xsltproc -''-nonet \
+ -''-param man.charmap.use.subset "0" \
+ -''-param make.year.ranges "1" \
+ -''-param make.single.year.ranges "1" \
+ /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
+ manpage.xml'
+
+A manual page <package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A typical entry
+in a Makefile or Makefile.am is:
+
+DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
+
+manpage.1: manpage.xml
+ $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The XSL files are in
+docbook-xsl. A description of the parameters you can use can be found in the
+docbook-xsl-doc-* packages. Please remember that if you create the nroff
+version in one of the debian/rules file targets (such as build), you will need
+to include xsltproc and docbook-xsl in your Build-Depends control field.
+Alternatively use the xmlto command/package. That will also automatically
+pull in xsltproc and docbook-xsl.
+
+Notes for using docbook2x: docbook2x-man does not automatically create the
+AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as
+<refsect1> ... </refsect1>.
+
+To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections
+read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be
+found in the docbook-xsl-doc-html package.
+
+Validation can be done using: `xmllint -''-noout -''-valid manpage.xml`
+
+General documentation about man-pages and man-page-formatting:
+man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
+
+-->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "FIRSTNAME">
+ <!ENTITY dhsurname "SURNAME">
+ <!-- dhusername could also be set to "&dhfirstname; &dhsurname;". -->
+ <!ENTITY dhusername "David Paleino">
+ <!ENTITY dhemail "d.paleino at gmail.com">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1) and
+ http://www.tldp.org/HOWTO/Man-Page/q2.html. -->
+ <!ENTITY dhsection "SECTION">
+ <!-- TITLE should be something like "User commands" or similar (see
+ http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
+ <!ENTITY dhtitle "mapnik-viewer User Manual">
+ <!ENTITY dhucpackage "MAPNIK-VIEWER">
+ <!ENTITY dhpackage "mapnik-viewer">
+]>
+
+<refentry>
+ <refentryinfo>
+ <title>&dhtitle;</title>
+ <productname>&dhpackage;</productname>
+ <authorgroup>
+ <author>
+ <firstname>&dhfirstname;</firstname>
+ <surname>&dhsurname;</surname>
+ <contrib>Wrote this manpage for the Debian system.</contrib>
+ <address>
+ <email>&dhemail;</email>
+ </address>
+ </author>
+ </authorgroup>
+ <copyright>
+ <year>2007</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ <legalnotice>
+ <para>This manual page was written for the Debian system
+ (and may be used by others).</para>
+ <para>Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License,
+ Version 2 or (at your option) any later version published by
+ the Free Software Foundation.</para>
+ <para>On Debian systems, the complete text of the GNU General Public
+ License can be found in
+ <filename>/usr/share/common-licenses/GPL</filename>.</para>
+ </legalnotice>
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>&dhucpackage;</refentrytitle>
+ <manvolnum>&dhsection;</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+ <refpurpose>program to do something</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+ <!-- These are several examples, how syntaxes could look -->
+ <arg choice="plain"><option>-e <replaceable>this</replaceable></option></arg>
+ <arg choice="opt"><option>--example=<parameter>that</parameter></option></arg>
+ <arg choice="opt">
+ <group choice="req">
+ <arg choice="plain"><option>-e</option></arg>
+ <arg choice="plain"><option>--example</option></arg>
+ </group>
+ <replaceable class="option">this</replaceable>
+ </arg>
+ <arg choice="opt">
+ <group choice="req">
+ <arg choice="plain"><option>-e</option></arg>
+ <arg choice="plain"><option>--example</option></arg>
+ </group>
+ <group choice="req">
+ <arg choice="plain"><replaceable>this</replaceable></arg>
+ <arg choice="plain"><replaceable>that</replaceable></arg>
+ </group>
+ </arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+ <!-- Normally the help and version options make the programs stop
+ right after outputting the requested information. -->
+ <group choice="opt">
+ <arg choice="plain">
+ <group choice="req">
+ <arg choice="plain"><option>-h</option></arg>
+ <arg choice="plain"><option>--help</option></arg>
+ </group>
+ </arg>
+ <arg choice="plain">
+ <group choice="req">
+ <arg choice="plain"><option>-v</option></arg>
+ <arg choice="plain"><option>--version</option></arg>
+ </group>
+ </arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1 id="description">
+ <title>DESCRIPTION</title>
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> and <command>bar</command>
+ commands.</para>
+ <para>This manual page was written for the Debian distribution
+ because the original program does not have a manual page.
+ Instead, it has documentation in the GNU <citerefentry>
+ <refentrytitle>info</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry> format; see below.</para>
+ <para><command>&dhpackage;</command> is a program that...</para>
+ </refsect1>
+ <refsect1 id="options">
+ <title>OPTIONS</title>
+ <para>The program follows the usual GNU command line syntax,
+ with long options starting with two dashes (`-'). A summary of
+ options is included below. For a complete description, see the
+ <citerefentry>
+ <refentrytitle>info</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry> files.</para>
+ <variablelist>
+ <!-- Use the variablelist.term.separator and the
+ variablelist.term.break.after parameters to
+ control the term elements. -->
+ <varlistentry>
+ <term><option>-e <replaceable>this</replaceable></option></term>
+ <term><option>--example=<replaceable>that</replaceable></option></term>
+ <listitem>
+ <para>Does this and that.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-h</option></term>
+ <term><option>--help</option></term>
+ <listitem>
+ <para>Show summary of options.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-v</option></term>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>Show version of program.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1 id="files">
+ <title>FILES</title>
+ <variablelist>
+ <varlistentry>
+ <term><filename>/etc/foo.conf</filename></term>
+ <listitem>
+ <para>The system-wide configuration file to control the
+ behaviour of <application>&dhpackage;</application>. See
+ <citerefentry>
+ <refentrytitle>foo.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry> for further details.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><filename>${HOME}/.foo.conf</filename></term>
+ <listitem>
+ <para>The per-user configuration file to control the
+ behaviour of <application>&dhpackage;</application>. See
+ <citerefentry>
+ <refentrytitle>foo.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry> for further details.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1 id="environment">
+ <title>ENVIONMENT</title>
+ <variablelist>
+ <varlistentry>
+ <term><envar>FOO_CONF</envar></term>
+ <listitem>
+ <para>If used, the defined file is used as configuration
+ file (see also <xref linkend="files"/>).</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1 id="diagnostics">
+ <title>DIAGNOSTICS</title>
+ <para>The following diagnostics may be issued
+ on <filename class="devicefile">stderr</filename>:</para>
+ <variablelist>
+ <varlistentry>
+ <term><errortext>Bad configuration file. Exiting.</errortext></term>
+ <listitem>
+ <para>The configuration file seems to contain a broken configuration
+ line. Use the <option>--verbose</option> option, to get more info.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para><command>&dhpackage;</command> provides some return codes, that can
+ be used in scripts:</para>
+ <segmentedlist>
+ <segtitle>Code</segtitle>
+ <segtitle>Diagnostic</segtitle>
+ <seglistitem>
+ <seg><errorcode>0</errorcode></seg>
+ <seg>Program exited successfully.</seg>
+ </seglistitem>
+ <seglistitem>
+ <seg><errorcode>1</errorcode></seg>
+ <seg>The configuration file seems to be broken.</seg>
+ </seglistitem>
+ </segmentedlist>
+ </refsect1>
+ <refsect1 id="bugs">
+ <!-- Or use this section to tell about upstream BTS. -->
+ <title>BUGS</title>
+ <para>The program is currently limited to only work
+ with the <package>foobar</package> library.</para>
+ <para>The upstreams <acronym>BTS</acronym> can be found
+ at <ulink url="http://bugzilla.foo.tld"/>.</para>
+ </refsect1>
+ <refsect1 id="see_also">
+ <title>SEE ALSO</title>
+ <!-- In alpabetical order. -->
+ <para><citerefentry>
+ <refentrytitle>bar</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>, <citerefentry>
+ <refentrytitle>baz</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>, <citerefentry>
+ <refentrytitle>foo.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry></para>
+ <para>The programs are documented fully by <citetitle>The Rise and
+ Fall of a Fooish Bar</citetitle> available via the <citerefentry>
+ <refentrytitle>info</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry> system.</para>
+ </refsect1>
+</refentry>
+
diff --git a/debian/menu.ex b/debian/menu.ex
new file mode 100644
index 0000000..09bba1f
--- /dev/null
+++ b/debian/menu.ex
@@ -0,0 +1,2 @@
+?package(mapnik-viewer):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+ title="mapnik-viewer" command="/usr/bin/mapnik-viewer"
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
new file mode 100644
index 0000000..98842c4
--- /dev/null
+++ b/debian/patches/00-fix_build.patch
@@ -0,0 +1,34 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix include paths and libraries
+Forwarded: no
+
+---
+ viewer.pro | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+--- mapnik-viewer-0.0~svn1351.orig/viewer.pro
++++ mapnik-viewer-0.0~svn1351/viewer.pro
+@@ -4,15 +4,17 @@
+ CC = g++
+ TEMPLATE = app
+
+-INCLUDEPATH += /opt/mapnik/include
+-INCLUDEPATH += /opt/boost/include/boost-1_39
+-INCLUDEPATH += /usr/X11/include/
+-INCLUDEPATH += /usr/X11/include/freetype2
++INCLUDEPATH += /usr/include/mapnik
++INCLUDEPATH += /usr/include/boost
++INCLUDEPATH += /usr/include/
++INCLUDEPATH += /usr/include/freetype2
+ INCLUDEPATH += .
+
+ #QMAKE_CXXFLAGS +=' -DDARWIN'
+-unix:LIBS = -L/opt/mapnik/lib -L/usr/X11/lib -lmapnik -lfreetype -L/usr/local/lib -licuuc
+-unix:LIBS += -lboost_system-xgcc40-mt -lboost_filesystem-xgcc40-mt -L/opt/boost/lib
++#QMAKE_CXXFLAGS += "-ansi -Wall -ftemplate-depth-100 -DLINUX -DBOOST_SPIRIT_THREADSAFE -DMAPNIK_THREADSAFE -O2 -finline-functions -Wno-inline -DNDEBUG -Wno-missing-field-initializers"
++QMAKE_CXXFLAGS += "-ansi -Wall -ftemplate-depth-100 -DLINUX -DMAPNIK_THREADSAFE -O2 -finline-functions -Wno-inline -DNDEBUG -Wno-missing-field-initializers"
++unix:LIBS = -L/usr/lib/ -lmapnik -lfreetype -licuuc
++unix:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt
+
+ # Input
+
diff --git a/debian/patches/01-fix_mapnik_paths.patch b/debian/patches/01-fix_mapnik_paths.patch
new file mode 100644
index 0000000..6f7bbfd
--- /dev/null
+++ b/debian/patches/01-fix_mapnik_paths.patch
@@ -0,0 +1,24 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix Mapnik paths for Debian installation
+Forwarded: not-needed
+
+---
+ main.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- mapnik-viewer-0.0~svn1351.orig/main.cpp
++++ mapnik-viewer-0.0~svn1351/main.cpp
+@@ -39,10 +39,10 @@ int main( int argc, char **argv )
+ using mapnik::freetype_engine;
+
+ // modify this prefix based on your install location
+- std::string mapnik_dir = "/opt/mapnik";
++ std::string mapnik_dir = "/usr";
+
+- datasource_cache::instance()->register_datasources(mapnik_dir + "/lib/mapnik/input");
+- boost::filesystem::path path(mapnik_dir + "/lib/mapnik/fonts");
++ datasource_cache::instance()->register_datasources(mapnik_dir + "/lib/mapnik/0.7/input");
++ boost::filesystem::path path(mapnik_dir + "/share/fonts/truetype/ttf-dejavu");
+ boost::filesystem::directory_iterator end_itr;
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c35f4cc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+00-fix_build.patch
+01-fix_mapnik_paths.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..6cf1c79
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+#export QMAKECXXFLAGS = -ansi -Wall -ftemplate-depth-100 -DLINUX -DBOOST_SPIRIT_THREADSAFE \
+# -DMAPNIK_THREADSAFE -O2 -finline-functions -Wno-inline -DNDEBUG \
+# -Wno-missing-field-initializers
+
+override_dh_auto_install:
+ install -D -T -m 755 viewer $(CURDIR)/debian/mapnik-viewer/usr/bin/mapnik-viewer
+
+override_dh_auto_build:
+ qmake viewer.pro
+ dh_auto_build -- debug
+
+%:
+ dh $@
--
mapnik-viewer
More information about the Pkg-grass-devel
mailing list