Compiz

Merge lp:~muktupavels/compiz/ccsm-python3 into lp:compiz/0.9.13

  1. ccsm-python3
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4187
Merged at revision: 4190
Proposed branch: lp:~muktupavels/compiz/ccsm-python3
Merge into: lp:compiz/0.9.13
Diff against target: 560 lines (+88/-132)
18 files modified
compizconfig/ccsm/CMakeLists.txt (+7/-11)
compizconfig/ccsm/ccsm (+1/-1)
compizconfig/ccsm/setup.cfg (+2/-0)
compizconfig/ccsm/setup.py (+10/-10)
compizconfig/cmake/exec_setup_py_with_destdir.cmake (+2/-1)
compizconfig/compizconfig-python/CMakeLists.txt (+9/-30)
compizconfig/compizconfig-python/compizconfig-python.pc.in (+0/-13)
compizconfig/compizconfig-python/setup.py (+2/-3)
compizconfig/compizconfig-python/src/compizconfig.pyx (+4/-3)
compizconfig/compizconfig-python/tests/test_backend.py (+9/-9)
compizconfig/compizconfig-python/tests/test_plugin.py (+10/-10)
compizconfig/compizconfig-python/tests/test_setting.py (+14/-14)
debian/compizconfig-settings-manager.install (+1/-2)
debian/control (+14/-14)
debian/python-compizconfig.install (+0/-3)
debian/python-compizconfig.lintian-overrides (+0/-1)
debian/python3-compizconfig.install (+2/-0)
debian/rules (+1/-7)
To merge this branch: bzr merge lp:~muktupavels/compiz/ccsm-python3
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+351940@code.launchpad.net

Commit message

Port CCSM to Python 3.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

The code changes look good to me.

Wuth regards to debian packaging, I have not tested it yet but added some comments anyway.

review: Needs Fixing
lp:~muktupavels/compiz/ccsm-python3 updated
4183. By Alberts Muktupāvels

Port CCSM to Python 3.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

The packaging is fine now. For those who want to test it, it’s available in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3336.

Note that it will need a no-change rebuild for Python default version change (e.g. 3.6 → 3.7).

review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) :
lp:~muktupavels/compiz/ccsm-python3 updated
4184. By Alberts Muktupāvels

Remove python3-compizconfig.lintian-overrides.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Is this safe for unity? I didn't find anything related. But did you speak with 3v1n0?

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Why would it be unsafe? I don't see what problems this could cause except for regressions in ccsm because of python2 -> python3 and/or gtk 2 -> gtk 3, and/or pygtk to pygobject.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM. Still need to run this. Could you please take a look to the only line-comment?

Revision history for this message
Dmitry Shachnev (mitya57) :
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Would it make sense to rename compizconfig-python.pc into compizconfig-python3.pc? This way you would not need to break/replace it because the two new packages will not conflict. @3v1n0 what do you think?

lp:~muktupavels/compiz/ccsm-python3 updated
4185. By Alberts Muktupāvels

Rename compizconfig-python.pc to compizconfig-python3.pc and remove Breaks/Replaces.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

I think the .pc file for Python is just not needed, nothing is using it now.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

compizconfig-python3.pc:
prefix=/usr
exec_prefix=/usr/bin
libdir=/usr/lib/x86_64-linux-gnu
includedir=/usr/include
pyexecdir=

Name: compizconfig-python3
Version: 0.9.13.1
Description: Compiz configuration system bindings

Requires:
Libs: -L/usr/lib/x86_64-linux-gnu -lcompizconfig
Cflags: -I/usr/include/compizconfig

libcompizconfig.pc:
prefix=/usr
exec_prefix=/usr/bin
libdir=/usr/lib/x86_64-linux-gnu
includedir=/usr/include/compizconfig

Name: libcompizconfig
Description: Compiz configuration system
Version: 0.9.13.1

Requires: compiz
Libs: -L/usr/lib/x86_64-linux-gnu -lcompizconfig
Cflags: -I/usr/include/compizconfig

Both files would find libcompizconfig.so that is installed by libcompizconfig0-dev. Seems useless file to me.

lp:~muktupavels/compiz/ccsm-python3 updated
4186. By Alberts Muktupāvels

