Merge experimental python3 support (Ross Gammon - Debian packaging)

debian/README.Debian

@@ -1,6 +1,10 @@
 gramps for Debian
------------------
+----------------------
 
-python-webkit is "Suggested" as upstream states it as optional in their README file. According to upstream, webkit needs to be tested for stability for Gramps (it is used in the hidden HTML View). If it is unstable, it may be necessary to revert to gecko (python-gtkmozembed).
+This is the Debian package of the 4.0 series of GRAMPS.
 
- -- Ross Gammon <rossgammon@mail.dk>  Wed, 23 Oct 2013 21:24:00 +0200
+It is a major update of Gramps to enable a switch to Python 3 as the default interpreter,
+and to upgrade to GTK 3. A switch was also made to distutils from autotools.
+
+The 4.0 series of Gramps is being packaged for the experimental distribution until all dependencies are available
+and it proves stable.

debian/control

@@ -2,18 +2,19 @@ Source: gramps
 Section: gnome
 Priority: optional
 Maintainer: Ross Gammon <rossgammon@mail.dk>
-Build-Depends-Indep: libxml-parser-perl, python-gtk2, gettext, python, intltool
+Build-Depends-Indep: libxml-parser-perl, gettext, python3-all, intltool, dh-python, python3-setuptools
 Build-Depends: debhelper (>= 9.0.0)
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
 Vcs-browser: http://anonscm.debian.org/git/collab-maint/gramps.git
 Homepage: http://www.gramps-project.org/
+X-Python3-Version: >= 3.2
 
 Package: gramps
 Architecture: all
-Depends: ${python:Depends}, librsvg2-common, python-gtk2, xdg-utils, python-pyexiv2, python-osmgpsmap, ${misc:Depends}
+Depends: ${python3:Depends}, librsvg2-2, xdg-utils, python-gobject (>= 3.3.2), gir1.2-gtk-3.0, python3-gi-cairo, python3-bsddb3, ${misc:Depends}
 Recommends: graphviz, python-pyicu
-Suggests: ttf-freefont, python-gtkspell, python-pygoocanvas, python-webkit
+Suggests: ttf-freefont, python-gtkspell, rcs, python3-pil.imagetk, python-pygoocanvas, python-webkit, gir1.2-gexiv2-0.4
 Description: Genealogical research program
  GRAMPS is an Open Source genealogy program written in Python, using
  the GTK/GNOME interface. It is an extremely flexible program fitting

debian/copyright

@@ -3,23 +3,26 @@ Upstream-Name: Gramps
 Source: http://gramps-project.org
 
 Files: *
-Copyright: 2000-2002, Bruce J. DeGrasse
+Copyright: 2000-2007, Alex Roitman
+           2000-2002, Bruce J. DeGrasse
            2000-2008, Donald N. Allingham
            2000-2007, Martin Hawlisch
            2001, Andrés Sepúlveda
            2001, David R. Hampton
            2001-2013, Free Software Foundation, Inc.
+           2001, Graham J. Williams
            2001, Jesper Zedlitz
-           2001-2013, the Gramps Project
+           2001-2013, The Gramps Project
            2002, Gary Shao
            2003-2006, Josiah Carlson
            2004-2006, Eero Tamminen
            2004-2013, Julio Sánchez
            2004, Toshio Kuratomi
            2005-2011, Serge Noiraud
-           2000-2007, Alex Roitman
            2006-2011, Brian G. Matherly
-           2007-2011, Benny Malengier
+           2006, 2008-2011, Kees Bakker           
+           2006-2008, Steve Hall
+           2007-2012, Benny Malengier
            2007-2012, Douglas S. Blank
            2007-2012, Gary Burton
            2007-2011, Jerome Rapinat
@@ -31,7 +34,6 @@ Copyright: 2000-2002, Bruce J. DeGrasse
            2008-2010, 2012, Craig J. Anderson
            2008-2009, James Friedmann
            2008-2009, Jason Simanek
-           2008-2011, Kees Bakker
            2008, Lukasz Rymarczyk
            2008-2010, Peter G. Landgren
            2008, 2010, Raphael Ackermann
@@ -39,15 +41,16 @@ Copyright: 2000-2002, Bruce J. DeGrasse
            2008, 2011, Robert Cheramy
            2008-2012, Rob G. Healey
            2008, Stefan Siegel
+           2008-2010, Stephen George
            2009-2010, Andrew I Baznikin
            2009, 2011, The Dojo Foundation
            2009, Florian Heinle
            2009, Gerald W. Britton
+           2009, Igal Shapira
            2009, 2011, John Resig
            2009-2013, Nick Hall
            2009, Pander Musubi
            2009, Robert Ham
-           2009-2010, Stephen George
            2009, Swoon on bug tracker
            2009, Yevgeny Zegzda
            2010, Gramps
@@ -58,18 +61,54 @@ Copyright: 2000-2002, Bruce J. DeGrasse
            2010-2013, Tim G L Lyons
            2010-2011, Vlada Perić
            2011, Adam Stein
