The following commit has been merged in the master branch:
commit 03709efb3566929abc65bcd49f89e22304b4cd74
Merge: b5eb260ea7e706a66fef2e49b6f1100e597062ce 
382f5af92f475f7adca7a87a57b69bea88ad5e90
Author: Antonio Valentino <antonio.valent...@tiscali.it>
Date:   Sat Nov 19 10:54:20 2011 +0100

    Merge commit 'upstream/0.6.5'

diff --combined debian/changelog
index 968a136,148c87f..b6ef342
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- gsdview (0.6.4-1) unstable; urgency=low
+ gsdview (0.6.5-1) unstable; urgency=low
  
    * Initial release (Closes: #606884)
  
-  -- Antonio Valentino <antonio.valent...@tiscali.it>  Mon, 03 Jan 2011 
12:33:30 +0100
 - -- Antonio Valentino <a_valent...@users.sf.net>  Sun, 13 Nov 2011 13:32:51 
+0100
++ -- Antonio Valentino <antonio.valent...@tiscali.it>  Sun, 13 Nov 2011 
13:32:51 +0100
diff --combined debian/control
index d0aaa54,98e1f58..2b85553
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,17 +1,20 @@@
  Source: gsdview
  Section: science
  Priority: optional
 -Maintainer: Antonio Valentino <a_valent...@users.sf.net>
 +Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 +Uploaders: Antonio Valentino <antonio.valent...@tiscali.it>
- Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7.0.50~),
-                python-support (>= 0.90), python (>= 2.5),
-                python-sip, python-qt4, python-gdal (>= 1.6.1)
- Standards-Version: 3.9.1
+ Build-Depends: debhelper (>= 8.1), python, python-sphinx (>= 1.0),
+                python-qt4 (>= 4.6), python-gdal (>= 1.6.1), texlive-base-bin
+ Standards-Version: 3.9.2
  Homepage: http://gsdview.sourceforge.net
 +Vcs-Git: git://git.debian.org/git/pkg-grass/gsdview.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-grass/gsdview.git
  
  Package: gsdview
  Architecture: all
- Depends: ${misc:Depends}, ${python:Depends}, python-sip, python-qt4,
-          python-gdal (>= 1.6.1), gdal-bin, libjs-jquery
- Recommends: libproj0
+ Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends},
+          python-qt4 (>= 4.6), python-gdal (>= 1.6.1), gdal-bin
+ Recommends: libproj0, google-earth-stable, www-browser
  Description: Geo-Spatial Data Viewer open source edition
   GSDView open source edition is a lightweight viewer for geo-spatial
   data and products written in Python and Qt4. GSDView is modular and
