[hitori] 49/59: Import Debian changes 3.14.0.1-1

Markus Koschany apo at moszumanska.debian.org
Fri Jun 23 21:11:33 UTC 2017


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository hitori.

commit 6c2fd9d37877772337b507c3aa7be88fac98cffe
Merge: f8aaf16 4f85aa2
Author: Jackson Doak <noskcaj at ubuntu.com>
Date:   Fri Sep 26 11:59:33 2014 +1000

    Import Debian changes 3.14.0.1-1
    
    hitori (3.14.0.1-1) unstable; urgency=medium
    
      * Team upload
      * New upstream release
      * debian/control:
        - Bump gtk3 build-dep to >= 3.13.2
    
    hitori (0.4.2-1) unstable; urgency=low
    
      * Team upload.
    
      [ Peter De Wachter ]
      * New upstream version.
      * Homepage moved to https://wiki.gnome.org/Apps/Hitori
        - updated references in packaging and upstream source.
    
      [ Vincent Cheng ]
      * New upstream release (0.4.2).
      * Removed debian/patches/, applied upstream.
      * Update Standards version to 3.9.5.
    
    hitori (0.4.0-1) unstable; urgency=low
    
      * New upstream version.
      * Switch to minimalist debian/rules with debhelper 9.
        - Use dh_autotools-dev to update and restore config.*.
      * Use canonical Vcs-URI.
      * Bumped Standards-Version to 3.9.4. No changes needed.

 ABOUT-NLS                          |  1068 ---
 ChangeLog                          |  2482 +++++--
 INSTALL                            |    15 +-
 Makefile.am                        |    38 +-
 Makefile.in                        |   510 +-
 NEWS                               |   128 +-
 README                             |     2 +-
 aclocal.m4                         | 13467 ++++++++++++++++++-----------------
 compile                            |   232 +-
 config.guess                       |   276 +-
 config.rpath                       |   666 --
 config.sub                         |   236 +-
 configure                          |  1426 ++--
 configure.ac                       |    16 +-
 data/hitori.appdata.xml.in         |    24 +
 data/hitori.css                    |    24 +
 data/hitori.ui                     |   335 +-
 data/org.gnome.hitori.gschema.xml  |    10 +
 debian/changelog                   |    35 +
 debian/compat                      |     2 +-
 debian/control                     |    19 +-
 debian/copyright                   |    32 +-
 debian/hitori.6                    |     4 +-
 debian/hitori.lintian-overrides    |     2 +
 debian/rules                       |    82 +-
 depcomp                            |   255 +-
 gnome-doc-utils.make               |   655 --
 help/C/customization.page          |     1 +
 help/C/game.page                   |     1 +
 help/C/legal.xml                   |     8 +
 help/C/license.page                |    59 -
 help/C/playing.page                |     1 +
 help/C/strategy.page               |     1 +
 help/Makefile.am                   |    18 +-
 help/Makefile.in                   |   678 +-
 help/cs/cs.po                      |   493 +-
 help/cs/cs.stamp                   |     0
 help/cs/customization.page         |     1 +
 help/cs/game.page                  |     1 +
 help/cs/legal.xml                  |     6 +
 help/cs/license.page               |    35 -
 help/cs/playing.page               |     1 +
 help/cs/strategy.page              |     1 +
 help/da/customization.page         |     1 +
 help/da/da.po                      |     8 +-
 help/da/da.stamp                   |     0
 help/da/game.page                  |     1 +
 help/da/legal.xml                  |     8 +
 help/da/license.page               |    55 -
 help/da/playing.page               |     1 +
 help/da/strategy.page              |     1 +
 help/de/customization.page         |     9 +-
 help/de/de.po                      |   497 +-
 help/de/de.stamp                   |     0
 help/de/game.page                  |     9 +-
 help/de/index.page                 |     8 +-
 help/de/legal.xml                  |     8 +
 help/de/license.page               |    35 -
 help/de/playing.page               |     9 +-
 help/de/strategy.page              |     9 +-
 help/el/customization.page         |    30 +
 help/el/el.po                      |   400 ++
 help/el/el.stamp                   |     0
 help/el/game.page                  |    43 +
 help/el/index.page                 |    41 +
 help/el/legal.xml                  |     6 +
 help/el/playing.page               |    33 +
 help/el/strategy.page              |    33 +
 help/en_GB/customization.page      |     3 +-
 help/en_GB/en_GB.po                |     8 +-
 help/en_GB/en_GB.stamp             |     0
 help/en_GB/game.page               |     3 +-
 help/en_GB/index.page              |     2 +-
 help/en_GB/legal.xml               |     8 +
 help/en_GB/license.page            |    35 -
 help/en_GB/playing.page            |     3 +-
 help/en_GB/strategy.page           |     3 +-
 help/es/customization.page         |    15 +-
 help/es/es.po                      |   557 +-
 help/es/es.stamp                   |     0
 help/es/game.page                  |    15 +-
 help/es/index.page                 |    14 +-
 help/es/legal.xml                  |     6 +
 help/es/license.page               |    35 -
 help/es/playing.page               |    15 +-
 help/es/strategy.page              |    15 +-
 help/fr/customization.page         |     1 +
 help/fr/fr.stamp                   |     0
 help/fr/game.page                  |     1 +
 help/fr/legal.xml                  |     8 +
 help/fr/license.page               |    35 -
 help/fr/playing.page               |     1 +
 help/fr/strategy.page              |     1 +
 help/{sv => hu}/customization.page |     5 +-
 help/{zh_CN => hu}/game.page       |    13 +-
 help/hu/hu.po                      |   306 +
 help/hu/hu.stamp                   |     0
 help/{en_GB => hu}/index.page      |    10 +-
 help/hu/legal.xml                  |     8 +
 help/{sv => hu}/playing.page       |     3 +-
 help/{da => hu}/strategy.page      |     5 +-
 help/ro/customization.page         |    12 +
 help/ro/game.page                  |    25 +
 help/{de => ro}/index.page         |    10 +-
 help/ro/legal.xml                  |     8 +
 help/ro/playing.page               |    15 +
 help/{cs/cs.po => ro/ro.po}        |   232 +-
 help/ro/ro.stamp                   |     0
 help/ro/strategy.page              |    15 +
 help/sl/customization.page         |     1 +
 help/sl/game.page                  |     1 +
 help/sl/legal.xml                  |     8 +
 help/sl/license.page               |    35 -
 help/sl/playing.page               |     1 +
 help/sl/sl.stamp                   |     0
 help/sl/strategy.page              |     1 +
 help/sv/customization.page         |     1 +
 help/sv/game.page                  |     1 +
 help/sv/legal.xml                  |     8 +
 help/sv/license.page               |    55 -
 help/sv/playing.page               |     1 +
 help/sv/strategy.page              |     1 +
 help/sv/sv.po                      |     2 +-
 help/sv/sv.stamp                   |     0
 help/zh_CN/customization.page      |     3 +-
 help/zh_CN/game.page               |     3 +-
 help/zh_CN/index.page              |     2 +-
 help/zh_CN/legal.xml               |     8 +
 help/zh_CN/license.page            |    55 -
 help/zh_CN/playing.page            |     3 +-
 help/zh_CN/strategy.page           |     3 +-
 help/zh_CN/zh_CN.po                |     4 +-
 help/zh_CN/zh_CN.stamp             |     0
 hitori.doap                        |    36 +-
 install-sh                         |    35 +-
 ltmain.sh                          |    93 +-
 missing                            |   148 +-
 po/LINGUAS                         |    11 +
 po/Makefile.in.in                  |    13 +-
 po/POTFILES.in                     |     2 +
 po/as.po                           |   188 +
 po/ca.po                           |   185 +
 po/ca at valencia.po                  |   184 +
 po/cs.po                           |   196 +-
 po/da.po                           |   234 +-
 po/de.po                           |   244 +-
 po/el.po                           |   261 +-
 po/en_GB.po                        |   241 +-
 po/es.po                           |   254 +-
 po/fi.po                           |   215 +
 po/fr.po                           |   223 +-
 po/gl.po                           |   224 +-
 po/he.po                           |   234 +
 po/hu.po                           |   238 +-
 po/id.po                           |   216 +-
 po/ko.po                           |   181 +
 po/lt.po                           |   191 +
 po/lv.po                           |   159 +-
 po/nb.po                           |   195 +-
 po/pl.po                           |   203 +-
 po/pt_BR.po                        |   254 +-
 po/ru.po                           |   190 +-
 po/sk.po                           |   191 +
 po/sl.po                           |   193 +-
 po/sr.po                           |   125 +-
 po/sr at latin.po                     |   125 +-
 po/sv.po                           |   230 +-
 po/uk.po                           |   229 +
 po/zh_HK.po                        |   181 +
 po/zh_TW.po                        |   184 +
 src/generator.c                    |     4 +
 src/interface.c                    |   319 +-
 src/main.c                         |   338 +-
 src/main.h                         |    34 +-
 src/rules.c                        |    17 +-
 175 files changed, 19200 insertions(+), 14257 deletions(-)