Remove compizconfig-python3.pc.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Changes looks good to me now. You need to propose a change for unity-autopilot too in order to get this accepted. Also a FFE is required (https://wiki.ubuntu.com/FreezeExceptionProcess)

Revision history for this message
Andrea Azzarone (azzar1) wrote :

unity-autopilot is python2 code. You have two options here:
1) have both python-compizconfig and python3-compizconfig
2) port unity-autopilot to python3 (tbh I'm not sure how much work this would be)

lp:~muktupavels/compiz/ccsm-python3 updated
4187. By Alberts Muktupāvels

Fix inconsistent use of tabs and spaces in indentation.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

unity-autopilot is ported in https://code.launchpad.net/~muktupavels/unity/+git/unity/+merge/359969. We finally got the tests to pass on all architectures, so let's ship it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'compizconfig/ccsm/CMakeLists.txt'
--- compizconfig/ccsm/CMakeLists.txt 2012-10-16 13:53:20 +0000
+++ compizconfig/ccsm/CMakeLists.txt 2018-09-05 09:24:50 +0000
@@ -10,14 +10,12 @@
1010
11# Get arch11# Get arch
12execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)12execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
13string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
1314
14# Get Python Version15# Get Python Version
15execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"16find_package (PythonInterp 3.0 REQUIRED)
16 OUTPUT_VARIABLE PY_VERSION)17
1718set (PY_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
18string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
19string (REPLACE "\n" "" PY_VERSION ${PY_VERSION})
20
21set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})19set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})
22set (PY_SCRIPTS_DIR scripts-${PY_VERSION})20set (PY_SCRIPTS_DIR scripts-${PY_VERSION})
2321
@@ -36,19 +34,17 @@
36set (VERSION ${COMPIZ_RELEASE_VERSION})34set (VERSION ${COMPIZ_RELEASE_VERSION})
3735
38add_custom_command (OUTPUT ${PY_CCSM_LIB}36add_custom_command (OUTPUT ${PY_CCSM_LIB}
39 COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}37 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
40 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}38 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
41 COMMENT "Generating Python Bytecode")39 COMMENT "Generating Python Bytecode")
4240
43add_custom_target (ccsm_module ALL DEPENDS41add_custom_target (ccsm_module ALL DEPENDS
44 ${PY_CCSM_LIB})42 ${PY_CCSM_LIB})
4543
46set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")44set (UNINSTALL_COMMAND "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
4745
48compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR})46compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR})
4947
50install (CODE48install (CODE
51 "message (\"Installing python files\")49 "message (\"Installing python files\")
52 execute_process (COMMAND cmake -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_SOURCE_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")50 execute_process (COMMAND cmake -DPY_EXECUTABLE=${PYTHON_EXECUTABLE} -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_SOURCE_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")
53
54
5551
=== modified file 'compizconfig/ccsm/ccsm'
--- compizconfig/ccsm/ccsm 2018-07-11 21:59:31 +0000
+++ compizconfig/ccsm/ccsm 2018-09-05 09:24:50 +0000
@@ -1,4 +1,4 @@
1#!/usr/bin/env python1#!/usr/bin/env python3
2# -*- coding: UTF-8 -*-2# -*- coding: UTF-8 -*-
33
4# This program is free software; you can redistribute it and/or4# This program is free software; you can redistribute it and/or
55
=== added file 'compizconfig/ccsm/setup.cfg'
--- compizconfig/ccsm/setup.cfg 1970-01-01 00:00:00 +0000
+++ compizconfig/ccsm/setup.cfg 2018-09-05 09:24:50 +0000
@@ -0,0 +1,2 @@
1[build]
2executable = /usr/bin/env python3
03
=== modified file 'compizconfig/ccsm/setup.py'
--- compizconfig/ccsm/setup.py 2013-04-28 04:26:33 +0000
+++ compizconfig/ccsm/setup.py 2018-09-05 09:24:50 +0000
@@ -1,4 +1,4 @@
1#!/usr/bin/env python1#!/usr/bin/env python3
22
3import sys, os, glob3import sys, os, glob
4import subprocess4import subprocess
@@ -48,15 +48,15 @@
48 # Update icon cache48 # Update icon cache
49 gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \49 gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \
50%s''' % icon_prefix50%s''' % icon_prefix
51 root_specified = len (filter (lambda s: s.startswith ("--root"),51 root_specified = len (list (filter (lambda s: s.startswith ("--root"),
52 sys.argv)) > 052 sys.argv))) > 0
53 if not root_specified:53 if not root_specified:
54 print "Updating Gtk icon cache."54 print ("Updating Gtk icon cache.")
55 os.system (gtk_update_icon_cache)55 os.system (gtk_update_icon_cache)
56 outputs.append (icon_theme_cache)56 outputs.append (icon_theme_cache)
57 else:57 else:
58 print '''*** Icon cache not updated. After install, run this:58 print ('''*** Icon cache not updated. After install, run this:
59*** %s''' % gtk_update_icon_cache59*** %s''' % gtk_update_icon_cache)
6060
61 length = 061 length = 0
62 if self.root:62 if self.root:
@@ -64,7 +64,7 @@
64 if self.prefix:64 if self.prefix:
65 length += len (self.prefix)65 length += len (self.prefix)
66 if length:66 if length:
67 for counter in xrange (len (outputs)):67 for counter in range (len (outputs)):
68 outputs[counter] = outputs[counter][length:]68 outputs[counter] = outputs[counter][length:]
69 data = "\n".join (outputs)69 data = "\n".join (outputs)
70 try:70 try:
@@ -114,10 +114,10 @@
114 if self.prefix:114 if self.prefix:
115 prepend += self.prefix115 prepend += self.prefix
116 if len (prepend):116 if len (prepend):
117 for counter in xrange (len (files)):117 for counter in range (len (files)):
118 files[counter] = prepend + files[counter].rstrip ()118 files[counter] = prepend + files[counter].rstrip ()
119 for file in files:119 for file in files:
120 print "Uninstalling %s" % file120 print ("Uninstalling %s" % file)
121 try:121 try:
122 os.unlink (file)122 os.unlink (file)
123 except:123 except:
@@ -126,7 +126,7 @@
126ops = ("install", "build", "sdist", "uninstall", "clean")126ops = ("install", "build", "sdist", "uninstall", "clean")
127127
128if len (sys.argv) < 2 or sys.argv[1] not in ops:128if len (sys.argv) < 2 or sys.argv[1] not in ops:
129 print "Please specify operation : %s" % " | ".join (ops)129 print ("Please specify operation : %s" % " | ".join (ops))
130 raise SystemExit130 raise SystemExit
131131
132prefix = None132prefix = None
133133
=== modified file 'compizconfig/cmake/exec_setup_py_with_destdir.cmake'
--- compizconfig/cmake/exec_setup_py_with_destdir.cmake 2012-09-06 12:17:40 +0000
+++ compizconfig/cmake/exec_setup_py_with_destdir.cmake 2018-09-05 09:24:50 +0000
@@ -1,3 +1,4 @@
1set (PY_EXECUTABLE "" CACHE FORCE "Python executable")
1set (WDIR "" CACHE FORCE "Working Directory")2set (WDIR "" CACHE FORCE "Working Directory")
2set (PREFIX "" CACHE FORCE "Prefix")3set (PREFIX "" CACHE FORCE "Prefix")
3set (SETUP "" CACHE FORCE "Path to setup.py")4set (SETUP "" CACHE FORCE "Path to setup.py")
@@ -21,5 +22,5 @@
21 set (EXTRAARGS "--install-layout=deb")22 set (EXTRAARGS "--install-layout=deb")
22endif (BUILD_DEB)23endif (BUILD_DEB)
2324
24execute_process (COMMAND python ${SETUP} install ${EXTRAARGS} --prefix=${PREFIX} --version=${VERSION} ${INSTALL_ROOT_ARGS}25execute_process (COMMAND ${PY_EXECUTABLE} ${SETUP} install ${EXTRAARGS} --prefix=${PREFIX} --version=${VERSION} ${INSTALL_ROOT_ARGS}
25 WORKING_DIRECTORY ${WDIR})26 WORKING_DIRECTORY ${WDIR})
2627
=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
--- compizconfig/compizconfig-python/CMakeLists.txt 2018-06-27 10:30:36 +0000
+++ compizconfig/compizconfig-python/CMakeLists.txt 2018-09-05 09:24:50 +0000
@@ -3,34 +3,20 @@
33
4# Get arch4# Get arch
5execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)5execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
66string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
7# Get Python Version7
8execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"8find_package (PythonInterp 3.0 REQUIRED)
9 OUTPUT_VARIABLE PY_VERSION)9find_package (PythonLibs 3.0 REQUIRED)
10
11include (FindPkgConfig)
12pkg_check_modules (PYTHON python-2.7)
13
14# This is a workaround for a broken FindPythonLibs always finding the
15# wrong library version because PYTHON_LIBRARY is in the cache and
16# can't be overwritten
17string (REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" PYTHON_CURRENT_VERSION ${PY_VERSION})
18string (REPLACE "." "" PYTHON_CURRENT_VERSION_NO_DOTS ${PYTHON_CURRENT_VERSION})
19find_library (PYTHON_LIBRARY_LOCAL
20 NAMES python${PYTHON_CURRENT_VERSION_NO_DOTS} python${PYTHON_CURRENT_VERSION}
21 PATH_SUFFIXES python${PYTHON_CURRENT_VERSION}/config)
2210
23set (COMPIZCONFIG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include)11set (COMPIZCONFIG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include)
2412
25string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})13set (PY_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
26string (REPLACE "\n" "" PY_VERSION ${PY_VERSION})
27
28set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})14set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})
29set (PY_SCRIPTS_DIR scripts-${PY_VERSION})15set (PY_SCRIPTS_DIR scripts-${PY_VERSION})
30set (PY_COMPIZCONFIG_SRC ${CMAKE_CURRENT_BINARY_DIR}/compizconfig.c)16set (PY_COMPIZCONFIG_SRC ${CMAKE_CURRENT_BINARY_DIR}/compizconfig.c)
31set (PY_COMPIZCONFIG_CYTHON ${CMAKE_CURRENT_SOURCE_DIR}/src/compizconfig.pyx)17set (PY_COMPIZCONFIG_CYTHON ${CMAKE_CURRENT_SOURCE_DIR}/src/compizconfig.pyx)
3218
33find_program(CYTHON_BIN cython)19find_program(CYTHON_BIN cython3)
34if(NOT CYTHON_BIN)20if(NOT CYTHON_BIN)
35 message(FATAL_ERROR "Can not build because cython binary not found.")21 message(FATAL_ERROR "Can not build because cython binary not found.")
36endif()22endif()
@@ -44,9 +30,6 @@
44string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)30string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
45set (VERSION ${COMPIZ_RELEASE_VERSION})31set (VERSION ${COMPIZ_RELEASE_VERSION})
4632
47configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compizconfig-python.pc.in
48 ${CMAKE_CURRENT_BINARY_DIR}/compizconfig-python.pc)
49
50include_directories (${PYTHON_INCLUDE_DIRS}33include_directories (${PYTHON_INCLUDE_DIRS}
51 ${COMPIZCONFIG_INCLUDE_DIRS})34 ${COMPIZCONFIG_INCLUDE_DIRS})
5235
@@ -76,16 +59,13 @@
76 compizconfig)59 compizconfig)
7760
78target_link_libraries (compizconfig_python_module61target_link_libraries (compizconfig_python_module
79 ${PYTHON_LIBRARY_LOCAL}62 ${PYTHON_LIBRARIES}
80 compizconfig)63 compizconfig)
8164
82set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")65set (UNINSTALL_COMMAND "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
8366
84compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_BINARY_DIR})67compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_BINARY_DIR})
8568
86install (FILES ${CMAKE_CURRENT_BINARY_DIR}/compizconfig-python.pc
87 DESTINATION ${libdir}/pkgconfig)
88
89# This is probably not very portable, but we can't install using distutils69# This is probably not very portable, but we can't install using distutils
90# as we cannot build with it safely70# as we cannot build with it safely
9171
@@ -102,12 +82,11 @@
10282
103install (CODE83install (CODE
104 "message (\"Installing python files\")84 "message (\"Installing python files\")
105 execute_process (COMMAND cmake -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_BINARY_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")85 execute_process (COMMAND cmake -DPY_EXECUTABLE=${PYTHON_EXECUTABLE} -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_BINARY_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")
10686
107if (COMPIZ_BUILD_TESTING)87if (COMPIZ_BUILD_TESTING)
10888
109 find_program (BASH_EXECUTABLE bash)89 find_program (BASH_EXECUTABLE bash)
110 find_program (PYTHON_EXECUTABLE python)
111 mark_as_advanced (FORCE PYTHON_EXECUTABLE)90 mark_as_advanced (FORCE PYTHON_EXECUTABLE)
11291
113 file (GLOB PYTHON_TESTS "tests/test_*.py")92 file (GLOB PYTHON_TESTS "tests/test_*.py")
11493
=== removed file 'compizconfig/compizconfig-python/compizconfig-python.pc.in'
--- compizconfig/compizconfig-python/compizconfig-python.pc.in 2012-09-04 01:00:10 +0000
+++ compizconfig/compizconfig-python/compizconfig-python.pc.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5pyexecdir=@pyexecdir@
6
7Name: compizconfig-python
8Version: @VERSION@
9Description: Compiz configuration system bindings
10
11Requires: @CCS_REQUIRES@
12Libs: @CCS_LIBS@ -L@libdir@ -lcompizconfig
13Cflags: @CCS_CFLAGS@ -I@includedir@/compizconfig
140
=== modified file 'compizconfig/compizconfig-python/setup.py'
--- compizconfig/compizconfig-python/setup.py 2018-07-16 23:14:30 +0000
+++ compizconfig/compizconfig-python/setup.py 2018-09-05 09:24:50 +0000
@@ -18,7 +18,6 @@
18 print ("CompizConfig Python [ERROR]: No libcompizconfig_internal.pc found in the pkg-config search path")18 print ("CompizConfig Python [ERROR]: No libcompizconfig_internal.pc found in the pkg-config search path")
19 print ("Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH")19 print ("Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH")
20 exit (1);20 exit (1);
21libs = pkgconfig_libs[2:].split (" ")[0]
2221
23INSTALLED_FILES = "installed_files"22INSTALLED_FILES = "installed_files"
2423
@@ -59,7 +58,7 @@
59 if self.prefix:58 if self.prefix:
60 length += len (self.prefix)59 length += len (self.prefix)
61 if length:60 if length:
62 for counter in xrange (len (outputs)):61 for counter in range (len (outputs)):
63 outputs[counter] = outputs[counter][length:]62 outputs[counter] = outputs[counter][length:]
64 data = "\n".join (outputs)63 data = "\n".join (outputs)
65 try:64 try:
@@ -109,7 +108,7 @@
109 if self.prefix:108 if self.prefix:
110 prepend += self.prefix109 prepend += self.prefix
111 if len (prepend):110 if len (prepend):
112 for counter in xrange (len (files)):111 for counter in range (len (files)):
113 files[counter] = prepend + files[counter].rstrip ()112 files[counter] = prepend + files[counter].rstrip ()
114 for file in files:113 for file in files:
115 print ("Uninstalling %s" % file)114 print ("Uninstalling %s" % file)
116115
=== modified file 'compizconfig/compizconfig-python/src/compizconfig.pyx'
--- compizconfig/compizconfig-python/src/compizconfig.pyx 2018-06-27 10:30:36 +0000
+++ compizconfig/compizconfig-python/src/compizconfig.pyx 2018-09-05 09:24:50 +0000
@@ -1,3 +1,4 @@
1# cython: c_string_type=str, c_string_encoding=ascii
1'''2'''
2This program is free software; you can redistribute it and/or3This program is free software; you can redistribute it and/or
3modify it under the terms of the GNU Lesser General Public License4modify it under the terms of the GNU Lesser General Public License
@@ -770,10 +771,10 @@
770 if t == TypeString and i.forString.extensible:771 if t == TypeString and i.forString.extensible:
771 self.hasExtendedString = True772 self.hasExtendedString = True
772773
773 if not self.ranking.has_key (ccsSettingGetName (sett)):774 if ccsSettingGetName (sett) not in self.ranking:
774 self.ranking[ccsSettingGetName (sett)] = rank775 self.ranking[ccsSettingGetName (sett)] = rank
775 rank = rank + 1776 rank = rank + 1
776 777
777 setlist = setlist.next778 setlist = setlist.next
778779
779 self.loaded = True780 self.loaded = True
@@ -1136,7 +1137,7 @@
1136 cat = ''1137 cat = ''
1137 else:1138 else:
1138 cat = ccsPluginGetCategory (pl)1139 cat = ccsPluginGetCategory (pl)
1139 if not self.categories.has_key (cat):1140 if cat not in self.categories:
1140 self.categories[cat] = []1141 self.categories[cat] = []
1141 self.categories[cat].append (self.plugins[ccsPluginGetName (pl)])1142 self.categories[cat].append (self.plugins[ccsPluginGetName (pl)])
1142 pll = pll.next1143 pll = pll.next
11431144
=== modified file 'compizconfig/compizconfig-python/tests/test_backend.py'
--- compizconfig/compizconfig-python/tests/test_backend.py 2012-05-21 15:40:47 +0000
+++ compizconfig/compizconfig-python/tests/test_backend.py 2018-09-05 09:24:50 +0000
@@ -5,15 +5,15 @@
55
6 def runTest (self):6 def runTest (self):
77
8 info = ["ini", "Ini Backend", "Flat File Backend", True, False]8 info = ["ini", "Ini Backend", "Flat File Backend", True, False]
99
10 backend = self.ccs.Backend (self.context, info)10 backend = self.ccs.Backend (self.context, info)
1111
12 self.assertEqual (backend.Name, "ini")12 self.assertEqual (backend.Name, "ini")
13 self.assertEqual (backend.ShortDesc, "Ini Backend")13 self.assertEqual (backend.ShortDesc, "Ini Backend")
14 self.assertEqual (backend.LongDesc, "Flat File Backend")14 self.assertEqual (backend.LongDesc, "Flat File Backend")
15 self.assertEqual (backend.IntegrationSupport, False)15 self.assertEqual (backend.IntegrationSupport, False)
16 self.assertEqual (backend.ProfileSupport, True)16 self.assertEqual (backend.ProfileSupport, True)
1717
18if __name__ == '__main__':18if __name__ == '__main__':
19 unittest.main()19 unittest.main()
2020
=== modified file 'compizconfig/compizconfig-python/tests/test_plugin.py'
--- compizconfig/compizconfig-python/tests/test_plugin.py 2012-10-16 13:53:20 +0000
+++ compizconfig/compizconfig-python/tests/test_plugin.py 2018-09-05 09:24:50 +0000
@@ -4,17 +4,17 @@
4class CompizConfigTestPlugin (compiz_config_test.CompizConfigTest):4class CompizConfigTestPlugin (compiz_config_test.CompizConfigTest):
55
6 def runTest (self):6 def runTest (self):
7 plugin = self.ccs.Plugin (self.context, "mock")7 plugin = self.ccs.Plugin (self.context, "mock")
8 plugin.Update ()8 plugin.Update ()
99
10 self.assertEqual (plugin.Context, self.context)10 self.assertEqual (plugin.Context, self.context)
11 self.assertTrue ("A Mock Group" in plugin.Groups)11 self.assertTrue ("A Mock Group" in plugin.Groups)
12 self.assertTrue (plugin.Screen is not None)12 self.assertTrue (plugin.Screen is not None)
13 self.assertEqual (plugin.Name, "mock")13 self.assertEqual (plugin.Name, "mock")
14 self.assertEqual (plugin.ShortDesc, "Mock")14 self.assertEqual (plugin.ShortDesc, "Mock")
15 self.assertEqual (plugin.LongDesc, "Mock plugin")15 self.assertEqual (plugin.LongDesc, "Mock plugin")
16 self.assertEqual (plugin.Category, "Mocks")16 self.assertEqual (plugin.Category, "Mocks")
17 self.assertEqual (plugin.Features, ["mocking"])17 self.assertEqual (plugin.Features, ["mocking"])
1818
19if __name__ == '__main__':19if __name__ == '__main__':
20 unittest.main()20 unittest.main()
2121
=== modified file 'compizconfig/compizconfig-python/tests/test_setting.py'
--- compizconfig/compizconfig-python/tests/test_setting.py 2012-10-16 13:53:20 +0000
+++ compizconfig/compizconfig-python/tests/test_setting.py 2018-09-05 09:24:50 +0000
@@ -5,21 +5,21 @@
55
6 def runTest (self):6 def runTest (self):
77
8 plugin = self.context.Plugins["mock"]8 plugin = self.context.Plugins["mock"]
9 setting = self.ccs.Setting (plugin, "mock")9 setting = self.ccs.Setting (plugin, "mock")
1010
11 self.assertEqual (setting.Plugin, plugin)11 self.assertEqual (setting.Plugin, plugin)
12 self.assertEqual (setting.Name, "mock")12 self.assertEqual (setting.Name, "mock")
13 self.assertEqual (setting.ShortDesc, "Mock Setting")13 self.assertEqual (setting.ShortDesc, "Mock Setting")
14 self.assertEqual (setting.LongDesc, "A Mock Setting")14 self.assertEqual (setting.LongDesc, "A Mock Setting")
15 self.assertEqual (setting.Group, "A Mock Group")15 self.assertEqual (setting.Group, "A Mock Group")
16 self.assertEqual (setting.SubGroup, "A Mock Subgroup")16 self.assertEqual (setting.SubGroup, "A Mock Subgroup")
17 self.assertEqual (setting.Type, "String")17 self.assertEqual (setting.Type, "String")
18 self.assertEqual (setting.Hints, [])18 self.assertEqual (setting.Hints, [])
19 self.assertEqual (setting.DefaultValue, "Mock Value")19 self.assertEqual (setting.DefaultValue, "Mock Value")
20 self.assertEqual (setting.Value, "Mock Value")20 self.assertEqual (setting.Value, "Mock Value")
21 self.assertEqual (setting.Integrated, False)21 self.assertEqual (setting.Integrated, False)
22 self.assertEqual (setting.ReadOnly, False)22 self.assertEqual (setting.ReadOnly, False)
2323
24if __name__ == '__main__':24if __name__ == '__main__':
25 unittest.main()25 unittest.main()
2626
=== modified file 'debian/compizconfig-settings-manager.install'
--- debian/compizconfig-settings-manager.install 2012-06-19 11:22:48 +0000
+++ debian/compizconfig-settings-manager.install 2018-09-05 09:24:50 +0000
@@ -2,6 +2,5 @@
2debian/tmp/usr/share/applications/ccsm.desktop2debian/tmp/usr/share/applications/ccsm.desktop
3debian/tmp/usr/share/icons/hicolor/*/apps/ccsm.*3debian/tmp/usr/share/icons/hicolor/*/apps/ccsm.*
4debian/tmp/usr/lib/python*/*/ccm*4debian/tmp/usr/lib/python*/*/ccm*
5debian/tmp/usr/lib/python2.7/dist-packages/ccsm*5debian/tmp/usr/lib/*/dist-packages/ccsm*
6debian/tmp/usr/share/ccsm6debian/tmp/usr/share/ccsm
7
87
=== modified file 'debian/control'
--- debian/control 2018-07-24 10:32:11 +0000
+++ debian/control 2018-09-05 09:24:50 +0000
@@ -7,6 +7,7 @@
7Build-Depends: cmake (>= 2.8.12),7Build-Depends: cmake (>= 2.8.12),
8 debhelper (>= 9~),8 debhelper (>= 9~),
9 dh-migrations,9 dh-migrations,
10 dh-python,
10 dh-translations,11 dh-translations,
11 googletest (>= 1.8.0),12 googletest (>= 1.8.0),
12 intltool,13 intltool,
@@ -52,12 +53,11 @@
52 libx11-xcb-dev,53 libx11-xcb-dev,
53 libprotobuf-dev,54 libprotobuf-dev,
54 protobuf-compiler,55 protobuf-compiler,
55 python-all-dev,56 python3-all-dev,
56 cython,57 cython3,
57 gsettings-desktop-schemas-dev,58 gsettings-desktop-schemas-dev,
58 xserver-xorg-dev (>= 0.7.0),59 xserver-xorg-dev (>= 0.7.0),
59Standards-Version: 3.9.860Standards-Version: 3.9.8
60X-Python-Version: >= 2.7
61# If you aren't a member of ~compiz-team but need to upload packaging changes,61# If you aren't a member of ~compiz-team but need to upload packaging changes,
62# just go ahead. ~compiz-team will notice and sync up the code again.62# just go ahead. ~compiz-team will notice and sync up the code again.
63Vcs-Bzr: https://code.launchpad.net/~compiz-team/compiz/0.9.1063Vcs-Bzr: https://code.launchpad.net/~compiz-team/compiz/0.9.10
@@ -148,7 +148,7 @@
148Pre-Depends: ${misc:Pre-Depends}148Pre-Depends: ${misc:Pre-Depends}
149Depends: ${shlibs:Depends},149Depends: ${shlibs:Depends},
150 ${misc:Depends},150 ${misc:Depends},
151 ${python:Depends},151 ${python3:Depends},
152 compiz-plugins-default (= ${binary:Version}),152 compiz-plugins-default (= ${binary:Version}),
153 gsettings-desktop-schemas,153 gsettings-desktop-schemas,
154 gnome-settings-daemon-schemas (>= 3.4.2-0ubuntu9),154 gnome-settings-daemon-schemas (>= 3.4.2-0ubuntu9),
@@ -172,10 +172,10 @@
172Pre-Depends: ${misc:Pre-Depends}172Pre-Depends: ${misc:Pre-Depends}
173Depends: ${shlibs:Depends},173Depends: ${shlibs:Depends},
174 ${misc:Depends},174 ${misc:Depends},
175 ${python:Depends},175 ${python3:Depends},
176 compiz-gnome,176 compiz-gnome,
177 mate-settings-daemon,177 mate-settings-daemon,
178 python178 python3
179Recommends: ubuntu-mate-wallpapers-common,179Recommends: ubuntu-mate-wallpapers-common,
180Description: OpenGL window and compositing manager - MATE integration180Description: OpenGL window and compositing manager - MATE integration
181 Compiz brings to life a variety of visual effects that make the Linux desktop181 Compiz brings to life a variety of visual effects that make the Linux desktop
@@ -289,13 +289,13 @@
289 This package contains the headers and development files needed to289 This package contains the headers and development files needed to
290 build plugins with settings support.290 build plugins with settings support.
291291
292Package: python-compizconfig292Package: python3-compizconfig
293Architecture: any293Architecture: any
294Multi-Arch: same294Multi-Arch: same
295Section: python295Section: python
296Pre-Depends: ${misc:Pre-Depends}296Pre-Depends: ${misc:Pre-Depends}
297Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}297Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
298Provides: ${python:Provides}298Provides: ${python3:Provides}
299Description: Compizconfig bindings for Python299Description: Compizconfig bindings for Python
300 Compiz Fusion is the result of the re-unification of the Beryl-project300 Compiz Fusion is the result of the re-unification of the Beryl-project
301 and the community around the Compiz Window Manager. It seeks to provide301 and the community around the Compiz Window Manager. It seeks to provide
@@ -308,17 +308,17 @@
308Package: compizconfig-settings-manager308Package: compizconfig-settings-manager
309Architecture: all309Architecture: all
310Multi-Arch: allowed310Multi-Arch: allowed
311XB-Python-Version: ${python:Versions}311XB-Python3-Version: ${python3:Versions}
312Pre-Depends: ${misc:Pre-Depends}312Pre-Depends: ${misc:Pre-Depends}
313Depends: ${shlibs:Depends},313Depends: ${shlibs:Depends},
314 ${misc:Depends},314 ${misc:Depends},
315 ${python:Depends},315 ${python3:Depends},
316 gir1.2-gdkpixbuf-2.0,316 gir1.2-gdkpixbuf-2.0,
317 gir1.2-gtk-3.0,317 gir1.2-gtk-3.0,
318 gir1.2-pango-1.0,318 gir1.2-pango-1.0,
319 python-compizconfig (>= ${source:Version}),319 python3-compizconfig (>= ${source:Version}),
320 python-gi,320 python3-gi,
321 python-gi-cairo,321 python3-gi-cairo,
322Recommends: compiz-plugins-default322Recommends: compiz-plugins-default
323Description: Compiz configuration settings manager323Description: Compiz configuration settings manager
324 The OpenCompositing Project brings 3D desktop visual effects that improve324 The OpenCompositing Project brings 3D desktop visual effects that improve
325325
=== removed file 'debian/python-compizconfig.install'
--- debian/python-compizconfig.install 2014-11-25 19:25:20 +0000
+++ debian/python-compizconfig.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1usr/lib/*/*/compizconfig.*.so
2usr/lib/*/pkgconfig/compizconfig-python.pc
3usr/lib/*/dist-packages/compizconfig_python*
40
=== removed file 'debian/python-compizconfig.lintian-overrides'
--- debian/python-compizconfig.lintian-overrides 2012-06-19 11:22:48 +0000
+++ debian/python-compizconfig.lintian-overrides 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1python-compizconfig: binary-or-shlib-defines-rpath
20
=== added file 'debian/python3-compizconfig.install'
--- debian/python3-compizconfig.install 1970-01-01 00:00:00 +0000
+++ debian/python3-compizconfig.install 2018-09-05 09:24:50 +0000
@@ -0,0 +1,2 @@
1usr/lib/*/*/compizconfig.so
2usr/lib/*/dist-packages/compizconfig_python*
03
=== modified file 'debian/rules'
--- debian/rules 2018-08-28 09:03:07 +0000
+++ debian/rules 2018-09-05 09:24:50 +0000
@@ -5,7 +5,6 @@
55
6include /usr/share/dpkg/architecture.mk6include /usr/share/dpkg/architecture.mk
77
8python2_version := $(shell pyversions --requested --version debian/control)
9gles2_architectures := armel armhf8gles2_architectures := armel armhf
10build_testing := OFF9build_testing := OFF
1110
@@ -59,11 +58,6 @@
59 # work around having a file with a conflicted special name (#1156294)58 # work around having a file with a conflicted special name (#1156294)
60 cp debian/compizconfig debian/tmp/config59 cp debian/compizconfig debian/tmp/config
6160
62 # accommodate Python's just-gotta-be-different approach to multi-arch
63 python2_dir=debian/tmp/usr/lib/python$(python2_version)/dist-packages; \
64 mv $${python2_dir}/compizconfig.so \
65 $${python2_dir}/compizconfig.$(DEB_HOST_MULTIARCH).so
66
67 dh_install --fail-missing61 dh_install --fail-missing
6862
69 # remove the compizconfig dev file from compiz-dev63 # remove the compizconfig dev file from compiz-dev
@@ -76,5 +70,5 @@
76 dh_auto_test --no-parallel70 dh_auto_test --no-parallel
7771
78%:72%:
79 dh $@ --parallel --with python2,migrations,translations73 dh $@ --parallel --with python3,migrations,translations
8074

Subscribers

People subscribed via source and target branches