-           2011, 2013 Heinz Brinker
+           2011-2012,  Harald Rosemann
+           2011, 2013, Heinz Brinker
            2011, Helge Herz
-           2011, John Ralls
+           2011, 2013 John Ralls
            2011, Matt Keenan
            2011-2013, Paul Franklin
            2012, Mathieu MD
+           2012, Nicolas Adenis-Lamarre
            2013, Fedir Zinchuk
            2013, Oleh Petrivk
            2013, Vassilii Khachaturov
            2013, Zissis Papadopoulos
 License: GPL-2+
 
+Files: data/javascript/jquery-1.3.2.min.js
+Copyright: 2009, John Resig
+License: MIT and GPL
+
+Files: data/javascript/jquery-1.7.1.js
+Copyright: 2011, John Resig
+           2011, The Dojo Foundation
+License: BSD and MIT and GPL-2
+
+Files: data/javascript/jquery-ui-1.7.2.custom.min.js
+Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+License: MIT and GPL-2
+
+Files: data/javascript/jquery.flexbox*
+Copyright: 2008-2010, Noah Heldman and Fairway Technologies
+License: Ms-PL
+
+Files: data/jhtmlarea/Readme.txt
+Copyright: 2009, Chris Pietschmann
+License: Ms-RL
+
+Files: data/jhtmlarea/scripts/jHtmlArea*
+Copyright: 2009, Chris Pietschmann
+License: Ms-RL
+
+Files: data/jhtmlarea/scripts/jquery-1.3.2*
+Copyright: 2009, John Resig
+           2009, The Dojo Foundation
+License: MIT
+
+Files: data/jhtmlarea/scripts/jquery-ui-*
+Copyright: 2009, jQuery UI Team (http://jqueryui.com/about)
+License: MIT and GPL
+
 Files: debian/*
 Copyright: 2001-2002, Brandon L. Griffith
            2002, Alex Roitman
@@ -77,17 +116,42 @@ Copyright: 2001-2002, Brandon L. Griffith
            2013, Ross Gammon
 License: GPL-2+
 
-Files: src/plugins/webstuff/js/jquery-ui-1.7.2.custom.min.js
+Files: gramps/webapp/grampsdb/view/png.py
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+Copyright: 2006, Johann C. Rocholl
-License: MIT and GPL-2
+           2009, David Jones
+           2006, Nicko van Someren
+License: MIT
 
-Files: src/plugins/webstuff/js/jquery-1.7.1.js
+License: BSD
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+ Redistribution and use in source and binary forms, with or without
-License: MIT and GPL-2
+ modification, are permitted provided that the following conditions are met:
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  * Neither the name of the <organization> nor the
+    names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY John Resig ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/plugins/webstuff/js/jquery-1.3.2.min.js
+License: GPL
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+ This package is free software; you can redistribute it and/or modify
-License: MIT and GPL-2
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 1 only of the License.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
 
 License: GPL-2
  This package is free software; you can redistribute it and/or modify
@@ -142,3 +206,109 @@ License: MIT
  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.
+
+License: Ms-PL
+ This license governs use of the accompanying software. If you use the
+ software, you accept this license. If you do not accept the license, do not
+ use the software.
+ .
+ 1. Definitions
+ .
+ The terms "reproduce," "reproduction," "derivative works," and "distribution"
+ have the same meaning here as under U.S. copyright law.
+ .
+ A "contribution" is the original software, or any additions or changes to the
+ software.
+ .
+ A "contributor" is any person that distributes its contribution under this
+ license.
+ .
+ "Licensed patents" are a contributor's patent claims that read directly on its
+ contribution.
+ .
+ 2. Grant of Rights
+ .
+ (A) Copyright Grant- Subject to the terms of this license, including the
+ license conditions and limitations in section 3, each contributor grants you a
+ non-exclusive, worldwide, royalty-free copyright license to reproduce its
+ contribution, prepare derivative works of its contribution, and distribute its
+ contribution or any derivative works that you create.
+ .
+ (B) Patent Grant- Subject to the terms of this license, including the license
+ conditions and limitations in section 3, each contributor grants you a
+ non-exclusive, worldwide, royalty-free license under its licensed patents to
+ make, have made, use, sell, offer for sale, import, and/or otherwise dispose of
+ its contribution in the software or derivative works of the contribution in the
+ software.
+ .
+ 3. Conditions and Limitations
+ .
+ (A) No Trademark License- This license does not grant you rights to use any
+ contributors' name, logo, or trademarks.
+ .
+ (B) If you bring a patent claim against any contributor over patents that you
+ claim are infringed by the software, your patent license from such contributor
+ to the software ends automatically.
+ .
+ (C) If you distribute any portion of the software, you must retain all copyright,
+ patent, trademark, and attribution notices that are present in the software.
+ .
+ (D) If you distribute any portion of the software in source code form, you may do
+ so only under this license by including a complete copy of this license with your
+ distribution. If you distribute any portion of the software in compiled or object
+ code form, you may only do so under a license that complies with this license.
+ .
+ (E) The software is licensed "as-is." You bear the risk of using it. The
+ contributors give no express warranties, guarantees or conditions. You may have
+ additional consumer rights under your local laws which this license cannot change.
+ To the extent permitted under your local laws, the contributors exclude the
+ implied warranties of merchantability, fitness for a particular purpose and
+ non-infringement.
+
+License: Ms-RL
+ This license governs use of the accompanying software. If you use the software,
+ you accept this license. If you do not accept the license, do not use the software.
+ .
+ 1. Definitions
+ The terms "reproduce," "reproduction," "derivative works," and "distribution" have
+ the same meaning here as under U.S. copyright law.
+ A "contribution" is the original software, or any additions or changes to the
+ software.
+ A "contributor" is any person that distributes its contribution under this license.
+ "Licensed patents" are a contributor's patent claims that read directly on its
+ contribution.
+ .
+ 2. Grant of Rights
+ (A) Copyright Grant- Subject to the terms of this license, including the license
+ conditions and limitations in section 3, each contributor grants you a
+ non-exclusive, worldwide, royalty-free copyright license to reproduce its
+ contribution, prepare derivative works of its contribution, and distribute its
+ contribution or any derivative works that you create.
+ (B) Patent Grant- Subject to the terms of this license, including the license
+ conditions and limitations in section 3, each contributor grants you a
+ non-exclusive, worldwide, royalty-free license under its licensed patents to make,
+ have made, use, sell, offer for sale, import, and/or otherwise dispose of its
+ contribution in the software or derivative works of the contribution in the software.
+ .
+ 3. Conditions and Limitations
+ (A) Reciprocal Grants- For any file you distribute that contains code from the
+ software (in source code or binary format), you must provide recipients the source
+ code to that file along with a copy of this license, which license will govern that
+ file. You may license other files that are entirely your own work and do not contain
+ code from the software under any terms you choose.
+ (B) No Trademark License- This license does not grant you rights to use any
+ contributors' name, logo, or trademarks.
+ (C) If you bring a patent claim against any contributor over patents that you claim
+ are infringed by the software, your patent license from such contributor to the
+ software ends automatically.
+ (D) If you distribute any portion of the software, you must retain all copyright,
+ patent, trademark, and attribution notices that are present in the software.
+ (E) If you distribute any portion of the software in source code form, you may do so
+ only under this license by including a complete copy of this license with your
+ distribution. If you distribute any portion of the software in compiled or object code
+ form, you may only do so under a license that complies with this license.
+ (F) The software is licensed "as-is." You bear the risk of using it. The contributors
+ give no express warranties, guarantees or conditions. You may have additional consumer
+ rights under your local laws which this license cannot change. To the extent permitted
+ under your local laws, the contributors exclude the implied warranties of
+ merchantability, fitness for a particular purpose and non-infringement.

debian/gbp.conf

@@ -0,0 +1,7 @@
+[DEFAULT]
+# the default build command
+#builder=debuild -i\.git -I.git
+# the default branch for experimental upstream sources
+upstream-branch=upstream
+# the default branch for the debian patch
+debian-branch=experimental

debian/gramps.docs

@@ -1,4 +1,5 @@
 AUTHORS
+FAQ
 NEWS
 README
 TODO

debian/gramps.install

@@ -0,0 +1 @@
+debian/gramps.xpm usr/share/pixmaps/

debian/gramps.manpages

@@ -1 +1 @@
-data/man/gramps.1
+data/man/gramps.1.in

debian/rules

@@ -1,16 +1,25 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
+
-#export DH_VERBOSE=1
+# Remember to remove verbose option once testing is finished
-#export DH_OPTIONS=-v
+DH_VERBOSE=1
+export PYBUILD_NAME=gramps
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3 --buildsystem=pybuild
 
-# Remove COPYING file (duplicates standard copyright)
+# Override auto test because upstream do not use the standard unittest discover
-override_dh_install:
+override_dh_auto_test:
-	dh_install
-	rm debian/gramps/usr/share/gramps/COPYING
 
-# Test packager mode to avoid installing mime type
+# Override of auto_build to force python 3
-override_dh_auto_configure:
+override_dh_auto_build:
-	dh_auto_configure -- --enable-packager-mode
+	python3 setup.py build
+
+# Override of auto_install to force python 3
+override_dh_auto_install:
+	python3 setup.py install --root=debian/gramps --install-layout=deb
+	# Remove duplicate copyright information
+	rm debian/gramps/usr/share/doc/gramps/COPYING
+	# Remove install file as it is not needed by package users
+	rm debian/gramps/usr/share/doc/gramps/INSTALL
+	# Remove duplicate license information
+	rm debian/gramps/usr/share/doc/gramps/LICENSE

debian/watch

@@ -1,3 +1,3 @@
+# watch control file for uscan
 version=3
-
+http://sf.net/gramps/gramps-(.+)\.tar\.gz debian uupdate
-http://sf.net/gramps/gramps-(.+)\.tar\.gz