diff --cc debian/changelog
index 00fc816,0000000..d83e2c2
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,0 +1,77 @@@
++hitori (3.14.0.1-1) unstable; urgency=medium
++
++  * Team upload
++  * New upstream release
++  * debian/control:
++    - Bump gtk3 build-dep to >= 3.13.2
++
++ -- Jackson Doak <noskcaj at ubuntu.com>  Fri, 26 Sep 2014 11:59:33 +1000
++
++hitori (0.4.2-1) unstable; urgency=low
++
++  * Team upload.
++
++  [ Peter De Wachter ]
++  * New upstream version.
++  * Homepage moved to https://wiki.gnome.org/Apps/Hitori
++    - updated references in packaging and upstream source.
++
++  [ Vincent Cheng ]
++  * New upstream release (0.4.2).
++  * Removed debian/patches/, applied upstream.
++  * Update Standards version to 3.9.5.
++
++ -- Vincent Cheng <vcheng at debian.org>  Fri, 28 Feb 2014 03:13:20 -0800
++
++hitori (0.4.0-1) unstable; urgency=low
++
++  * New upstream version.
++  * Switch to minimalist debian/rules with debhelper 9.
++    - Use dh_autotools-dev to update and restore config.*.
++  * Use canonical Vcs-URI.
++  * Bumped Standards-Version to 3.9.4. No changes needed.
++
++ -- Peter De Wachter <pdewacht at gmail.com>  Sun, 30 Jun 2013 22:20:18 +0200
++
 +hitori (0.3.2-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Fixed watch file.
 +  * Bumped Standards-Version to 3.9.3. No changes needed.
 +
 + -- Peter De Wachter <pdewacht at gmail.com>  Mon, 14 May 2012 21:27:50 +0200
 +
 +hitori (0.3.1-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * License change: the documentation license is now
 +    Creative Commons Attribution-ShareAlike 3.0 unported. 
 +  * Switch to dpkg-source 3.0 (quilt) format.
 +  * Bumped Standards-Version to 3.9.2. No changes needed.
 +
 + -- Peter De Wachter <pdewacht at gmail.com>  Sat, 18 Jun 2011 23:06:44 +0200
 +
 +hitori (0.2.3-1) unstable; urgency=low
 +
 +  * New upstream version.
 +    - Fixed bug in solution verification. (Closes: #552510)
 +  * Added missing build-dependency on docbook-xml.
 +  * Removed obsolete dh_scrollkeeper call.
 +  * Bumped Standards-Version to 3.8.3. No changes needed. 
 +
 + -- Peter De Wachter <pdewacht at gmail.com>  Sat, 07 Nov 2009 22:15:11 +0100
 +
 +hitori (0.2.2-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * New upstrean website: updated watch file, etc.
 +  * Removed obsolete dh_desktop call.
 +  * Bumped Standards-Version to 3.8.1. No changes needed.
 +
 + -- Peter De Wachter <pdewacht at gmail.com>  Sun, 26 Apr 2009 20:56:50 +0200
 +
 +hitori (0.2.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #490222)
 +
 + -- Peter De Wachter <pdewacht at gmail.com>  Mon, 09 Mar 2009 23:29:38 +0100
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index c7970a2,0000000..99c003c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,0 +1,26 @@@
 +Source: hitori
 +Section: games
 +Priority: optional
 +Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 +Uploaders: Peter De Wachter <pdewacht at gmail.com>
- Build-Depends: debhelper (>= 7), libgtk-3-dev, intltool, gnome-doc-utils
- Standards-Version: 3.9.3
- Homepage: http://live.gnome.org/Hitori
- Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/hitori/
- Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/hitori/
++Build-Depends:
++ autotools-dev,
++ debhelper (>= 9),
++ intltool,
++ libgtk-3-dev (>= 3.13.2),
++ yelp-tools
++Standards-Version: 3.9.5
++Homepage: https://wiki.gnome.org/Apps/Hitori
++Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/hitori/
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/hitori/
 +
 +Package: hitori
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: yelp, gvfs
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Recommends: gvfs, yelp
 +Description: logic puzzle game similar to sudoku
 + Hitori puzzles give you a grid filled with numbers. The goal is to
 + remove numbers such that no row or column contains duplicates.
 + .
 + This implementation has undo/redo support, can give hints, and
 + generates puzzles up to 10x10 cells large.
diff --cc debian/copyright
index f3d515b,0000000..0f4b915
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,384 -1,0 +1,384 @@@
 +This package was debianized by Peter De Wachter <pdewacht at gmail.com> on
 +Wed, 03 Sep 2008 20:04:39 +0200.
 +
 +It was downloaded from http://tecnocode.co.uk/projects/hitori/
 +
 +Upstream Author:
 +
 +    Philip Withnall <philip at tecnocode.co.uk>
 +    Algorithm assistance from Ben Windsor <benjw_823 at hotmail.com>
 +    Icon by Jakub Szypulka <cube at szypulka.com>
 +
 +Copyright:
 +
 +    Copyright Philip Withnall 2007-2008 <philip at tecnocode.co.uk>
 +
 +License:
 +
 +    Hitori 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 3 of the License, or
 +    (at your option) any later version.
 +
 +    Hitori 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 Hitori.  If not, see <http://www.gnu.org/licenses/>.
 +
 +The documentation is licensed separately:
 +
 +    Attribution-ShareAlike 3.0 Unported
-     
++
 +    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
 +    SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
 +    RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS"
 +    BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
 +    PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 +    License
-     
++
 +    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
 +    COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
 +    COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN
 +    AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-     
++
 +    BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
 +    TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE
 +    MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
 +    CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
 +    CONDITIONS.
-     
++
 +    1. Definitions
-     
++
 +    "Adaptation" means a work based upon the Work, or upon the Work and other
 +    pre-existing works, such as a translation, adaptation, derivative work,
 +    arrangement of music or other alterations of a literary or artistic work,
 +    or phonogram or performance and includes cinematographic adaptations or
 +    any other form in which the Work may be recast, transformed, or adapted
 +    including in any form recognizably derived from the original, except that
 +    a work that constitutes a Collection will not be considered an Adaptation
 +    for the purpose of this License. For the avoidance of doubt, where the
 +    Work is a musical work, performance or phonogram, the synchronization
 +    of the Work in timed-relation with a moving image ("synching") will be
 +    considered an Adaptation for the purpose of this License.
 +
 +    "Collection" means a collection of literary or artistic works, such as
 +    encyclopedias and anthologies, or performances, phonograms or broadcasts,
 +    or other works or subject matter other than works listed in Section
 +    1(f) below, which, by reason of the selection and arrangement of
 +    their contents, constitute intellectual creations, in which the Work
 +    is included in its entirety in unmodified form along with one or more
 +    other contributions, each constituting separate and independent works
 +    in themselves, which together are assembled into a collective whole. A
 +    work that constitutes a Collection will not be considered an Adaptation
 +    (as defined below) for the purposes of this License.
 +
 +    "Creative Commons Compatible License" means a license that is listed at
 +    http://creativecommons.org/compatiblelicenses that has been approved
 +    by Creative Commons as being essentially equivalent to this License,
 +    including, at a minimum, because that license: (i) contains terms that
 +    have the same purpose, meaning and effect as the License Elements of this
 +    License; and, (ii) explicitly permits the relicensing of adaptations
 +    of works made available under that license under this License or a
 +    Creative Commons jurisdiction license with the same License Elements as
 +    this License.
 +
 +    "Distribute" means to make available to the public the original and
 +    copies of the Work or Adaptation, as appropriate, through sale or other
 +    transfer of ownership.
 +
 +    "License Elements" means the following high-level license attributes
 +    as selected by Licensor and indicated in the title of this License:
 +    Attribution, ShareAlike.
 +
 +    "Licensor" means the individual, individuals, entity or entities that
 +    offer(s) the Work under the terms of this License.
 +
 +    "Original Author" means, in the case of a literary or artistic work, the
 +    individual, individuals, entity or entities who created the Work or if
 +    no individual or entity can be identified, the publisher; and in addition
 +    (i) in the case of a performance the actors, singers, musicians, dancers,
 +    and other persons who act, sing, deliver, declaim, play in, interpret or
 +    otherwise perform literary or artistic works or expressions of folklore;
 +    (ii) in the case of a phonogram the producer being the person or legal
 +    entity who first fixes the sounds of a performance or other sounds;
 +    and, (iii) in the case of broadcasts, the organization that transmits
 +    the broadcast.
 +
 +    "Work" means the literary and/or artistic work offered under the terms
 +    of this License including without limitation any production in the
 +    literary, scientific and artistic domain, whatever may be the mode or
 +    form of its expression including digital form, such as a book, pamphlet
 +    and other writing; a lecture, address, sermon or other work of the same
 +    nature; a dramatic or dramatico-musical work; a choreographic work
 +    or entertainment in dumb show; a musical composition with or without
 +    words; a cinematographic work to which are assimilated works expressed
 +    by a process analogous to cinematography; a work of drawing, painting,
 +    architecture, sculpture, engraving or lithography; a photographic
 +    work to which are assimilated works expressed by a process analogous
 +    to photography; a work of applied art; an illustration, map, plan,
 +    sketch or three-dimensional work relative to geography, topography,
 +    architecture or science; a performance; a broadcast; a phonogram;
 +    a compilation of data to the extent it is protected as a copyrightable
 +    work; or a work performed by a variety or circus performer to the extent
 +    it is not otherwise considered a literary or artistic work.
 +
 +    "You" means an individual or entity exercising rights under this License
 +    who has not previously violated the terms of this License with respect
 +    to the Work, or who has received express permission from the Licensor
 +    to exercise rights under this License despite a previous violation.
 +
 +    "Publicly Perform" means to perform public recitations of the Work and
 +    to communicate to the public those public recitations, by any means
 +    or process, including by wire or wireless means or public digital
 +    performances; to make available to the public Works in such a way that
 +    members of the public may access these Works from a place and at a place
 +    individually chosen by them; to perform the Work to the public by any
 +    means or process and the communication to the public of the performances
 +    of the Work, including by public digital performance; to broadcast and
 +    rebroadcast the Work by any means including signs, sounds or images.
 +
 +    "Reproduce" means to make copies of the Work by any means including
 +    without limitation by sound or visual recordings and the right of fixation
 +    and reproducing fixations of the Work, including storage of a protected
 +    performance or phonogram in digital form or other electronic medium.
 +
 +    2. Fair Dealing Rights. Nothing in this License is intended to reduce,
 +    limit, or restrict any uses free from copyright or rights arising from
 +    limitations or exceptions that are provided for in connection with the
 +    copyright protection under copyright law or other applicable laws.
-     
++
 +    3. License Grant. Subject to the terms and conditions of this License,
 +    Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
 +    perpetual (for the duration of the applicable copyright) license to
 +    exercise the rights in the Work as stated below:
-     
++
 +    to Reproduce the Work, to incorporate the Work into one or more
 +    Collections, and to Reproduce the Work as incorporated in the Collections;
 +    to create and Reproduce Adaptations provided that any such Adaptation,
 +    including any translation in any medium, takes reasonable steps to
 +    clearly label, demarcate or otherwise identify that changes were made
 +    to the original Work. For example, a translation could be marked "The
 +    original work was translated from English to Spanish," or a modification
 +    could indicate "The original work has been modified.";
 +
 +    to Distribute and Publicly Perform the Work including as incorporated
 +    in Collections; and,
 +
 +    to Distribute and Publicly Perform Adaptations.
 +
 +    For the avoidance of doubt:
-     
++
 +    Non-waivable Compulsory License Schemes. In those jurisdictions in
 +    which the right to collect royalties through any statutory or compulsory
 +    licensing scheme cannot be waived, the Licensor reserves the exclusive
 +    right to collect such royalties for any exercise by You of the rights
 +    granted under this License;
 +
 +    Waivable Compulsory License Schemes. In those jurisdictions in which the
 +    right to collect royalties through any statutory or compulsory licensing
 +    scheme can be waived, the Licensor waives the exclusive right to collect
 +    such royalties for any exercise by You of the rights granted under this
 +    License; and,
 +
 +    Voluntary License Schemes. The Licensor waives the right to collect
 +    royalties, whether individually or, in the event that the Licensor is
 +    a member of a collecting society that administers voluntary licensing
 +    schemes, via that society, from any exercise by You of the rights granted
 +    under this License.
 +
 +    The above rights may be exercised in all media and formats whether now
 +    known or hereafter devised. The above rights include the right to make
 +    such modifications as are technically necessary to exercise the rights
 +    in other media and formats. Subject to Section 8(f), all rights not
 +    expressly granted by Licensor are hereby reserved.
-     
++
 +    4. Restrictions. The license granted in Section 3 above is expressly
 +    made subject to and limited by the following restrictions:
-     
++
 +    You may Distribute or Publicly Perform the Work only under the terms
 +    of this License. You must include a copy of, or the Uniform Resource
 +    Identifier (URI) for, this License with every copy of the Work You
 +    Distribute or Publicly Perform. You may not offer or impose any terms on
 +    the Work that restrict the terms of this License or the ability of the
 +    recipient of the Work to exercise the rights granted to that recipient
 +    under the terms of the License. You may not sublicense the Work. You
 +    must keep intact all notices that refer to this License and to the
 +    disclaimer of warranties with every copy of the Work You Distribute
 +    or Publicly Perform. When You Distribute or Publicly Perform the Work,
 +    You may not impose any effective technological measures on the Work that
 +    restrict the ability of a recipient of the Work from You to exercise the
 +    rights granted to that recipient under the terms of the License. This
 +    Section 4(a) applies to the Work as incorporated in a Collection, but
 +    this does not require the Collection apart from the Work itself to be
 +    made subject to the terms of this License. If You create a Collection,
 +    upon notice from any Licensor You must, to the extent practicable,
 +    remove from the Collection any credit as required by Section 4(c), as
 +    requested. If You create an Adaptation, upon notice from any Licensor
 +    You must, to the extent practicable, remove from the Adaptation any
 +    credit as required by Section 4(c), as requested.
 +
 +    You may Distribute or Publicly Perform an Adaptation only under the terms
 +    of: (i) this License; (ii) a later version of this License with the same
 +    License Elements as this License; (iii) a Creative Commons jurisdiction
 +    license (either this or a later license version) that contains the same
 +    License Elements as this License (e.g., Attribution-ShareAlike 3.0 US));
 +    (iv) a Creative Commons Compatible License. If you license the Adaptation
 +    under one of the licenses mentioned in (iv), you must comply with the
 +    terms of that license. If you license the Adaptation under the terms of
 +    any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable
 +    License"), you must comply with the terms of the Applicable License
 +    generally and the following provisions: (I) You must include a copy of,
 +    or the URI for, the Applicable License with every copy of each Adaptation
 +    You Distribute or Publicly Perform; (II) You may not offer or impose any
 +    terms on the Adaptation that restrict the terms of the Applicable License
 +    or the ability of the recipient of the Adaptation to exercise the rights
 +    granted to that recipient under the terms of the Applicable License;
 +    (III) You must keep intact all notices that refer to the Applicable
 +    License and to the disclaimer of warranties with every copy of the Work
 +    as included in the Adaptation You Distribute or Publicly Perform; (IV)
 +    when You Distribute or Publicly Perform the Adaptation, You may not impose
 +    any effective technological measures on the Adaptation that restrict the
 +    ability of a recipient of the Adaptation from You to exercise the rights
 +    granted to that recipient under the terms of the Applicable License. This
 +    Section 4(b) applies to the Adaptation as incorporated in a Collection,
 +    but this does not require the Collection apart from the Adaptation itself
 +    to be made subject to the terms of the Applicable License.
 +
 +    If You Distribute, or Publicly Perform the Work or any Adaptations
 +    or Collections, You must, unless a request has been made pursuant
 +    to Section 4(a), keep intact all copyright notices for the Work and
 +    provide, reasonable to the medium or means You are utilizing: (i) the
 +    name of the Original Author (or pseudonym, if applicable) if supplied,
 +    and/or if the Original Author and/or Licensor designate another party
 +    or parties (e.g., a sponsor institute, publishing entity, journal)
 +    for attribution ("Attribution Parties") in Licensor's copyright notice,
 +    terms of service or by other reasonable means, the name of such party
 +    or parties; (ii) the title of the Work if supplied; (iii) to the extent
 +    reasonably practicable, the URI, if any, that Licensor specifies to be
 +    associated with the Work, unless such URI does not refer to the copyright
 +    notice or licensing information for the Work; and (iv) , consistent with
 +    Ssection 3(b), in the case of an Adaptation, a credit identifying the
 +    use of the Work in the Adaptation (e.g., "French translation of the Work
 +    by Original Author," or "Screenplay based on original Work by Original
 +    Author"). The credit required by this Section 4(c) may be implemented in
 +    any reasonable manner; provided, however, that in the case of a Adaptation
 +    or Collection, at a minimum such credit will appear, if a credit for
 +    all contributing authors of the Adaptation or Collection appears, then
 +    as part of these credits and in a manner at least as prominent as the
 +    credits for the other contributing authors. For the avoidance of doubt,
 +    You may only use the credit required by this Section for the purpose of
 +    attribution in the manner set out above and, by exercising Your rights
 +    under this License, You may not implicitly or explicitly assert or imply
 +    any connection with, sponsorship or endorsement by the Original Author,
 +    Licensor and/or Attribution Parties, as appropriate, of You or Your use
 +    of the Work, without the separate, express prior written permission of
 +    the Original Author, Licensor and/or Attribution Parties.
 +
 +    Except as otherwise agreed in writing by the Licensor or as may be
 +    otherwise permitted by applicable law, if You Reproduce, Distribute or
 +    Publicly Perform the Work either by itself or as part of any Adaptations
 +    or Collections, You must not distort, mutilate, modify or take other
 +    derogatory action in relation to the Work which would be prejudicial to
 +    the Original Author's honor or reputation. Licensor agrees that in those
 +    jurisdictions (e.g. Japan), in which any exercise of the right granted
 +    in Section 3(b) of this License (the right to make Adaptations) would be
 +    deemed to be a distortion, mutilation, modification or other derogatory
 +    action prejudicial to the Original Author's honor and reputation, the
 +    Licensor will waive or not assert, as appropriate, this Section, to the
 +    fullest extent permitted by the applicable national law, to enable You
 +    to reasonably exercise Your right under Section 3(b) of this License
 +    (right to make Adaptations) but not otherwise.
 +
 +    5. Representations, Warranties and Disclaimer
-     
++
 +    UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
 +    OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
 +    KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
 +    INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
 +    FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
 +    LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
 +    WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
 +    OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-     
++
 +    6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
 +    LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
 +    ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
 +    ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
 +    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-     
++
 +    7. Termination
-     
++
 +    This License and the rights granted hereunder will terminate automatically
 +    upon any breach by You of the terms of this License. Individuals or
 +    entities who have received Adaptations or Collections from You under
 +    this License, however, will not have their licenses terminated provided
 +    such individuals or entities remain in full compliance with those
 +    licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of
 +    this License.
 +
 +    Subject to the above terms and conditions, the license granted here
 +    is perpetual (for the duration of the applicable copyright in the
 +    Work). Notwithstanding the above, Licensor reserves the right to release
 +    the Work under different license terms or to stop distributing the Work
 +    at any time; provided, however that any such election will not serve to
 +    withdraw this License (or any other license that has been, or is required
 +    to be, granted under the terms of this License), and this License will
 +    continue in full force and effect unless terminated as stated above.
 +
 +    8. Miscellaneous
-     
++
 +    Each time You Distribute or Publicly Perform the Work or a Collection,
 +    the Licensor offers to the recipient a license to the Work on the same
 +    terms and conditions as the license granted to You under this License.
 +
 +    Each time You Distribute or Publicly Perform an Adaptation, Licensor
 +    offers to the recipient a license to the original Work on the same terms
 +    and conditions as the license granted to You under this License.
 +
 +    If any provision of this License is invalid or unenforceable under
 +    applicable law, it shall not affect the validity or enforceability of
 +    the remainder of the terms of this License, and without further action
 +    by the parties to this agreement, such provision shall be reformed to
 +    the minimum extent necessary to make such provision valid and enforceable.
 +
 +    No term or provision of this License shall be deemed waived and no breach
 +    consented to unless such waiver or consent shall be in writing and signed
 +    by the party to be charged with such waiver or consent.
 +
 +    This License constitutes the entire agreement between the parties
 +    with respect to the Work licensed here. There are no understandings,
 +    agreements or representations with respect to the Work not specified
 +    here. Licensor shall not be bound by any additional provisions that may
 +    appear in any communication from You. This License may not be modified
 +    without the mutual written agreement of the Licensor and You.
 +
 +    The rights granted under, and the subject matter referenced, in this
 +    License were drafted utilizing the terminology of the Berne Convention for
 +    the Protection of Literary and Artistic Works (as amended on September 28,
 +    1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996,
 +    the WIPO Performances and Phonograms Treaty of 1996 and the Universal
 +    Copyright Convention (as revised on July 24, 1971). These rights and
 +    subject matter take effect in the relevant jurisdiction in which the
 +    License terms are sought to be enforced according to the corresponding
 +    provisions of the implementation of those treaty provisions in the
 +    applicable national law. If the standard suite of rights granted under
 +    applicable copyright law includes additional rights not granted under
 +    this License, such additional rights are deemed to be included in the
 +    License; this License is not intended to restrict the license of any
 +    rights under applicable law.
 +
 +
 +
 +The Debian packaging is Copyright 2008 Peter De Wachter
 +<pdewacht at gmail.com> and is published under the terms of the GNU
 +General Public License Version 3 or (at your option) any later
 +version.
-     
++
 +On Debian systems the complete text of the GNU General Public License
 +Version 3 can be found in the file
 +`/usr/share/common-licenses/GPL-3'. The text of the GNU Free
 +Documentation License Version 1.2 can be found in the file
 +`/usr/share/common-licenses/GFDL-1.2'.
diff --cc debian/hitori.6
index 35ede05,0000000..e2e56da
mode 100644,000000..100644
--- a/debian/hitori.6
+++ b/debian/hitori.6
@@@ -1,40 -1,0 +1,40 @@@
 +.\" URL macro recipe from Branden Robinson's presentation
 +.de URL
 +\\$2 \(laURL: \\$1 \(ra\\$3
 +..
 +.if \n[.g] .mso www.tmac
 +.\" End of recipe.
 +.
- .TH hitori 6 "2008-09-11"
++.TH hitori 6 "2013-09-22"
 +.\" Please adjust this date whenever revising the manpage.
 +.
 +.SH "NAME"
 +.
 +hitori \- plays the game of hitori
 +.
 +.SH "SYNOPSIS"
 +.
 +.B hitori
 +.
 +.SH "DESCRIPTION"
 +.
 +Hitori puzzles give you a grid filled with numbers.
 +The goal is to remove numbers such that no row or column contains duplicates.
 +.P
 +This implementation has undo/redo support, can give hints, and
 +generates puzzles up to 10\[mu]10 cells large.
 +.P
 +The full documentation is available through the program's
 +.I Help
 +menu.
 +.
 +.SH "SEE ALSO"
 +.
- .URL "http://live.gnome.org/Hitori" "The game's web site" ""
++.URL "https://wiki.gnome.org/Apps/Hitori" "The game's web site" ""
 +.
 +.SH "AUTHOR"
 +.
 +Philip Withnall (philip at tecnocode.co.uk)
 +.P
 +This manual page was written by Peter De Wachter (pdewacht at gmail.com) for
 +the Debian GNU/Linux system (but may be used by others).
diff --cc debian/hitori.lintian-overrides
index 0000000,0000000..9fb2bd5
new file mode 100644
--- /dev/null
+++ b/debian/hitori.lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++# Translations of license file; shown in in-game help menu (yelp)
++hitori: extra-license-file usr/share/help/*/hitori/license.page
diff --cc debian/rules
index eaca98d,0000000..c348609
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,80 -1,0 +1,18 @@@
 +#!/usr/bin/make -f
 +
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
++export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 +
++%:
++	dh $@ --with autotools_dev
 +
- export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++override_dh_auto_configure:
++	dh_auto_configure -- \
++		--bindir='$${prefix}/games' \
++		--disable-silent-rules
 +
- ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-   CROSS = --build $(DEB_HOST_GNU_TYPE)
- else
-   CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
- endif
- 
- 
- configure: configure-stamp
- configure-stamp:
- 	dh_testdir
- ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- 	cp -f /usr/share/misc/config.sub config.sub
- endif
- ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- 	cp -f /usr/share/misc/config.guess config.guess
- endif
- 	./configure $(CROSS) \
- 		--prefix=/usr \
- 		--bindir=/usr/games \
- 		--disable-scrollkeeper \
- 		CFLAGS="$(CFLAGS)" \
- 		LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
- 	touch configure-stamp
- 
- build: build-arch build-indep
- build-arch: build-stamp
- build-indep: build-stamp
- build-stamp: configure-stamp
- 	dh_testdir
- 	$(MAKE)
- 	touch build-stamp
- 
- clean:
- 	dh_testdir
- 	[ ! -f Makefile ] || $(MAKE) distclean
- 	dh_clean config.sub config.guess
- 
- install: build
- 	dh_testdir
- 	dh_testroot
- 	dh_prep
- 	$(MAKE) install DESTDIR=$(CURDIR)/debian/hitori
- 
- binary: binary-arch binary-indep
- 
- binary-arch: install
- 	dh_testdir
- 	dh_testroot
- 	dh_install
- 	dh_installchangelogs ChangeLog
++override_dh_installchangelogs:
 +# Take care to install the old changelogs as well...
++	dh_installchangelogs ChangeLog
 +	install ChangeLog.pre-0-2-2 debian/hitori/usr/share/doc/hitori/changelog.pre-0-2-2
 +	install help/ChangeLog.pre-0-2-2 debian/hitori/usr/share/doc/hitori/changelog.help.pre-0-2-2
- 	dh_installdocs
- 	dh_installman
- 	dh_installmenu
- 	dh_icons
- 	dh_strip
- 	dh_compress
- 	dh_fixperms
- 	dh_installdeb
- 	dh_shlibdeps
- 	dh_gencontrol
- 	dh_md5sums
- 	dh_builddeb
- 
- binary-indep:
- # Nothing to do.
- 
- 
- .PHONY: build clean install binary binary-arch binary-indep
++	install po/ChangeLog.pre-0-2-2 debian/hitori/usr/share/doc/hitori/changelog.po.pre-0-2-2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/hitori.git



More information about the Pkg-games-commits mailing list