OSDN > ソフトウェアを探す > システム > OS配布 > Live CD > SereneLinux > SCM > git > serene-cleaner > コミット

SereneLinux
Fork
ottosei
Googleassistant
BuildMyDistro
NonFreeRepo
rules-and-use
serene-cleaner
serene-setup-wizard
Ubiquity-Slideshow-Serene-Release
arrest
loginmsg
serene-bodhibuilder
MyBrowser
BasixToXfce
serenelinux-system-pkg

R/O
HTTP
SSH
HTTPS

serene-cleaner: コミット

コミットメタ情報

リビジョン	5931b427499d63174c42e93cffe1d43dd11ab111 (tree)
日時	2019-06-12 20:04:46
作者	ksmt4699 <ksmt4699@gmai...>
コミッター	ksmt4699

ログメッセージ

Ubuntuからsereneに全置換え

変更サマリ

modified: .gitignore (diff)
add: .vscode/launch.json (diff)
modified: MANIFEST.in (diff)
modified: Makefile (diff)
modified: README.md (diff)
modified: data/com.ubuntu-cleaner.daemon.policy (diff)
modified: data/com.ubuntu_cleaner.daemon.service (diff)
modified: data/ubuntu-cleaner-daemon (diff)
modified: data/ubuntu-cleaner-daemon.conf (diff)
modified: data/ubuntu-cleaner.desktop (diff)
modified: data/ui/mainwindow.xml (diff)
modified: data/ui/traceback.xml (diff)
modified: setup.py (diff)
modified: tests/test_app.py (diff)
modified: tests/test_janitor.py (diff)
modified: tests/test_janitor_plugins.py (diff)
delete: ubuntu-cleaner => serene-cleaner
modified: ubuntucleaner/daemon/__init__.py (diff)
modified: ubuntucleaner/daemon/dbusproxy.py (diff)
modified: ubuntucleaner/daemon/service.py (diff)
modified: ubuntucleaner/gui/__init__.py (diff)
modified: ubuntucleaner/gui/gtk.py (diff)
modified: ubuntucleaner/janitor/__init__.py (diff)
modified: ubuntucleaner/janitor/aptcache_plugin.py (diff)
modified: ubuntucleaner/janitor/autoremoval_plugin.py (diff)
modified: ubuntucleaner/janitor/chrome_plugin.py (diff)
modified: ubuntucleaner/janitor/empathy_plugin.py (diff)
modified: ubuntucleaner/janitor/googleearth_plugin.py (diff)
modified: ubuntucleaner/janitor/mozilla_plugin.py (diff)
modified: ubuntucleaner/janitor/oldkernel_plugin.py (diff)
modified: ubuntucleaner/janitor/opera_plugin.py (diff)
modified: ubuntucleaner/janitor/packageconfigs_plugin.py (diff)
modified: ubuntucleaner/janitor/softwarecenter_plugin.py (diff)
modified: ubuntucleaner/janitor/thumbnailcache_plugin.py (diff)
modified: ubuntucleaner/main.py (diff)
modified: ubuntucleaner/modules/__init__.py (diff)
modified: ubuntucleaner/settings/constants.py (diff)
modified: ubuntucleaner/settings/debug.py (diff)
modified: ubuntucleaner/utils/package.py (diff)
modified: ubuntucleaner/utils/system.py (diff)

差分

--- a/.gitignore

+++ b/.gitignore

		@@ -4,5 +4,5 @@
4	4	# Deb builds
5	5	deb_dist/
6	6	dist/
7		-ubuntu_cleaner.egg-info/
8		-ubuntu-cleaner-*.tar.gz
		\ No newline at end of file
	7	+serene_cleaner.egg-info/
	8	+serene-cleaner-*.tar.gz
		\ No newline at end of file

--- /dev/null

+++ b/.vscode/launch.json

		@@ -0,0 +1,15 @@
	1	+{
	2	+ // IntelliSense を使用して利用可能な属性を学べます。
	3	+ // 既存の属性の説明をホバーして表示します。
	4	+ // 詳細情報は次を確認してください: https://go.microsoft.com/fwlink/?linkid=830387
	5	+ "version": "0.2.0",
	6	+ "configurations": [
	7	+ {
	8	+ "name": "Python: Current File",
	9	+ "type": "python",
	10	+ "request": "launch",
	11	+ "program": "${file}",
	12	+ "console": "integratedTerminal"
	13	+ }
	14	+ ]
	15	+}
		\ No newline at end of file

--- a/MANIFEST.in

+++ b/MANIFEST.in

		@@ -1,2 +1,2 @@
1	1	include COPYING README.md
2		-recursive-include data .png .xml .desktop .conf .service .policy ubuntu-cleaner-daemon
	2	+recursive-include data .png .xml .desktop .conf .service .policy serene-cleaner-daemon

--- a/Makefile

+++ b/Makefile

		@@ -1,9 +1,9 @@
1	1	deb:
2		- python setup.py --command-packages=stdeb.command sdist_dsc --package ubuntu-cleaner bdist_deb
	2	+ python setup.py --command-packages=stdeb.command sdist_dsc --package serene-cleaner bdist_deb
3	3
4	4	clean:
5		- @rm -rf deb_dist dist ubuntu_cleaner.egg-info
6		- @rm -f ubuntu-cleaner*.tar.gz
	5	+ @rm -rf deb_dist dist serene_cleaner.egg-info
	6	+ @rm -f serene-cleaner*.tar.gz
