summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control15
-rw-r--r--debian/copyright6
-rw-r--r--debian/doc-base10
-rw-r--r--debian/docs3
-rw-r--r--debian/pydist-overrides1
-rw-r--r--debian/watch3
7 files changed, 20 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e26b37..cf9c12f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-django-chimere (2.0.0) unstable; urgency=low
+python-django-chimere (2.0.0-1) unstable; urgency=low
* Initial release (Closes: #699579)
diff --git a/debian/control b/debian/control
index 2dc9e52..0dc442c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: python-django-chimere
Section: python
Priority: optional
Maintainer: Étienne Loks <etienne.loks@peacefrogs.net>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0),
+ python | python-all | python-dev | python-all-dev,
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
Standards-Version: 3.9.3
Homepage: http://pypi.python.org/pypi/chimere
#Vcs-Git: git://git.debian.org/collab-maint/python-django-chimere.git
@@ -33,8 +35,7 @@ Description: collaborative and thematic maps application for Django
layer. This software aims to create online collaborative and thematic
maps. Content (multimedia, text) are associated to basic geographic
items (Point Of Interest, routes). Adds on the map are open to everybody
- with no authentification but are moderated by a team in charge of the
- map.
+ with no authentication but are moderated by a team in charge of the map.
.
Main features:
* Display (by default) of the mapnik OpenStreetMap layer.
@@ -53,11 +54,3 @@ Description: collaborative and thematic maps application for Django
* Configuration of map layers in administration interface.
* Import and export of data from/to various formats: ShapeFile, KML, GeoRSS
(import only), CSV and OpenStreetMap.
-
-Package: python-django-chimere-docs
-Architecture: all
-Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
-Description: python-django-chimere documentation
- This package documents the use and customization of the collaborative and
- thematic maps application for Django Chimère.
diff --git a/debian/copyright b/debian/copyright
index f5939a4..bee08dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ License: MIT or GPL-2
Files: chimere/bsmSelect/*
Copyright: 2008 Ryan Cramer
-Copyright: 2010 Victor Berchet
+ 2010 Victor Berchet
License: MIT or GPL-2
Files: chimere/prettyPhoto/*
@@ -29,7 +29,7 @@ License: GPL-2
Files: chimere/openlayers/*
Copyright: 2006-2012 OpenLayers Contributors
-Licence: BSD-2-clause
+License: BSD-2-clause
License: MIT
Permission is hereby granted, free of charge, to any person obtaining
@@ -86,7 +86,7 @@ License: GPL-3.0+
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-Licence: BSD-2-clause
+License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..b7c033a
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,10 @@
+Document: python-django-chimere
+Title: Chimère
+Author: Étienne Loks
+Abstract: This manual describes how to install and use Chimère a web
+ collaborative and thematic maps.
+Section: Data Management
+
+Format: html
+Index: /usr/share/doc/python-django-chimere/html/index.html
+Files: /usr/share/doc/python-django-chimere/html/*.html
diff --git a/debian/docs b/debian/docs
index 2a00185..e953f2c 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,2 @@
CHANGES.txt
-LICENSE.txt
README.txt
-README.txt
-requirements.txt
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..bc90d3f
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+django_tinymce python-django-tinymce
diff --git a/debian/watch b/debian/watch
index b7ebbec..a67dad8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=3
-
-http://www.peacefrogs.net/download/chimere/chimere-(.*)\.tar\.bz2
+http://pypi.python.org/packages/source/c/chimere-([0-9a-z.]*)\.tar\.gz