refresh packaging files (debian + distutils)

debian/changelog

@@ -1,3 +1,15 @@
+python-vimeo (0.4d20100815-1~ppa1) lucid; urgency=low
+
+  * merge with code from mishk (http://github.com/mishk/python-vimeo)
+
+ -- Marc Poulhiès <[email protected]>  Sun, 15 Aug 2010 14:08:02 +0200
+
+python-vimeo (0.3-1~ppa1) karmic; urgency=low
+
+  * new query script + few bugfixes
+
+ -- Marc Poulhiès <[email protected]>  Mon, 08 Feb 2010 22:21:18 +0100
+
 python-vimeo (0.2-1~ppa1) jaunty; urgency=low
 
   * add a simple upload script

debian/control

@@ -2,20 +2,20 @@ Source: python-vimeo
 Section: libs
 Priority: extra
 Maintainer: Marc Poulhiès <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7), python-support, python-all-dev, python-pycurl
+Build-Depends: cdbs, debhelper (>= 7), python-support, python-all-dev
 Standards-Version: 3.8.1
 
 Package: python-vimeo
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.5), python-oauth, python-pycurl
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.6), python-oauth2
 Description: Vimeo API wrapper for Python
  Python-vimeo is a complete and easy to use Python module
  for interacting with the vimeo API.
 
 
 Package: vimeo-tools
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.5), python-vimeo
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.6), python-vimeo
 Description: Tools to interact with vimeo
  Various tools to interact with vimeo.
  .

debian/copyright

@@ -6,10 +6,12 @@ It was downloaded from http://github.com/dkm/python-vimeo
 Upstream Author(s):
 
     Marc Poulhi�s <[email protected]>
+    mishk 
 
 Copyright:
 
     Copyright (C) 2009 Marc Poulhi�s
+    Copyright (C) 2010 Mishk
 
 License:
 
@@ -26,6 +28,27 @@ License:
     You should have received a copy of the GNU General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+    The MIT License
+
+    Copyright (c) 2010
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
 
 The Debian packaging is:
 

setup.py

@@ -32,8 +32,8 @@
     url = "http://github.com/dkm/python-vimeo",
     maintainer = 'Marc Poulhiès',
     maintainer_email = '[email protected]',
-    license = "GPL",
+    license = "GPL,MIT",
     packages = ['vimeo'],
-    scripts=['bin/vimeo-upload.py', 'bin/vimeo-query.py'],
+    scripts=['bin/vimeo-uploadv2.py', 'bin/vimeo-query.py'],
     )