various packaging fixups in debian dir

- clean cruft out of debian dir
- added working watch file
- tweaked control and changelog

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644 (file)
index 424c867..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-python-simplemediawiki for Debian
----------------------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Benjamin Mako Hill <mako@debian.org>  Fri, 11 Feb 2011 00:31:20 -0500

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644 (file)
index 72b09d0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-python-simplemediawiki 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>
-
-
-
-

diff --git a/debian/changelog b/debian/changelog
index 6b7805e5b876ef9a1676458bc730703f3b0f2c9f..b6a01a260787af048080f6b148a84d80459093d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 python-simplemediawiki (1.0.2-1) unstable; urgency=low
 
 python-simplemediawiki (1.0.2-1) unstable; urgency=low
 

-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release. (Closes: #613133)

 
  -- Benjamin Mako Hill <mako@debian.org>  Fri, 11 Feb 2011 00:31:20 -0500
 
  -- Benjamin Mako Hill <mako@debian.org>  Fri, 11 Feb 2011 00:31:20 -0500

diff --git a/debian/control b/debian/control
index ccc95badca4ba359d1a4cdb779798079eefd3850..e6149d13914db10545c107f34e9dcfc4f799e837 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,25 @@
 Source: python-simplemediawiki
 Source: python-simplemediawiki

-Section: unknown
+Section: python

 Priority: extra
 Maintainer: Benjamin Mako Hill <mako@debian.org>
 Priority: extra
 Maintainer: Benjamin Mako Hill <mako@debian.org>

-Build-Depends: cdbs, debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
-Homepage: <insert the upstream URL, if relevant>
+Build-Depends: cdbs, debhelper (>= 7.0.50~), python (>=2.6), python-support
+Standards-Version: 3.9.1
+Homepage: https://github.com/ianweller/python-simplemediawiki

 XS-Python-Version: >= 2.6
 XS-Python-Version: >= 2.6

-#Vcs-Git: git://git.debian.org/collab-maint/python-simplemediawiki.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/python-simplemediawiki.git;a=summary

 
 Package: python-simplemediawiki
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 
 Package: python-simplemediawiki
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}

+Provides: ${python:Provides}

 XB-Python-Version: ${python:Versions}
 XB-Python-Version: ${python:Versions}

-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Description: extremely low-level Python wrapper to the MediaWiki API
+ SimpleMediawiki is an extremely low-level wrapper to the MediaWiki
+ API. It automatically handles cookies and gzip compression so that
+ you can make basic calls to the API in the easiest way possible. It
+ also provides a few functions to make day-to-day API access easier.
+ .
+ To use this module, instantiate a MediaWiki object, passing it the
+ URL of api.php for the wiki you want to work with. Calls go through
+ MediaWiki.call(). A generic login wrapper as well as functions to
+ determine limits and get a list of namespaces are provided for your
+ convenience.

diff --git a/debian/copyright b/debian/copyright
index abf7a200b37e767fdd4d52f951a0d9c7a8c1518c..c23d66532dcee1f40b1094bd57d06a1dfa0ddebf 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,32 @@
 This work was packaged for Debian by:
 
 This work was packaged for Debian by:
 

-    Benjamin Mako Hill <mako@debian.org> on Fri, 11 Feb 2011 00:31:20 -0500
+  Benjamin Mako Hill <mako@debian.org> on Fri, 11 Feb 2011 00:31:20 -0500

 
 It was downloaded from:
 
 
 It was downloaded from:
 

-    <url://example.com>
+  http://pypi.python.org/pypi/simplemediawiki
+  http://github.com/ianweller/python-simplemediawikiOB

 
 

-Upstream Author(s):
+Upstream Author:

 
 

-    <put author's name and email here>
-    <likewise for another author>
+  Ian Weller <ian@ianweller.org>

 
 Copyright:
 
 
 Copyright:
 

-    <Copyright (C) YYYY Firstname Lastname>
-    <likewise for another author>
+  Copyright (C) 2010 Red Hat, Inc.

 
 License:
 
 
 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 library is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free # Software Foundation; either version 2.1 of
+  the License, or (at your option) any later version.

 
 

-    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 program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+  On Debian systems, the complete text of the GNU Lesser General
+  Public License version 2.1 can be found in:
+  "/usr/share/common-licenses/LGPL-2.1".

 
 The Debian packaging is:
 
     Copyright (C) 2011 Benjamin Mako Hill <mako@debian.org>
 
 
 The Debian packaging is:
 
     Copyright (C) 2011 Benjamin Mako Hill <mako@debian.org>
 

-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/docs b/debian/docs
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..7a1b50c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/s/simplemediawiki/simplemediawiki-(.*).tar.gz

diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644 (file)
index bc7f9dd..0000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php python-simplemediawiki-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/python-simplemediawiki-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/python-simplemediawiki-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/python-simplemediawiki/python-simplemediawiki-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html python-simplemediawiki-(.*)\.tar\.gz