7	7
8	8	test:
9	9	python -m unittest discover tests

--- a/README.md

+++ b/README.md

		@@ -1,11 +1,11 @@
1		-# Ubuntu Cleaner #
	1	+# serene-cleaner #
2	2
3		-![license](https://img.shields.io/github/license/gerardpuig/ubuntu-cleaner.svg)
	3	+![license](https://img.shields.io/github/license/gerardpuig/serene-cleaner.svg)
4	4
5	5	![screenshot](data/screenshot.png)
6	6
7	7	### Introduction ###
8		-Ubuntu Cleaner is a tool that makes it easy to clean your Ubuntu system. Ubuntu Cleaner can free up disk space and remove private information from your computer.
	8	+serene-cleaner is a tool that makes it easy to clean your serene system. serene-cleaner can free up disk space and remove private information from your computer.
9	9
10	10	- Clear browser cache
11	11	- Clear APT cache

		@@ -20,21 +20,21 @@ Installation via PPA:
20	20	$ sudo apt install software-properties-common
21	21	$ sudo add-apt-repository ppa:gerardpuig/ppa
22	22	$ sudo apt update
23		-$ sudo apt install ubuntu-cleaner
	23	+$ sudo apt install serene-cleaner
24	24	```
25		-Installation via .DEB (for unsupported Ubuntu versions only):
	25	+Installation via .DEB (for unsupported serene versions only):
26	26	```
27		-$ wget https://launchpad.net/~gerardpuig/+archive/ubuntu/ppa/+files/ubuntu-cleaner_1.0.4-1_all.deb
28		-$ sudo apt install ./ubuntu-cleaner_1.0.4-1_all.deb
29		-$ rm ubuntu-cleaner_1.0.4-1_all.deb
	27	+$ wget https://launchpad.net/~gerardpuig/+archive/serene/ppa/+files/serene-cleaner_1.0.4-1_all.deb
	28	+$ sudo apt install ./serene-cleaner_1.0.4-1_all.deb
	29	+$ rm serene-cleaner_1.0.4-1_all.deb
30	30	```
31	31	### Development ###
32	32	```
33		-$ git clone https://github.com/gerardpuig/ubuntu-cleaner.git
	33	+$ git clone https://github.com/gerardpuig/serene-cleaner.git
34	34	```
35	35	To run the program from source:
36	36	```
37		-$ ./ubuntu-cleaner
	37	+$ ./serene-cleaner
38	38	```
39	39	To run the unit tests:
40	40	```

		@@ -45,8 +45,3 @@ To create a .deb package:
45	45	$ make deb
46	46	$ make clean
47	47	```
48		-
49		-
50		-### Related websites ###
51		-* Blog <a href="http://ubuntu-cleaner.blogspot.com">http://ubuntu-cleaner.blogspot.com</a>.
52		-* Launchpad <a href="https://launchpad.net/~gerardpuig/+archive/ubuntu/ppa">https://launchpad.net/~gerardpuig/+archive/ubuntu/ppa</a>.

--- a/data/com.ubuntu-cleaner.daemon.policy

+++ b/data/com.ubuntu-cleaner.daemon.policy

		@@ -4,10 +4,10 @@
4	4	"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
5	5	<policyconfig>
6	6
7		- <vendor>Ubuntu Cleaner</vendor>
8		- <icon_name>ubuntu-cleaner</icon_name>
	7	+ <vendor>serene-cleaner</vendor>
	8	+ <icon_name>serene-cleaner</icon_name>
9	9
10		- <action id="com.ubuntu-cleaner.daemon.clean">
	10	+ <action id="com.serene-cleaner.daemon.clean">
11	11	<_description>
12	12	Clean user and system cruft
13	13	</_description>

--- a/data/com.ubuntu_cleaner.daemon.service

+++ b/data/com.ubuntu_cleaner.daemon.service

		@@ -1,4 +1,4 @@
1	1	[D-BUS Service]
2		-Name=com.ubuntu_cleaner.daemon
3		-Exec=/usr/share/ubuntu-cleaner/ubuntu-cleaner-daemon
	2	+Name=com.serene_cleaner.daemon
	3	+Exec=/usr/share/serene-cleaner/serene-cleaner-daemon
4	4	User=root

--- a/data/ubuntu-cleaner-daemon

+++ b/data/ubuntu-cleaner-daemon

		@@ -4,7 +4,7 @@ import dbus
4	4	import dbus.mainloop.glib
5	5	from gi.repository import GObject
6	6
7		-from ubuntucleaner.daemon.service import DaemonService
	7	+from serenecleaner.daemon.service import DaemonService
8	8
9	9
10	10	if __name__ == '__main__':

--- a/data/ubuntu-cleaner-daemon.conf

+++ b/data/ubuntu-cleaner-daemon.conf

		@@ -6,16 +6,16 @@
6	6	<busconfig>
7	7	<!-- Only root can own the service -->
8	8	<policy user="root">
9		- <allow own="com.ubuntu_cleaner.daemon"/>
10		- <allow send_interface="com.ubuntu_cleaner.daemon"/>
	9	+ <allow own="com.serene_cleaner.daemon"/>
	10	+ <allow send_interface="com.serene_cleaner.daemon"/>
11	11	</policy>
12	12
13	13	<!-- Allow anyone to invoke methods on the interfaces -->
14	14	<policy context="default">
15		- <allow send_interface="com.ubuntu_cleaner.daemon"/>
16		- <allow send_destination="com.ubuntu_cleaner.daemon"
	15	+ <allow send_interface="com.serene_cleaner.daemon"/>
	16	+ <allow send_destination="com.serene_cleaner.daemon"
17	17	send_interface="org.freedesktop.DBus.Introspectable"/>
18		- <allow send_destination="com.ubuntu_cleaner.daemon"
	18	+ <allow send_destination="com.serene_cleaner.daemon"
19	19	send_interface="org.freedesktop.DBus.Properties"/>
20	20	</policy>
21	21	</busconfig>

--- a/data/ubuntu-cleaner.desktop

+++ b/data/ubuntu-cleaner.desktop

		@@ -1,8 +1,8 @@
1	1	[Desktop Entry]
2		-Name=Ubuntu Cleaner
3		-Comment=Ubuntu Cleaner is a tool that makes it easy to clean your ubuntu system.
4		-Exec=ubuntu-cleaner
5		-Icon=ubuntu-cleaner
	2	+Name=serene-cleaner
	3	+Comment=serene-cleaner is a tool that makes it easy to clean your serene system.
	4	+Exec=serene-cleaner
	5	+Icon=serene-cleaner
6	6	Terminal=false
7	7	X-MultipleArgs=false
8	8	Type=Application

--- a/data/ui/mainwindow.xml

+++ b/data/ui/mainwindow.xml

		@@ -5,18 +5,18 @@
5	5	<property name="can_focus">False</property>
6	6	<property name="border_width">5</property>
7	7	<property name="type_hint">dialog</property>
8		- <property name="program_name">Ubuntu Cleaner</property>
	8	+ <property name="program_name">serene-cleaner</property>
9	9	<property name="copyright">Copyright © 2016 Gerard Puig</property>
10		- <property name="comments" translatable="yes">Ubuntu Cleaner is a tool for Ubuntu that makes it easy to configure your system and desktop settings.</property>
11		- <property name="license" translatable="yes">Ubuntu Cleaner 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 2 of the License, or (at your option) any later version.
12		-Ubuntu Cleaner 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.
13		-You should have received a copy of the GNU General Public License along with Ubuntu Cleaner; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</property>
	10	+ <property name="comments" translatable="yes">serene-cleaner is a tool for serene that makes it easy to configure your system and desktop settings.</property>
	11	+ <property name="license" translatable="yes">serene-cleaner 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 2 of the License, or (at your option) any later version.
	12	+serene-cleaner 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.
	13	+You should have received a copy of the GNU General Public License along with serene-cleaner; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</property>
14	14	<property name="authors">Gerard Puig <gerardpuigdev@gmail.com>
15	15
16		-Based on Ubuntu Tweak
	16	+Based on serene Tweak
17	17	Tualatrix Chou <tualatrix@gmail.com>
18	18	</property>
19		- <property name="logo_icon_name">ubuntu-cleaner</property>
	19	+ <property name="logo_icon_name">serene-cleaner</property>
20	20	<property name="wrap_license">True</property>
21	21	<property name="license_type">gpl-2-0</property>
22	22	<child internal-child="vbox">

		@@ -45,8 +45,8 @@ Tualatrix Chou <tualatrix@gmail.com>
45	45	<property name="width_request">900</property>
46	46	<property name="height_request">506</property>
47	47	<property name="can_focus">False</property>
48		- <property name="title">Ubuntu Cleaner</property>
49		- <property name="icon_name">ubuntu-cleaner</property>
	48	+ <property name="title">serene-cleaner</property>
	49	+ <property name="icon_name">serene-cleaner</property>
50	50	<signal name="destroy" handler="on_mainwindow_destroy" swapped="no"/>
51	51	<child>
52	52	<object class="GtkVBox" id="vbox1">

		@@ -84,7 +84,7 @@ Tualatrix Chou <tualatrix@gmail.com>
84	84	<property name="xalign">0</property>
85	85	<property name="yalign">0</property>
86	86	<property name="pixel_size">48</property>
87		- <property name="icon_name">ubuntu-cleaner</property>
	87	+ <property name="icon_name">serene-cleaner</property>
88	88	</object>
89	89	<packing>
90	90	<property name="expand">False</property>

--- a/data/ui/traceback.xml

+++ b/data/ui/traceback.xml

		@@ -4,7 +4,7 @@
4	4	<object class="GtkDialog" id="ErrorDialog">
5	5	<property name="can_focus">False</property>
6	6	<property name="border_width">5</property>
7		- <property name="title">Ubuntu Cleaner</property>
	7	+ <property name="title">serene-cleaner</property>
8	8	<property name="resizable">False</property>
9	9	<property name="window_position">center-on-parent</property>
10	10	<property name="type_hint">dialog</property>

		@@ -210,7 +210,7 @@ Please choose <i>Report</i> to file a new bug report. Make sure to i
210	210	<object class="GtkDialog" id="FatalDialog">
211	211	<property name="can_focus">False</property>
212	212	<property name="border_width">5</property>
213		- <property name="title">Ubuntu Cleaner</property>
	213	+ <property name="title">serene-cleaner</property>
214	214	<property name="resizable">False</property>
215	215	<property name="window_position">center-on-parent</property>
216	216	<property name="type_hint">dialog</property>

		@@ -348,7 +348,7 @@ Please choose <i>Report</i> to file a new bug report. Make sure to i
348	348	<property name="can_focus">False</property>
349	349	<property name="xalign">0</property>
350	350	<property name="yalign">0.30000001192092896</property>
351		- <property name="label" translatable="yes">Ubuntu Cleaner need to turn off.
	351	+ <property name="label" translatable="yes">serene-cleaner need to turn off.
352	352	If you'd like to help us fix the problem,
353	353	Please choose <i>Report</i> to file a new bug report. Make sure to include the error message below:</property>
354	354	<property name="use_markup">True</property>

--- a/ubuntu-cleaner

+++ b/serene-cleaner

		@@ -13,25 +13,25 @@ gi.require_version("Gtk", "3.0")
13	13	gi.require_version("Gdk", "3.0")
14	14	from gi.repository import GObject, Gdk, Gtk, Gio
15	15
16		-from ubuntucleaner.utils import system
17		-from ubuntucleaner.settings.constants import VERSION, IS_INSTALLED
18		-from ubuntucleaner.settings.debug import enable_debugging
	16	+from serenecleaner.utils import system
	17	+from serenecleaner.settings.constants import VERSION, IS_INSTALLED
	18	+from serenecleaner.settings.debug import enable_debugging
19	19
20	20
21	21	def parse_args(argv):
22		- parser = optparse.OptionParser(prog="ubuntu-cleaner",
	22	+ parser = optparse.OptionParser(prog="serene-cleaner",
23	23	version="%%prog %s" % VERSION,
24		- description="Ubuntu Cleaner is a tool that makes it easy to clean your ubuntu system.")
	24	+ description="serene-cleaner is a tool that makes it easy to clean your serene system.")
25	25	parser.add_option("-d", "--debug", action="store_true", default=False,
26	26	help="Generate more debugging information. [default: %default]")
27	27	return parser.parse_args(argv)
28	28
29	29
30		-class UbuntuCleanerApp(Gtk.Application):
	30	+class serenecleanerApp(Gtk.Application):
31	31	_window = None
32	32	log = logging.getLogger('Launcher')
33	33
34		- def __init__(self, application_id='com.ubuntu-cleaner.Clean'):
	34	+ def __init__(self, application_id='com.serene-cleaner.Clean'):
35	35	Gtk.Application.__init__(self,
36	36	application_id=application_id,
37	37	flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE)

		@@ -45,9 +45,9 @@ class UbuntuCleanerApp(Gtk.Application):
45	45	self.connect('command-line', self.on_command_line)
46	46
47	47	def on_startup(self, app):
48		- from ubuntucleaner.main import UbuntuCleanerWindow
	48	+ from serenecleaner.main import serenecleanerWindow
49	49
50		- self._window = UbuntuCleanerWindow()
	50	+ self._window = serenecleanerWindow()
51	51	self.add_window(self._window.mainwindow)
52	52
53	53	Gtk.main()

		@@ -72,5 +72,5 @@ if __name__ == "__main__":
72	72	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
73	73	dbus.mainloop.glib.threads_init()
74	74
75		- app = UbuntuCleanerApp()
	75	+ app = serenecleanerApp()
76	76	app.run(sys.argv)

--- a/setup.py

+++ b/setup.py

		@@ -1,26 +1,26 @@
1	1	import glob
2	2	from setuptools import setup, find_packages
3		-from ubuntucleaner import __version__
	3	+from serenecleaner import __version__
4	4
5	5	setup(
6		- name='ubuntu-cleaner',
	6	+ name='serene-cleaner',
7	7	version=__version__,
8		- description='Keep your ubuntu system clean has never been so easy!',
	8	+ description='Keep your serene system clean has never been so easy!',
9	9	author='Gerard Puig',
10	10	author_email='gerardpuigdev@gmail.com',
11		- scripts=['ubuntu-cleaner'],
	11	+ scripts=['serene-cleaner'],
12	12	packages=find_packages(exclude=['tests']),
13	13	data_files=[
14		- ('../etc/dbus-1/system.d/', ['data/ubuntu-cleaner-daemon.conf']),
15		- ('share/dbus-1/system-services', ['data/com.ubuntu_cleaner.daemon.service']),
16		- ('share/polkit-1/actions/', ['data/com.ubuntu-cleaner.daemon.policy']),
17		- ('share/applications/', ['data/ubuntu-cleaner.desktop']),
18		- ('share/ubuntu-cleaner/ui/', glob.glob('data/ui/*.xml')),
19		- ('share/icons/hicolor/128x128/apps/', ['data/icons/128x128/apps/ubuntu-cleaner.png']),
20		- ('share/icons/hicolor/64x64/apps/', ['data/icons/64x64/apps/ubuntu-cleaner.png']),
21		- ('share/icons/hicolor/48x48/apps/', ['data/icons/48x48/apps/ubuntu-cleaner.png']),
22		- ('share/icons/hicolor/32x32/apps/', ['data/icons/32x32/apps/ubuntu-cleaner.png']),
23		- ('share/ubuntu-cleaner/', ['data/ubuntu-cleaner-daemon']),
	14	+ ('../etc/dbus-1/system.d/', ['data/serene-cleaner-daemon.conf']),
	15	+ ('share/dbus-1/system-services', ['data/com.serene_cleaner.daemon.service']),
	16	+ ('share/polkit-1/actions/', ['data/com.serene-cleaner.daemon.policy']),
	17	+ ('share/applications/', ['data/serene-cleaner.desktop']),
	18	+ ('share/serene-cleaner/ui/', glob.glob('data/ui/*.xml')),
	19	+ ('share/icons/hicolor/128x128/apps/', ['data/icons/128x128/apps/serene-cleaner.png']),
	20	+ ('share/icons/hicolor/64x64/apps/', ['data/icons/64x64/apps/serene-cleaner.png']),
	21	+ ('share/icons/hicolor/48x48/apps/', ['data/icons/48x48/apps/serene-cleaner.png']),
	22	+ ('share/icons/hicolor/32x32/apps/', ['data/icons/32x32/apps/serene-cleaner.png']),
	23	+ ('share/serene-cleaner/', ['data/serene-cleaner-daemon']),
24	24	],
25	25	install_requires=[
26	26	'lxml',

--- a/tests/test_app.py

+++ b/tests/test_app.py

		@@ -1,10 +1,10 @@
1	1	import unittest
2		-from ubuntucleaner.main import UbuntuCleanerWindow
	2	+from serenecleaner.main import serenecleanerWindow
3	3
4	4
5	5	class TestApp(unittest.TestCase):
6	6	def setUp(self):
7		- self.window = UbuntuCleanerWindow()
	7	+ self.window = serenecleanerWindow()
8	8
9	9	def test_app(self):
10	10	self.assertEqual(self.window.feature_dict, {'janitor': 0})

--- a/tests/test_janitor.py

+++ b/tests/test_janitor.py

		@@ -1,6 +1,6 @@
1	1	import unittest
2	2
3		-from ubuntucleaner.janitor.oldkernel_plugin import OldKernelPlugin
	3	+from serenecleaner.janitor.oldkernel_plugin import OldKernelPlugin
4	4
5	5
6	6	class TestJanitorFunctions(unittest.TestCase):

--- a/tests/test_janitor_plugins.py

+++ b/tests/test_janitor_plugins.py

		@@ -1,7 +1,7 @@
1	1	import os
2	2	import unittest
3	3
4		-from ubuntucleaner.janitor.mozilla_plugin import FirefoxCachePlugin
	4	+from serenecleaner.janitor.mozilla_plugin import FirefoxCachePlugin
5	5
6	6
7	7	class TestJanitorPlugin(unittest.TestCase):

--- a/ubuntucleaner/daemon/__init__.py

+++ b/ubuntucleaner/daemon/__init__.py

		@@ -1,13 +1,13 @@
1	1	import dbus
2	2	import dbus.service
3	3
4		-PK_ACTION_CLEAN = 'com.ubuntu-cleaner.daemon.clean'
	4	+PK_ACTION_CLEAN = 'com.serene-cleaner.daemon.clean'
5	5
6	6
7	7	class AccessDeniedException(dbus.DBusException):
8	8	'''This exception is raised when some operation is not permitted.'''
9	9
10		- _dbus_error_name = 'com.ubuntu_cleaner.daemon.AccessDeniedException'
	10	+ _dbus_error_name = 'com.serene_cleaner.daemon.AccessDeniedException'
11	11
12	12
13	13	class PolicyKitService(dbus.service.Object):

--- a/ubuntucleaner/daemon/dbusproxy.py

+++ b/ubuntucleaner/daemon/dbusproxy.py

		@@ -5,8 +5,8 @@ log = logging.getLogger("DbusProxy")
5	5
6	6
7	7	class DbusProxy:
8		- INTERFACE = "com.ubuntu_cleaner.daemon"
9		- PATH = "/com/ubuntu_cleaner/daemon"
	8	+ INTERFACE = "com.serene_cleaner.daemon"
	9	+ PATH = "/com/serene_cleaner/daemon"
10	10
11	11	try:
12	12	bus = dbus.SystemBus()

--- a/ubuntucleaner/daemon/service.py

+++ b/ubuntucleaner/daemon/service.py

		@@ -8,12 +8,12 @@ import dbus
8	8	import dbus.service
9	9	import dbus.mainloop.glib
10	10
11		-from ubuntucleaner.daemon import PolicyKitService, PK_ACTION_CLEAN
	11	+from serenecleaner.daemon import PolicyKitService, PK_ACTION_CLEAN
12	12
13	13	log = logging.getLogger('DaemonService')
14	14
15		-INTERFACE = "com.ubuntu_cleaner.daemon"
16		-PATH = "/com/ubuntu_cleaner/daemon"
	15	+INTERFACE = "com.serene_cleaner.daemon"
	16	+PATH = "/com/serene_cleaner/daemon"
17	17
18	18
19	19	class DaemonService(PolicyKitService):

--- a/ubuntucleaner/gui/__init__.py

+++ b/ubuntucleaner/gui/__init__.py

		@@ -3,7 +3,7 @@ import logging
3	3
4	4	from gi.repository import Gtk
5	5
6		-from ubuntucleaner.settings.constants import DATA_DIR
	6	+from serenecleaner.settings.constants import DATA_DIR
7	7
8	8
9	9	class GuiBuilder(object):

		@@ -13,7 +13,7 @@ class GuiBuilder(object):
13	13	file_path = os.path.join(DATA_DIR, 'ui', file_name)
14	14
15	15	self.builder = Gtk.Builder()
16		- self.builder.set_translation_domain('ubuntu-cleaner')
	16	+ self.builder.set_translation_domain('serene-cleaner')
17	17	self.builder.add_from_file(file_path)
18	18	self.builder.connect_signals(self)
19	19

--- a/ubuntucleaner/gui/gtk.py

+++ b/ubuntucleaner/gui/gtk.py

		@@ -2,7 +2,7 @@ import logging
2	2
3	3	from gi.repository import Gdk
4	4
5		-from ubuntucleaner.settings.debug import log_func
	5	+from serenecleaner.settings.debug import log_func
6	6
7	7	log = logging.getLogger("gtk")
8	8

--- a/ubuntucleaner/janitor/__init__.py

+++ b/ubuntucleaner/janitor/__init__.py

		@@ -9,12 +9,12 @@ from collections import OrderedDict
9	9
10	10	from gi.repository import GObject, Gtk, Gdk, Pango
11	11
12		-from ubuntucleaner.gui import GuiBuilder
13		-from ubuntucleaner.gui.gtk import post_ui
14		-from ubuntucleaner.utils import icon
15		-from ubuntucleaner.utils.files import filesizeformat
16		-from ubuntucleaner.modules import ModuleLoader
17		-from ubuntucleaner.settings.debug import run_traceback, log_func
	12	+from serenecleaner.gui import GuiBuilder
	13	+from serenecleaner.gui.gtk import post_ui
	14	+from serenecleaner.utils import icon
	15	+from serenecleaner.utils.files import filesizeformat
	16	+from serenecleaner.modules import ModuleLoader
	17	+from serenecleaner.settings.debug import run_traceback, log_func
18	18
19	19	log = logging.getLogger('Janitor')
20	20

--- a/ubuntucleaner/janitor/aptcache_plugin.py

+++ b/ubuntucleaner/janitor/aptcache_plugin.py

		@@ -1,7 +1,7 @@
1	1	import logging
2	2
3		-from ubuntucleaner.janitor import JanitorCachePlugin
4		-from ubuntucleaner.daemon.dbusproxy import proxy
	3	+from serenecleaner.janitor import JanitorCachePlugin
	4	+from serenecleaner.daemon.dbusproxy import proxy
5	5
6	6	log = logging.getLogger('aptcache_plugin')
7	7

--- a/ubuntucleaner/janitor/autoremoval_plugin.py

+++ b/ubuntucleaner/janitor/autoremoval_plugin.py

		@@ -1,8 +1,8 @@
1	1	import logging
2	2
3		-from ubuntucleaner.gui.gtk import set_busy, unset_busy
4		-from ubuntucleaner.janitor import JanitorPlugin, PackageObject
5		-from ubuntucleaner.utils.package import AptWorker
	3	+from serenecleaner.gui.gtk import set_busy, unset_busy
	4	+from serenecleaner.janitor import JanitorPlugin, PackageObject
	5	+from serenecleaner.utils.package import AptWorker
6	6
7	7	log = logging.getLogger('AutoRemovalPlugin')
8	8

--- a/ubuntucleaner/janitor/chrome_plugin.py

+++ b/ubuntucleaner/janitor/chrome_plugin.py

		@@ -1,4 +1,4 @@
1		-from ubuntucleaner.janitor import JanitorCachePlugin
	1	+from serenecleaner.janitor import JanitorCachePlugin
2	2
3	3
4	4	class ChromeCachePlugin(JanitorCachePlugin):

--- a/ubuntucleaner/janitor/empathy_plugin.py

+++ b/ubuntucleaner/janitor/empathy_plugin.py

		@@ -1,4 +1,4 @@
1		-from ubuntucleaner.janitor import JanitorCachePlugin
	1	+from serenecleaner.janitor import JanitorCachePlugin
2	2
3	3
4	4	class EmpathyCachePlugin(JanitorCachePlugin):

--- a/ubuntucleaner/janitor/googleearth_plugin.py

+++ b/ubuntucleaner/janitor/googleearth_plugin.py

		@@ -1,4 +1,4 @@
1		-from ubuntucleaner.janitor import JanitorCachePlugin
	1	+from serenecleaner.janitor import JanitorCachePlugin
2	2
3	3
4	4	class GoogleearthCachePlugin(JanitorCachePlugin):

--- a/ubuntucleaner/janitor/mozilla_plugin.py

+++ b/ubuntucleaner/janitor/mozilla_plugin.py

		@@ -1,8 +1,8 @@
1	1	import os
2	2	import logging
3	3
4		-from ubuntucleaner.janitor import JanitorCachePlugin
5		-from ubuntucleaner.settings.common import RawConfigSetting
	4	+from serenecleaner.janitor import JanitorCachePlugin
	5	+from serenecleaner.settings.common import RawConfigSetting
6	6
7	7	log = logging.getLogger('MozillaCachePlugin')
8	8

--- a/ubuntucleaner/janitor/oldkernel_plugin.py

+++ b/ubuntucleaner/janitor/oldkernel_plugin.py

		@@ -3,10 +3,10 @@ import re
3	3	import logging
4	4
5	5	from distutils.version import LooseVersion
6		-from ubuntucleaner.gui.gtk import set_busy, unset_busy
7		-from ubuntucleaner.janitor import JanitorPlugin, PackageObject
8		-from ubuntucleaner.utils.package import AptWorker
9		-from ubuntucleaner.settings.debug import log_func, get_traceback
	6	+from serenecleaner.gui.gtk import set_busy, unset_busy
	7	+from serenecleaner.janitor import JanitorPlugin, PackageObject
	8	+from serenecleaner.utils.package import AptWorker
	9	+from serenecleaner.settings.debug import log_func, get_traceback
10	10
11	11
12	12	log = logging.getLogger('OldKernelPlugin')

		@@ -69,7 +69,7 @@ class OldKernelPlugin(JanitorPlugin):
69	69
70	70	def is_old_kernel_package(self, pkg):
71	71	basenames = ['linux-image', 'linux-image-extra', 'linux-headers',
72		- 'linux-image-debug', 'linux-ubuntu-modules',
	72	+ 'linux-image-debug', 'linux-serene-modules',
73	73	'linux-header-lum', 'linux-backport-modules',
74	74	'linux-header-lbm', 'linux-restricted-modules']
75	75

--- a/ubuntucleaner/janitor/opera_plugin.py

+++ b/ubuntucleaner/janitor/opera_plugin.py

		@@ -1,4 +1,4 @@
1		-from ubuntucleaner.janitor import JanitorCachePlugin
	1	+from serenecleaner.janitor import JanitorCachePlugin
2	2
3	3
4	4	class OperaCachePlugin(JanitorCachePlugin):

--- a/ubuntucleaner/janitor/packageconfigs_plugin.py

+++ b/ubuntucleaner/janitor/packageconfigs_plugin.py

		@@ -2,9 +2,9 @@ import os
2	2	import time
3	3	import logging
4	4
5		-from ubuntucleaner.janitor import JanitorPlugin, PackageObject
6		-from ubuntucleaner.utils import icon
7		-from ubuntucleaner.daemon.dbusproxy import proxy
	5	+from serenecleaner.janitor import JanitorPlugin, PackageObject
	6	+from serenecleaner.utils import icon
	7	+from serenecleaner.daemon.dbusproxy import proxy
8	8
9	9
10	10	log = logging.getLogger('PackageConfigsPlugin')

--- a/ubuntucleaner/janitor/softwarecenter_plugin.py

+++ b/ubuntucleaner/janitor/softwarecenter_plugin.py

		@@ -1,4 +1,4 @@
1		-from ubuntucleaner.janitor import JanitorCachePlugin
	1	+from serenecleaner.janitor import JanitorCachePlugin
2	2
3	3
4	4	class SoftwareCenterCachePlugin(JanitorCachePlugin):

--- a/ubuntucleaner/janitor/thumbnailcache_plugin.py

+++ b/ubuntucleaner/janitor/thumbnailcache_plugin.py

		@@ -1,5 +1,5 @@
1		-from ubuntucleaner.utils import system
2		-from ubuntucleaner.janitor import JanitorCachePlugin
	1	+from serenecleaner.utils import system
	2	+from serenecleaner.janitor import JanitorCachePlugin
3	3
4	4
5	5	class ThumbnailCachePlugin(JanitorCachePlugin):

--- a/ubuntucleaner/main.py

+++ b/ubuntucleaner/main.py

		@@ -4,15 +4,15 @@ import gi
4	4	gi.require_version("Gtk", "3.0")
5	5	from gi.repository import Gtk
6	6
7		-from ubuntucleaner.gui import GuiBuilder
8		-from ubuntucleaner.settings.constants import VERSION
9		-from ubuntucleaner.janitor import JanitorPage
10		-from ubuntucleaner.utils import icon
	7	+from serenecleaner.gui import GuiBuilder
	8	+from serenecleaner.settings.constants import VERSION
	9	+from serenecleaner.janitor import JanitorPage
	10	+from serenecleaner.utils import icon
11	11
12	12	log = logging.getLogger('app')
13	13
14	14
15		-class UbuntuCleanerWindow(GuiBuilder):
	15	+class serenecleanerWindow(GuiBuilder):
16	16	feature_dict = {}
17	17
18	18	def __init__(self):

--- a/ubuntucleaner/modules/__init__.py

+++ b/ubuntucleaner/modules/__init__.py

		@@ -3,7 +3,7 @@ import sys
3	3	import logging
4	4	import inspect
5	5
6		-from ubuntucleaner.settings.debug import log_traceback
	6	+from serenecleaner.settings.debug import log_traceback
7	7
8	8	log = logging.getLogger('ModuleLoader')
9	9

		@@ -43,7 +43,7 @@ class ModuleLoader:
43	43	if not user_only:
44	44	log.info("Loading system modules for %s..." % feature)
45	45	try:
46		- m = __import__('ubuntucleaner.%s' % self.feature, fromlist='ubuntucleaner')
	46	+ m = __import__('serenecleaner.%s' % self.feature, fromlist='serenecleaner')
47	47	self.do_folder_import(m.__path__[0])
48	48	except ImportError, e:
49	49	log.error(e)

		@@ -103,7 +103,7 @@ class ModuleLoader:
103	103
104	104	@classmethod
105	105	def is_module_active(cls, k, v):
106		- from ubuntucleaner.janitor import JanitorPlugin
	106	+ from serenecleaner.janitor import JanitorPlugin
107	107	try:
108	108	if "Plugin" in k and k not in ('JanitorPlugin', 'JanitorCachePlugin') and \
109	109	issubclass(v, JanitorPlugin) and hasattr(v, '__utmodule__'):

--- a/ubuntucleaner/settings/constants.py

+++ b/ubuntucleaner/settings/constants.py

		@@ -3,7 +3,7 @@ import gettext
3	3
4	4	from gi.repository import GLib
5	5
6		-from ubuntucleaner import __version__
	6	+from serenecleaner import __version__
7	7
8	8	__all__ = (
9	9	'APP',

		@@ -17,13 +17,13 @@ __all__ = (
17	17	def applize(package):
18	18	return ' '.join([a.capitalize() for a in package.split('-')])
19	19
20		-PACKAGE = 'ubuntu-cleaner'
	20	+PACKAGE = 'serene-cleaner'
21	21	VERSION = __version__
22	22	PKG_VERSION = VERSION
23		-DATA_DIR = '/usr/share/ubuntu-cleaner/'
	23	+DATA_DIR = '/usr/share/serene-cleaner/'
24	24	APP = applize(PACKAGE)
25	25	BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
26		-CONFIG_ROOT = os.path.join(GLib.get_user_config_dir(), 'ubuntu-cleaner')
	26	+CONFIG_ROOT = os.path.join(GLib.get_user_config_dir(), 'serene-cleaner')
27	27	IS_INSTALLED = True
28	28
29	29	if not os.path.exists(CONFIG_ROOT):

--- a/ubuntucleaner/settings/debug.py

+++ b/ubuntucleaner/settings/debug.py

		@@ -7,8 +7,8 @@ import gi
7	7	gi.require_version("Notify", "0.7")
8	8	from gi.repository import Gtk, Gdk, Notify
9	9
10		-from ubuntucleaner.utils import system
11		-from ubuntucleaner.settings.constants import CONFIG_ROOT
	10	+from serenecleaner.utils import system
	11	+from serenecleaner.settings.constants import CONFIG_ROOT
12	12
13	13	#The terminal has 8 colors with codes from 0 to 7
14	14	BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)

		@@ -35,13 +35,13 @@ def on_copy_button_clicked(widget, text):
35	35	body=_('Now click "Report" to enter the bug '
36	36	'report website. Make sure to attach the '
37	37	'error message in "Further information".'),
38		- icon='ubuntu-cleaner')
	38	+ icon='serene-cleaner')
39	39	notify.show()
40	40
41	41
42	42	def run_traceback(level, textview_only=False, text_only=False):
43	43	'''Two level: fatal and error'''
44		- from ubuntucleaner.gui import GuiBuilder
	44	+ from serenecleaner.gui import GuiBuilder
45	45
46	46	output = StringIO.StringIO()
47	47	exc = traceback.print_exc(file=output)

		@@ -114,7 +114,7 @@ class CleanerLogger(logging.Logger):
114	114
115	115	#create the single file appending handler
116	116	if CleanerLogger.LOG_FILE_HANDLER is None:
117		- filename = os.path.join(CONFIG_ROOT, 'ubuntu-cleaner.log')
	117	+ filename = os.path.join(CONFIG_ROOT, 'serene-cleaner.log')
118	118	CleanerLogger.LOG_FILE_HANDLER = logging.FileHandler(filename, 'w')
119	119	CleanerLogger.LOG_FILE_HANDLER.setFormatter(no_color_formatter)
120	120

--- a/ubuntucleaner/utils/package.py

+++ b/ubuntucleaner/utils/package.py

		@@ -12,8 +12,8 @@ from gi.repository import Gtk, Gdk
12	12
13	13	from defer import inline_callbacks
14	14
15		-from ubuntucleaner.gui.gtk import post_ui
16		-from ubuntucleaner.settings.debug import log_func
	15	+from serenecleaner.gui.gtk import post_ui
	16	+from serenecleaner.settings.debug import log_func
17	17
18	18	log = logging.getLogger('package')
19	19

--- a/ubuntucleaner/utils/system.py

+++ b/ubuntucleaner/utils/system.py

		@@ -1,7 +1,7 @@
1	1	import os
2	2	import platform
3	3
4		-from ubuntucleaner.settings.constants import APP, PKG_VERSION
	4	+from serenecleaner.settings.constants import APP, PKG_VERSION
5	5
6	6
7	7	def get_distro():

		@@ -14,8 +14,8 @@ def get_codename():
14	14
15	15	def get_desktop():
16	16	'''
17		- ubuntu
18		- ubuntu-2d
	17	+ serene
	18	+ serene-2d
19	19	gnome-classic
20	20	gnome-shell
21	21	'''

		@@ -23,7 +23,7 @@ def get_desktop():
23	23
24	24
25	25	def get_app():
26		- '''Ubuntu Cleaner 0.5.x'''
	26	+ '''serene-cleaner 0.5.x'''
27	27	return " ".join([APP, PKG_VERSION])
28	28
29	29

旧リポジトリブラウザで表示

SereneLinux ForkottoseiGoogleassistantBuildMyDistroNonFreeReporules-and-useserene-cleanerserene-setup-wizardUbiquity-Slideshow-Serene-Releasearrestloginmsgserene-bodhibuilderMyBrowserBasixToXfceserenelinux-system-pkg

serene-cleaner: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

SereneLinux
Fork
ottosei
Googleassistant
BuildMyDistro
NonFreeRepo
rules-and-use
serene-cleaner
serene-setup-wizard
Ubiquity-Slideshow-Serene-Release
arrest
loginmsg
serene-bodhibuilder
MyBrowser
BasixToXfce
serenelinux-system-pkg