[Python-apps-commits] r14431 - in packages/pybik/trunk/debian (10 files)
barcc-guest at users.alioth.debian.org
barcc-guest at users.alioth.debian.org
Mon Oct 23 16:55:39 UTC 2017
Date: Monday, October 23, 2017 @ 16:55:37
Author: barcc-guest
Revision: 14431
Pybik 3.0
Added:
packages/pybik/trunk/debian/upstream/signing-key.asc
Modified:
packages/pybik/trunk/debian/changelog
packages/pybik/trunk/debian/compat
packages/pybik/trunk/debian/control
packages/pybik/trunk/debian/copyright
packages/pybik/trunk/debian/pybik-bin.install
packages/pybik/trunk/debian/pybik.install
packages/pybik/trunk/debian/rules
packages/pybik/trunk/debian/watch
Deleted:
packages/pybik/trunk/debian/upstream/signing-key.pgp
Modified: packages/pybik/trunk/debian/changelog
===================================================================
--- packages/pybik/trunk/debian/changelog 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/changelog 2017-10-23 16:55:37 UTC (rev 14431)
@@ -1,8 +1,34 @@
-pybik (2.1-2) UNRELEASED; urgency=medium
+pybik (3.0-1) UNRELEASED; urgency=medium
- * Removed file for the debian menu system (CTTE #741573) (Closes: #738007)
+ * New upstream release
+ + New puzzles: Octahedron and Dodecahedron
+ + Improved User-Interface
+ + Support for OpenGLES v2
+ + Misc improvements
+ + Updated translations
+ * OpenGLES v2 on armel and armhf
+ + Added Build-Depends on libgles2-mesa-dev
+ + Select GL variant in debian/rules
+ * PyQt5 no longer used by pybik,
+ it uses the qt libs from within extension modules
+ + Changed (Build-)Depends
+ * intltool removed from Build-Depends,
+ msgfmt from package gettext (>= 0.19.6) is now used instead
+ * Build-Depends help2man replaced by python3-docutils,
+ the manpage is now generated with rst2man from a template
+ * Standards-Version updated to 4.1.1
+ + debian/upstream/signing-key.asc instead
+ of the binary *.pgp (4.1.0)
+ + copyright-format URL changed to https (4.0.0)
+ + The menu system is deprecated (3.9.8),
+ removed debian/pybik.menu (Closes: #738007)
+ * Changed debhelper version and compat level to 10
+ * override_dh_builddeb removed: xz compression is now the default
+ * Install NEWS as upstream changelog
+ * Enable the bindnow hardening flag
+ * Updated debian/watch to version 4
- -- B. Clausius <barcc at gmx.de> Sat, 05 Sep 2015 17:31:24 +0200
+ -- B. Clausius <barcc at gmx.de> Thu, 19 Oct 2017 12:57:24 +0200
pybik (2.1-1) unstable; urgency=medium
Modified: packages/pybik/trunk/debian/compat
===================================================================
--- packages/pybik/trunk/debian/compat 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/compat 2017-10-23 16:55:37 UTC (rev 14431)
@@ -1 +1 @@
-9
+10
Modified: packages/pybik/trunk/debian/control
===================================================================
--- packages/pybik/trunk/debian/control 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/control 2017-10-23 16:55:37 UTC (rev 14431)
@@ -3,16 +3,18 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: B. Clausius <barcc at gmx.de>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
+ dh-python,
cython3,
python3-all-dev (>= 3.4),
libgl1-mesa-dev,
- dh-python (>= 1.20130902-1~)
+ libgles2-mesa-dev,
+ qtbase5-dev,
+ qtbase5-dev-tools,
Build-Depends-Indep:
- gettext,
- intltool,
- help2man,
-Standards-Version: 3.9.6
+ gettext (>= 0.19.6),
+ python3-docutils,
+Standards-Version: 4.1.1
X-Python3-Version: >= 3.4
Homepage: https://launchpad.net/pybik/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pybik/trunk/
@@ -21,19 +23,19 @@
Package: pybik
Architecture: all
Depends: ${python3:Depends}, ${misc:Depends},
- python3-pyqt5 (>= 5.4),
pybik-bin (>= ${source:Version}),
- pybik-bin (<< ${source:Version}.1~)
+ pybik-bin (<< ${source:Version}.1~),
Recommends: python3-icu,
qttranslations5-l10n,
Description: Rubik's cube game
Pybik is a 3D puzzle game about the cube invented by Ernő Rubik.
- * Different 3D puzzles - up to 10x10x10:
- cubes, towers, bricks, tetrahedra and prisms
+ .
+ * Various 3D puzzles, such as cubes, towers, prisms, tetrahedra, octahedra,
+ dodecahedra and many more
* Solvers for some puzzles
* Pretty patterns
* Editor for move sequences
- * Changeable colors and images
+ * Custom colors and images on the surface of the puzzles
Package: pybik-bin
Architecture: any
Modified: packages/pybik/trunk/debian/copyright
===================================================================
--- packages/pybik/trunk/debian/copyright 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/copyright 2017-10-23 16:55:37 UTC (rev 14431)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Pybik
Upstream-Contact: B. Clausius <barcc at gmx.de>
Source: https://launchpad.net/pybik/+download
@@ -11,8 +11,8 @@
* Dale Mellor <dale_mellor at users.sourceforge.net>
Files: *
-Copyright: 2009-2015 B. Clausius <barcc at gmx.de>
-License: GPL-3+
+Copyright: 2009-2017 B. Clausius <barcc at gmx.de>
+License: GPL-3.0+
Files: data/ui/images/BEAMED?EIGHTH?NOTES.png
data/ui/images/ATOM?SYMBOL.png
@@ -20,7 +20,7 @@
data/ui/images/WHITE?SUN?WITH?RAYS.png
Copyright: 2002-2010 Free Software Foundation
2012 B. Clausius <barcc at gmx.de>
-License: GPL-3+
+License: GPL-3.0+
Comment: Images created from font FreeSerif:
U+266B BEAMED EIGHTH NOTES
U+269B ATOM SYMBOL
@@ -52,7 +52,7 @@
U+263A WHITE SMILING FACE
U+263B BLACK SMILING FACE
-License: GPL-3+
+License: GPL-3.0+
This program 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
Modified: packages/pybik/trunk/debian/pybik-bin.install
===================================================================
--- packages/pybik/trunk/debian/pybik-bin.install 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/pybik-bin.install 2017-10-23 16:55:37 UTC (rev 14431)
@@ -1 +1 @@
-usr/lib/pybik/pybiklib/*.so
+usr/lib/pybik/pybiklib/ext/*.so
Modified: packages/pybik/trunk/debian/pybik.install
===================================================================
--- packages/pybik/trunk/debian/pybik.install 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/pybik.install 2017-10-23 16:55:37 UTC (rev 14431)
@@ -1,7 +1,5 @@
usr/share/
usr/lib/pybik/pybik
usr/lib/pybik/pybiklib/plugins/
-usr/lib/pybik/pybiklib/ui/
usr/lib/pybik/pybiklib/*.py
usr/lib/pybik/*.egg-info
-usr/lib/pybik/pybiktest/*
Modified: packages/pybik/trunk/debian/rules
===================================================================
--- packages/pybik/trunk/debian/rules 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/rules 2017-10-23 16:55:37 UTC (rev 14431)
@@ -3,6 +3,12 @@
#export DH_VERBOSE=1
#export PYBUILD_VERBOSE=1
+# lintian says:
+# This is needed (together with "relro") to make the "Global Offset Table"
+# (GOT) fully read-only. The bindnow feature trades startup time for
+# improved security. Please consider enabling this feature ...
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
else
@@ -11,6 +17,14 @@
PICKLE_PROTOCOL=4
export PYBIK_NO_SETUPTOOLS=1
+# pybik has to follow qt, and qtbase-opensource-src does this to select the gl variant:
+gles2_architectures := armel armhf
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
+ GLVARIANT = es2
+else
+ GLVARIANT = ogl
+endif
+
%:
dh $@ --with python3 --buildsystem=pybuild
@@ -19,7 +33,7 @@
rm -f debian/README
override_dh_auto_build-arch:
- dh_auto_build -- --build-args="--arch-only"
+ dh_auto_build -- --build-args="--arch-only --variants=$(GLVARIANT)"
override_dh_auto_build-indep:
python3 buildlib/create_docs.py --skip=Installation README=debian/README
@@ -47,14 +61,11 @@
PYBUILD_TEST_ARGS="{interpreter} -c 'import glob,pickle; \
[(print(\"test with {version}:\", f), pickle.load(open(f, \"rb\"))) \
for f in glob.glob(\"build/models/*\")]'" \
- dh_auto_test
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
+
override_dh_python3:
- # Python files in usr/share/pybik/tests/ are not modules
- # no other Python files in usr/share/pybik/
- dh_python3 -p pybik usr/lib/pybik/
+ dh_python3 -p pybik
dh_python3 -p pybik-bin usr/lib/pybik/pybiklib/
-override_dh_builddeb:
- dh_builddeb -- -Zxz
-
Added: packages/pybik/trunk/debian/upstream/signing-key.asc
===================================================================
--- packages/pybik/trunk/debian/upstream/signing-key.asc (rev 0)
+++ packages/pybik/trunk/debian/upstream/signing-key.asc 2017-10-23 16:55:37 UTC (rev 14431)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJZ7O+FAAoJEEDg0A3D0GN40j4P/2ut8jVgauSHDnxq6lc78rq1
+kNVQub5VP1sw3SHWTK9NY/DpVTO2KK3jO8VamRbtsDyKFWYvRnVGoVwnxBQorwT3
+FQqmjOUT/3OGZtrUt96XYXTlKI5+iKZCkklz8Z9fK8OfOJlZOnDZoNvxF3L3sSLU
+Kk7g8Gts/H04eUgBEvFZ84j0wqBNz+vG8NvzUhQJgF3D19wNGZ6iyCEkTMDuV2b8
+StRqnFA6w3xto1YKJtnp15bTLW1kBEnxCyuJCbzFvtBEeQ/FaFsg+2G9xNZ1SSEc
+C4w6gvShx9g0YTDwCSHP2rtnAXbwFuGZlGiEPg1JiYfxChBAKlMzoUVCu2nUdZq+
+MaG4Le5xTrTzkT5J8RxZzS6qRSb1QGX8+7s6z5O3dyQqYoUC4gIYrUYFGmWcYDoL
+Rq+hAMpjPpJ5r660Apv7L1uEOx/NWkpMrRI7dSJjfHloCARd2QY4aXfZx0J5toQt
+aCfZWNxKBi5EqM5UYFxa1DV3kvEV+J43RaCEwLN2cZb7KSbiyikbksOxu1y4UvOX
+s5xlBl8+x8uOxKM7acdDyB07rx3FMBcu4fq2pvE9oFDsLz+sIkhsC4sEtmSiYYtw
+LbrJBkpqnAIOZV4PdzT+v8CEXqQiQHbJgFdr8zzUUMZkfhdEYaW9GvQLyIkmdSjl
+MRz2vMgXPSg3AcYfZn8k
+=f2ys
+-----END PGP SIGNATURE-----
Deleted: packages/pybik/trunk/debian/upstream/signing-key.pgp
===================================================================
(Binary files differ)
Modified: packages/pybik/trunk/debian/watch
===================================================================
--- packages/pybik/trunk/debian/watch 2017-10-22 07:56:41 UTC (rev 14430)
+++ packages/pybik/trunk/debian/watch 2017-10-23 16:55:37 UTC (rev 14431)
@@ -1,3 +1,4 @@
-version=3
+version=4
opts=pgpsigurlmangle=s/$/.asc/ \
-https://launchpad.net/pybik/+download .*/pybik-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
+https://launchpad.net/pybik/+download \
+.*/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
More information about the Python-apps-commits
mailing list