diff --combined debian/copyright
index f705c34,bbdf8a7..8d8fd74
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,133 -1,27 +1,27 @@@
- This package was debianized by:
- 
-     Antonio Valentino <antonio.valent...@tiscali.it> on Tue, 30 Dec 2008 
10:47:15 +0100
- 
- It was downloaded from:
- 
-     http://sourceforge.net/projects/gsdview
- 
- Upstream Author: Antonio Valentino <a_valent...@users.sf.net>
- 
- Copyright:
- 
-     Copyright (C) 2008-2010 Antonio Valentino
- 
- License:
- 
-     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 can be found in `/usr/share/common-licenses/GPL-2'.
- 
- The Debian packaging is:
- 
-     Copyright (C) 2008-2011, Antonio Valentino <antonio.valent...@tiscali.it>
- 
- and is licensed under the GPL, see above.
- 
- 
- exectools/recipe_440544.py:
- 
-     Copyright (C) 2005-2006 Josiah Carlson
-     License: PSF
- 
- 
- gsdview/images/about.svg,
- gsdview/images/add.svg,
- gsdview/images/arrow.svg,
- gsdview/images/close.svg,
- gsdview/images/edit.svg,
- gsdview/images/go-down.svg,
- gsdview/images/go-up.svg,
- gsdview/images/open.svg,
- gsdview/images/plugin.svg,
- gsdview/images/preferences.svg,
- gsdview/images/quit.svg,
- gsdview/images/remove.svg,
- gsdview/images/zoom-100.svg,
- gsdview/images/zoom-fit.svg,
- gsdview/images/zoom-in.svg,
- gsdview/images/zoom-out.svg,
- gsdview/gdalbackend/images/color.svg,
- gsdview/gdalbackend/images/driver.svg,
- gsdview/gdalbackend/images/dataset.svg,
- gsdview/gdalbackend/images/gcp.svg,
- gsdview/gdalbackend/images/open.svg,
- gsdview/gdalbackend/images/overview.svg,
- gsdview/gdalbackend/images/metadata.svg:
- 
-     gartoon-icon-theme
- 
-     It was downloaded from http://www.zeusbox.org/icon/
- 
-     Upstream Authors: Zeus (zeuss...@yahoo.com)
-                       La Mula Francis {mulafran...@terra.com}
- 
-     Copyright:
- 
-        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; version 2 dated June, 1991.
- 
-        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.
- 
- 
- gsdview/images/info.svg:
- 
-     humanity-icon-theme
- 
-     This package was downloaded from https://launchpad.net/humanity/+download
- 
-     Upstream Author:
-             Daniel Fore <daniel.p.f...@gmail.com>
-             Jonian Guveli <jonian.guv...@gmail.com>
-             K.Vishnoo Charan Reddy <v...@ubuntu.com>.
- 
-     License:
- 
-     The Humanity Icon Theme is licensed under the GPL v2.
- 
-     Parts of the work are based on the Tango icons, which are released under 
the
-     public domain.
- 
- 
- gsdview/gdalbackend/images/GDALLogoColor.svg:
- 
-     Copyright (c) 2000, Frank Warmerdam
- 
-     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.
+ Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+ Upstream-Name: gsdview
+ Source: http://sourceforge.net/projects/gsdview
+ 
+ Files: *
 -Copyright: 2008-2011 Antonio Valentino <antonio.valent...@tiscali.it>
++Copyright: 2008-2011 Antonio Valentino <a_valent...@users.sf.net>
+ License: GPL-2
+ 
+ Files: debian/*
+ Copyright: 2008-2011 Antonio Valentino <antonio.valent...@tiscali.it>
+ License: GPL-2
+ 
+ License: GPL-2
+  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 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".
diff --combined debian/patches/fix-manifest.patch
index 1c41d38,0000000..0989ccd
mode 100644,000000..100644
--- a/debian/patches/fix-manifest.patch
+++ b/debian/patches/fix-manifest.patch
@@@ -1,28 -1,0 +1,30 @@@
 +Remove debian stuff from MANIFEST.in
 +--- a/MANIFEST.in
 ++++ b/MANIFEST.in
- @@ -16,6 +16,7 @@
++@@ -16,6 +16,6 @@
 + recursive-include doc/themes *
 + 
 + include scripts/*.pyw
 +-recursive-include debian *
 ++#recursive-include debian *
- +include debian/gsdview.1
 + recursive-include pkg Makefile *.py *.spec *.patch
 + prune pkg/pyinstaller
 +--- a/gsdview.egg-info/SOURCES.txt
 ++++ b/gsdview.egg-info/SOURCES.txt
- @@ -6,13 +6,7 @@
++@@ -6,16 +6,6 @@
 + run.py
 + setup.cfg
 + setup.py
 +-debian/changelog
 +-debian/compat
 +-debian/control
 +-debian/copyright
-  debian/gsdview.1
++-debian/gsdview.doc-base
++-debian/links
++-debian/menu
 +-debian/rules
++-debian/watch
 +-debian/source/format
 + doc/Makefile
 + doc/make.bat
 + doc/html/.buildinfo
diff --combined debian/patches/series
index e513c62,0000000..63df08e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
 +fix-manifest.patch
- no-setuptools.patch
- open-source-edition.patch

-- 
Geo-Spatial Data Viewer

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to