--- computer-janitor-2.1.0.orig/NEWS +++ computer-janitor-2.1.0/NEWS @@ -4,6 +4,10 @@ This file summarizes mainly user-visible changes. For detailed changes, please see the bzr commit log messages. +Version 2.1.1, released 20XX-XX-XX + + * 24x24 icon location is fixed. (LP: #720743) + Version 2.1.0, released 2011-02-16 Martin Pitt @@ -57,7 +61,7 @@ Version 1.13.2, released 2009-08-21 - * Versions 1.13.0 and 1.13.1 were not released publically. This + * Versions 1.13.0 and 1.13.1 were not released publicly. This section documents all changes since 1.12.1. * The GTK user interface has been completely rewritten from scratch. --- computer-janitor-2.1.0.orig/setup.py +++ computer-janitor-2.1.0/setup.py @@ -74,9 +74,10 @@ # desktop ('share/applications', ['data/computer-janitor-gtk.desktop']), # icons - ('share/computer-janitor', ['data/computerjanitor-256x256.png']), - ('share/icons/hicolor/24x24/apps', - ['data/computerjanitor-24x24.png']), + ('share/computer-janitor', [ + 'data/computerjanitor-24x24.png', + 'data/computerjanitor-256x256.png', + ]), # dbus stuff ('share/dbus-1/system-services', ['computerjanitord/data/com.ubuntu.ComputerJanitor.service']), --- computer-janitor-2.1.0.orig/plugins/autoremoval_plugin.py +++ computer-janitor-2.1.0/plugins/autoremoval_plugin.py @@ -36,5 +36,5 @@ def get_cruft(self): for pkg in self.app.apt_cache: - if pkg.isAutoRemovable: + if pkg.is_auto_removable: yield computerjanitor.PackageCruft(pkg, self.description) --- computer-janitor-2.1.0.orig/plugins/unsupported_plugin.py +++ computer-janitor-2.1.0/plugins/unsupported_plugin.py @@ -96,7 +96,7 @@ # got manually installed or comes from a source (e.g. a PPA) # that was once part of the system and later got disabled - if not pkg.isInstalled: + if not pkg.is_installed: return True if pkg.installed.downloadable or pkg.candidate.downloadable: return True @@ -106,7 +106,7 @@ # are not considered cruft. This means, however, that this # plugin degenerates to the autoremovable plugin. # return True - if len(pkg._pkg.VersionList) > 1: + if len(pkg._pkg.version_list) > 1: # if there is just a single version and that is not # downloadable anymore, then its cruft this avoids cases # where the user has e.g. a newer version installed from a @@ -124,7 +124,7 @@ return False def get_cruft(self): - self.installed = [x for x in self.app.apt_cache if x.isInstalled] + self.installed = [x for x in self.app.apt_cache if x.is_installed] for pkg in self.app.apt_cache: if not self.is_supported(pkg): if not self.has_installed_rdepends(self.app.apt_cache, pkg): --- computer-janitor-2.1.0.orig/computerjanitorapp/gtk/store.py +++ computer-janitor-2.1.0/computerjanitorapp/gtk/store.py @@ -24,9 +24,7 @@ ] -import gobject - -from gi.repository import Gtk +from gi.repository import GObject, Gtk # XXX 2010-03-04 barry: Use a munepy enum. @@ -97,7 +95,7 @@ self.store.append(( cruft_name, cruft_shortname, # What is being displayed in the cell. - gobject.markup_escape_text(cruft_shortname), + GObject.markup_escape_text(cruft_shortname), # Show the cruft be shown? cruft_name not in ignored_cruft, # Is the cruft active locally? --- computer-janitor-2.1.0.orig/computerjanitorapp/gtk/dialogs.py +++ computer-janitor-2.1.0/computerjanitorapp/gtk/dialogs.py @@ -63,9 +63,9 @@ if other_cruft_count > 0: messages.insert(1, _('Non-package items to remove: %(others)s.')) ok_button = _('Clean up') - message = interpolate(NL.join(messages), - dict(packages=package_cruft_count, - others=other_cruft_count)) + secondary_message = interpolate(NL.join(messages), + dict(packages=package_cruft_count, + others=other_cruft_count)) # XXX ^^ barry 2010-08-23: LP: #622720 if ok_button is None: # The user de-selected all cruft from the ui, so there's actually @@ -77,7 +77,6 @@ message_format=_('There is nothing to clean up'), ) dialog.set_title(_('Clean up')) - dialog.format_secondary_markup(message) dialog.add_button(_('Ok'), Gtk.ResponseType.YES) dialog.show_all() dialog.run() @@ -93,7 +92,7 @@ buttons=Gtk.ButtonsType.NONE, message_format=message) dialog.set_title(_('Clean up')) - dialog.format_secondary_markup(message) + dialog.format_secondary_markup(secondary_message) dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CLOSE) dialog.add_button(ok_button, Gtk.ResponseType.YES) # Show the dialog and get the user's response. --- computer-janitor-2.1.0.orig/computerjanitorapp/gtk/ui.py +++ computer-janitor-2.1.0/computerjanitorapp/gtk/ui.py @@ -25,12 +25,11 @@ import os import dbus import glib -import gobject import logging from operator import mod -from gi.repository import Gtk, Pango +from gi.repository import GObject, Gtk, Pango from computerjanitorapp import __version__, setup_gettext from computerjanitorapp.gtk.dialogs import AreYouSure, CleanupProblem @@ -40,7 +39,6 @@ from computerjanitord.service import DBUS_INTERFACE_NAME -Gtk.require_version('2.0') log = logging.getLogger('computerjanitor') _ = setup_gettext() @@ -261,10 +259,10 @@ shortname = model.get_value(iter, ListStoreColumns.short_name) if expanded: # Collapse it. - value = gobject.markup_escape_text(shortname) + value = GObject.markup_escape_text(shortname) else: cruft_type, size = self.janitord.get_details(cruft_name) - lines = [gobject.markup_escape_text(shortname)] + lines = [GObject.markup_escape_text(shortname)] action = ACTIONS.get(cruft_type.lower()) if action is not None: lines.append(action) @@ -273,7 +271,7 @@ dict(bytes=format_size(size)))) lines.append('') description = self.janitord.get_description(cruft_name) - lines.append(gobject.markup_escape_text(description)) + lines.append(GObject.markup_escape_text(description)) value = NL.join(lines) model.set_value(iter, ListStoreColumns.text, value) model.set_value(iter, ListStoreColumns.expanded, not expanded) @@ -406,7 +404,7 @@ """ # Original comment: This is slightly tricky and probably a source of # bugs. Oh well. - if event.button.button == 1: + if event.button == 1: # Left button event. Select the row being clicked on. If the # click is on the cruft name, show or hide its long description. # If the click the click is elsewhere do not handle it. This @@ -427,7 +425,7 @@ # We are not handling this event so that the toggle button # handling can occur. return False - elif event.button.button == 3: + elif event.button == 3: # Right button event. Pop up the select/deselect all menu. treeview.grab_focus() x = int(event.x) @@ -438,14 +436,8 @@ path, column, cell_x, cell_y = pathinfo treeview.set_cursor(path, column, False) menu = self.popup_menus[treeview] - try: - menu.popup_for_device(None, None, None, None, None, - event.button.button, time) - except AttributeError: - # popup_for_device() is introspection safe, but only exists in - # GTK3. popup() isn't introspectable, so in GTK 2 we need to - # disable the popup menu functionality - log.warning('popup menu not supported when using GTK2') + menu.popup(None, None, None, None, + event.button, time) return True else: # No other events are handled by us. --- computer-janitor-2.1.0.orig/computerjanitord/application.py +++ computer-janitor-2.1.0/computerjanitord/application.py @@ -71,7 +71,7 @@ # For historical purposes, Synaptic has a different way of pinning # packages than apt, so we have to load its preferences file in order # to know what it's pinning. - self.apt_cache._depcache.ReadPinFile(SYNTAPTIC_PREFERENCES_FILE) + self.apt_cache._depcache.read_pinfile(SYNTAPTIC_PREFERENCES_FILE) def verify_apt_cache(self): """Verify that essential packages are available in the apt cache. --- computer-janitor-2.1.0.orig/computerjanitord/tests/test_application.py +++ computer-janitor-2.1.0/computerjanitord/tests/test_application.py @@ -64,7 +64,7 @@ self.data_dir = os.path.abspath( pkg_resources.resource_filename('computerjanitord.tests', 'data')) # Make the test insensitive to the platform's architecture. - apt_pkg.Config.Set('APT::Architecture', 'i386') + apt_pkg.Config.set('APT::Architecture', 'i386') self.cache = apt.Cache(rootdir=self.data_dir) self.app = Application(self.cache) --- computer-janitor-2.1.0.orig/debian/computer-janitor.postinst +++ computer-janitor-2.1.0/debian/computer-janitor.postinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Create /var/lib/computer-janitor if it doesn't exist and we're being +# installed. + +case "$1" in + configure) + # Make sure we have a directory to put the state file in. + [ -e /var/lib/computer-janitor ] || mkdir /var/lib/computer-janitor + + # If this system has or had system-cleaner installed, it might + # have an old state file lying around. Let's copy that to the new + # location, but only if there isn't one there already. + for x in cruft-remover system-cleaner + do + if [ ! -e /var/lib/computer-janitor/state.dat ] && + [ -e /var/lib/$x/state.dat ] + then + cp /var/lib/$x/state.dat /var/lib/computer-janitor + fi + done + ;; +esac + + +#DEBHELPER# --- computer-janitor-2.1.0.orig/debian/computer-janitor-gtk.install +++ computer-janitor-2.1.0/debian/computer-janitor-gtk.install @@ -0,0 +1,6 @@ +usr/bin/computer-janitor-gtk +usr/share/man/man8/computer-janitor-gtk.8 +usr/share/computer-janitor/ComputerJanitor.ui +usr/share/computer-janitor/computerjanitor-24x24.png +usr/share/computer-janitor/computerjanitor-256x256.png +usr/share/applications/computer-janitor-gtk.desktop --- computer-janitor-2.1.0.orig/debian/pycompat +++ computer-janitor-2.1.0/debian/pycompat @@ -0,0 +1 @@ +2 --- computer-janitor-2.1.0.orig/debian/default.whitelist +++ computer-janitor-2.1.0/debian/default.whitelist @@ -0,0 +1,4 @@ +deb:skype +deb:acrobat +deb:google-earth +deb:picasa --- computer-janitor-2.1.0.orig/debian/watch +++ computer-janitor-2.1.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://archive.ubuntu.com/ubuntu/pool/main/c/computer-janitor/ \ + computer-janitor_(.*).orig.tar.gz --- computer-janitor-2.1.0.orig/debian/computer-janitor.docs +++ computer-janitor-2.1.0/debian/computer-janitor.docs @@ -0,0 +1 @@ +README --- computer-janitor-2.1.0.orig/debian/compat +++ computer-janitor-2.1.0/debian/compat @@ -0,0 +1 @@ +7 --- computer-janitor-2.1.0.orig/debian/rules +++ computer-janitor-2.1.0/debian/rules @@ -0,0 +1,41 @@ +#!/usr/bin/make -f + +PYTHON2=$(shell pyversions -vr) + + +%: + dh $@ --with python2 + + +test-python%: + python$* setup.py test -vv + + +override_dh_auto_test: $(PYTHON2:%=test-python%) + + +override_dh_installchangelogs: + dh_installchangelogs --keep NEWS + + +override_dh_auto_install: + dh_auto_install --buildsystem=python_distutils -- \ + --install-lib /usr/share/computerjanitor/ + + +override_dh_install: + dh_install --fail-missing + mv debian/computer-janitor/usr/bin/computer-janitor \ + debian/computer-janitor/usr/share/computerjanitor + + mkdir -p debian/computer-janitor-gtk/usr/share/computerjanitor/ + mv debian/computer-janitor-gtk/usr/bin/computer-janitor-gtk \ + debian/computer-janitor-gtk/usr/share/computerjanitor/computer-janitor-gtk + + dh_link -pcomputer-janitor usr/share/computerjanitor/computer-janitor \ + usr/sbin/computer-janitor + + dh_link -pcomputer-janitor-gtk usr/share/computerjanitor/computer-janitor-gtk \ + usr/sbin/computer-janitor-gtk + + rmdir debian/computer-janitor-*/usr/bin --- computer-janitor-2.1.0.orig/debian/control +++ computer-janitor-2.1.0/debian/control @@ -0,0 +1,56 @@ +Source: computer-janitor +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Julian Andres Klode +Section: admin +Priority: optional +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7.3), + python-all (>= 2.6.6-3), + python-apt, + python-setuptools, + python-distutils-extra, + python-dbus, + update-manager-core +X-Python-Version: >= 2.6 +Vcs-Bzr: http://bazaar.launchpad.net/%7Ecomputer-janitor-hackers/computer-janitor/trunk +Homepage: https://wiki.ubuntu.com/CleanupCruft + +Package: computer-janitor +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, + python-apt (>= 0.7.9), + python-dbus, + python-argparse (>= 1.1), + dbus, + update-manager-core (>= 1:0.98.1) +Description: Clean up a system so it's more like a freshly installed one + Over time, a computer system tends to get cluttered. For example, + software packages that are no longer needed can be uninstalled. + When the system is upgraded from release to release, it may miss + out on configuration tweaks that freshly installed systems get. + . + Computer Janitor is an application to fix these kinds of problems. + It attempts to find software packages that can be removed, and + tweaks the system configuration in useful ways. + . + This is the command line version. + +Package: computer-janitor-gtk +Architecture: all +Depends: ${python:Depends}, + computer-janitor (=${source:Version}), + python-gi, + gir1.2-gtk-3.0, + gir1.2-pango-1.0, + ${misc:Depends} +Description: Clean up a system so it's more like a freshly installed one + Over time, a computer system tends to get cluttered. For example, + software packages that are no longer needed can be uninstalled. + When the system is upgraded from release to release, it may miss + out on configuration tweaks that freshly installed systems get. + . + Computer Janitor is an application to fix these kinds of problems. + It attempts to find software packages that can be removed, and + tweaks the system configuration in useful ways. + . + This is the GNOME version. --- computer-janitor-2.1.0.orig/debian/changelog +++ computer-janitor-2.1.0/debian/changelog @@ -0,0 +1,588 @@ +computer-janitor (2.1.0-0ubuntu7) precise; urgency=low + + * debian/control: Move from transitional python-gobject to python-gi. + + -- Martin Pitt Thu, 01 Dec 2011 15:36:42 +0100 + +computer-janitor (2.1.0-0ubuntu6) oneiric; urgency=low + + * computerjanitorapp/gtk/{ui,store}.py: Move from static gobject to GI + GObject module, to be compatible to upcoming pygobject 3.0. + + -- Martin Pitt Wed, 17 Aug 2011 07:09:01 +0200 + +computer-janitor (2.1.0-0ubuntu5) oneiric; urgency=low + + * computerjanitorapp/gtk/ui.py: Stop forcing GTK 2, we want to use GTK 3 + now. Drop GTK 2 workaround for menu popups. Update gir dependency. + + -- Martin Pitt Wed, 18 May 2011 10:12:06 +0200 + +computer-janitor (2.1.0-0ubuntu4) natty; urgency=low + + [ Shane Harbour ] + * NEWS: fixed a typo. (LP: #726616) + + [ Martin Pitt ] + * computerjanitorapp/gtk/ui.py: Update require_version() call to current + pygobject API. Bump python-gobject dependency accordingly. + * computerjanitorapp/gtk/ui.py: Drop the "event.button.button" workaround. + PyGI now properly handles unions, so it's just "event.button" now. + + -- Martin Pitt Thu, 03 Mar 2011 17:22:59 +0100 + +computer-janitor (2.1.0-0ubuntu3) natty; urgency=low + + [ Loïc Minier ] + * debian/control: computer-janitor-gtk depends gir1.2-pango-1.0 not + gir1.2-pango-2.0. (LP: #720529) + + [ Barry Warsaw ] + * setup.py, computer-janitor-gtk.install: Install 24x24.png into + /usr/share/computer-janitor which is where gtk expects it to be. + (LP: #720743) + * Fix various apt_cache deprecation warnings. + * debian/rules: + - Switch to dh_python2. + - Run the unit tests at build time. + - Add --keep to dh_installchangelogs. + - Remove override_dh_pysupport. + * debian/control: + - Add Build-Depends on python-dbus and update-manager-core so that the + unit tests can be run at build time. Remove B-D on python-support. + Change B-D to python-all for tests under all available Python versions. + - Fix typo in descriptions. + - Remove XB-Python-Version and add X-Python-Version for dh_python2. + * Note: 2.1.0-0ubuntu2 was a quick fix upload to the archive containing + the above debian/control file fix. + + -- Barry Warsaw Thu, 17 Feb 2011 17:24:44 -0500 + +computer-janitor (2.1.0-0ubuntu1) natty; urgency=low + + [ Martin Pitt ] + * data/ComputerJanitor.ui: Drop obsolete has_separator properties. + * run_from_checkout.sh: Drop setting of $PYTHONPATH. Current directory is + there by default anyway, and this breaks setting it from the environment. + * computerjanitorapp/gtk/*: Port from pygtk2 to pygi. Works fully with GTK3 + now, with GTK2 we need to disable the right-click popup menu + (popup_for_device() is introspection safe, but only exists in GTK3. + popup() isn't introspectable). + * computerjanitorapp/gtk/ui.py: Force GTK2 for now, as we do not yet have a + GTK3 theme in Natty, and don't carry the GTK3 stack in the default + install. + * debian/control: Update dependencies for the pygtk → pygi switch. + * debian/control: Drop obsolete system-cleaner conflicts and gksu + dependency. + + [ Barry Warsaw ] + * Add Edit menu items for selecting and deselecting cruft. + * Bump version number. + * Update copyright years. + * Python style, whitespace, and import cleanups. + * Print error messages via logger instead of stderr. + + -- Barry Warsaw Wed, 16 Feb 2011 15:58:36 -0500 + +computer-janitor (2.0.5-0ubuntu1) natty; urgency=low + + * python-dbus cannot type-convert a set, so use a tuple for the package + set when --all is given to the computer-janitor cli. (LP: #601585) + * Fix exception when the user de-selects all cruft in the ui, then clicks + on the 'Do' button. Instead, a dialog pops up that says there's nothing + to do. (LP: #591433) + * Clean up some unused imports. + + -- Barry Warsaw Tue, 15 Feb 2011 17:21:58 -0500 + +computer-janitor (2.0.4-0ubuntu3) natty; urgency=low + + * debian/control: Add explicit dependency on dbus since depending on + python-dbus does not yield an implicit dependency on dbus. (LP: #665740) + * computerjanitord/authenticator.py: Explicitly convert start-time to a + UInt64(0). Under Natty, implicit conversion uses a UInt32 which does + not match the CheckAuthorization signature. (LP: #676488) + + -- Barry Warsaw Thu, 13 Jan 2011 12:56:20 -0500 + +computer-janitor (2.0.4-0ubuntu2) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:01:39 +0000 + +computer-janitor (2.0.4-0ubuntu1) maverick; urgency=low + + * Fix icon; given by Pavol Klačanský. (LP: #434431) + + -- Barry Warsaw Mon, 20 Sep 2010 08:32:14 -0400 + +computer-janitor (2.0.3-0ubuntu2) maverick; urgency=low + + * Remove dependency on python-fstab since the fstab_plugin is disabled + now and no package provides python-fstab any more. + + -- Barry Warsaw Tue, 24 Aug 2010 21:59:34 -0400 + +computer-janitor (2.0.3-0ubuntu1) maverick; urgency=low + + * Fixes for translation support. + - Turn {foo} string substitutions back into %(foo)s strings since + gettext does not yet support validation of {foo} or $foo + substitutions. (LP: #621723) + - Ensure that POTFILES.in has the proper type information for the + ComputerJanitor.ui file. (LP: #612493) + + -- Barry Warsaw Tue, 24 Aug 2010 11:00:14 -0400 + +computer-janitor (2.0.2-0ubuntu1) maverick; urgency=low + + * no change rebuild to generate proper orig.tar.gz + + -- Michael Vogt Thu, 27 May 2010 15:42:36 +0200 + +computer-janitor (2.0.1-0ubuntu1) maverick; urgency=low + + * Bumping for Ubuntu. + + -- Barry Warsaw Fri, 21 May 2010 16:55:46 -0400 + +computer-janitor (2.0.1~ppa1) lucid; urgency=low + + * Display dialog in gtk version when another package manager is running, + preventing package plugin post-cleanup from completing. (LP: #545306) + + -- Barry Warsaw Thu, 20 May 2010 09:36:15 -0400 + +computer-janitor (2.0~ppa0) lucid; urgency=low + + * Since CJ 2.0 won't make it into Lucid, do Maverick updates now. + (LP: #552777) + - Give computer-janitor-gtk --help and --version command line args. + - Revert translatable strings to post-Lucid improvements + - Make string substitutions more consistent + - Update po + + -- Barry Warsaw Thu, 15 Apr 2010 12:11:10 -0400 + +computer-janitor (2.0-0ubuntu5) lucid; urgency=low + + * Move some FIXME comments around for less gettext confusion. + + -- Barry Warsaw Thu, 01 Apr 2010 13:32:24 -0400 + +computer-janitor (2.0-0ubuntu4) lucid; urgency=low + + * FFe review resolution (LP: #541990) + - Reverted some strings back to Karmic versions to satisfy FFe for C-J + 2.0 in Lucid. Strings marked with FIXME for updating in Lucid+1. + - Catch DBusExceptions in both cli and gtk front-ends and print a + better error message. + + -- Barry Warsaw Wed, 31 Mar 2010 15:37:08 -0400 + +computer-janitor (2.0-0ubuntu3) lucid; urgency=low + + * Some cleanup indicated by visual inspection. + - Move more exception classes to the error.py module. + - Update docstring. + - Do not translate logged error messages (can make log analysis + scripts more difficult). + - Update copyright years in About dialog. + + -- Barry Warsaw Tue, 30 Mar 2010 15:18:03 -0400 + +computer-janitor (2.0-0ubuntu2) lucid; urgency=low + + * Disable the Do... button when there is no cruft to clean up. + + -- Barry Warsaw Tue, 30 Mar 2010 15:22:23 -0400 + +computer-janitor (2.0-0ubuntu1) lucid; urgency=low + + * Refactor all package change operations into a dbus service. + - Switch to using python-argparse + - Extend functionality of cli version + - Change format for state.dat ini file + + -- Barry Warsaw Mon, 15 Mar 2010 14:37:03 -0400 + +computer-janitor (1.14.1-0ubuntu2) lucid; urgency=low + + [ David Planella ] + * Removed obsolete template + * marked .ui file for string extraction, Thanks to Gabor Kelemen + + [ Barry Warsaw ] + * remove recommended column (LP: #536908) + + -- Michael Vogt Fri, 12 Mar 2010 22:43:25 +0100 + +computer-janitor (1.14.1-0ubuntu1) lucid; urgency=low + + * computerjanitorapp/ui_gtk.py: + - fix find_and_bind_widgets (LP: #503727) + + -- Michael Vogt Thu, 21 Jan 2010 15:50:52 +0100 + +computer-janitor (1.14-0ubuntu1) lucid; urgency=low + + * New upstream release: + - merge fixes from Julian Andres Klode (many thanks) + - threading improvements + - optimization + - improve the UI responsiveness + * The above threading/UI changes should fix LP: #451833 + (needs a updated update-manager-core as well) + * debian/control: + - remove the python-glade2 dependency (we use gtkbuilder) + - set XS-Python-Version to "current" to workaround strange + effect that python-support generates 2.5 headers for the + binaries otherwise + + -- Michael Vogt Wed, 25 Nov 2009 10:00:18 +0100 + +computer-janitor (1.13.3-2) unstable; urgency=low + + * Correctly call dh_pysupport in debian/rules (Closes: #543796) + + -- Julian Andres Klode Sun, 11 Oct 2009 18:05:52 +0200 + +computer-janitor (1.13.3-1) unstable; urgency=low + + * New upstream release. + * Install executables in /usr/sbin/ (Closes: #543767). + * Depend on python-gtk2 >= 2.16 and drop glade dependency (Closes: #543751). + * computerjanitorapp/app.py: When checking whether a package is downloadable, + check all versions and not just the candidate. + * Merge revisions 192-194 from lp:computer-janitor which reenable the + unsupported-plugin (Closes: #543770). + * Depend on version 0.7.9 or newer of python-apt (Closes: #543763). + + -- Julian Andres Klode Sat, 10 Oct 2009 18:41:08 +0200 + +computer-janitor (1.13.3-0ubuntu2) karmic; urgency=low + + * Undid changes in previous release wrt UI and threading changes, + since they didn't seem to fix the problem. + * Set the gettext translation domain for GtkBuilder. + (Closes: LP: #437827) + * The "bored now" message dialog is used properly. + + -- Lars Wirzenius Wed, 16 Sep 2009 17:19:28 +0300 + +computer-janitor (1.13.3-0ubuntu2~ppa1) karmic; urgency=low + + * New upstream release. This has no UI changes, but changes things + around so that the background threads to not attempt to use GTK. + + -- Lars Wirzenius Wed, 16 Sep 2009 17:19:28 +0300 + +computer-janitor (1.13.3-0ubuntu1) karmic; urgency=low + + * New upstream release. Fixes the following bugs in Ubuntu: + - incomplete translation template (Closes: LP: #425018) + - "cleanup" button sensitive when there's nothing to clean up + (Closes: LP: #418319) + - wrong launchpad page link in about box (Closes: LP: #417309) + * Also, upstream re-introduced the "unsupported package" plugin, and + the Ubuntu packaging added a default whitelist file listing the + most common manually installed third-party packages. + + -- Lars Wirzenius Wed, 09 Sep 2009 17:37:19 +0300 + +computer-janitor (1.13.2-2) unstable; urgency=low + + * debian/copyright: Update to DEP-5 draft format. + + -- Julian Andres Klode Wed, 26 Aug 2009 09:10:55 +0200 + +computer-janitor (1.13.2-1) unstable; urgency=low + + * Initial upload to Debian (Closes: #542644). + * Install modules into private directory /usr/share/computerjanitor. + * Ship an embedded copy of computerjanitor module from update-manager, + as Debian's version of update-manager is too old and the next version + will not ship it anymore. + * computerjanitorapp/ui_gtk.py: Use isSet instead of is_set, as the latter + is only available on Python 2.6 and newer. + * debian/control: Update maintainer, standards-Version and VCS-* fields, + and drop the Conflicts/Replaces on system-cleaner*. + * Make computer-janitor-gtk depend on gksu. + * debian/watch: Add watch file pointing at archive.ubuntu.com. + * Install NEWS as the upstream changelog. + + -- Julian Andres Klode Fri, 21 Aug 2009 20:47:19 +0200 + +computer-janitor (1.13.2-0ubuntu2) karmic; urgency=low + + * Fixed Vcs-Bzr, thanks to Julian Andres Klode. + + -- Lars Wirzenius Mon, 24 Aug 2009 09:53:11 +0300 + +computer-janitor (1.13.2-0ubuntu1) karmic; urgency=low + + * New upstream version. Closes bugs in Launchpad: + - System cleaner removes explicitly installed third-party packages + (LP: #285746) + - I do not want to remove '/' (LP: #337241) + - computer-janitor incomplete error description (LP: #365325) + - computer-janitor commandline interface not pipe-friendly (LP: #375094) + - Python 2.6 DeprecationWarning: Accessed deprecated property + Package.candidateDownloadable (LP: #407127) + - Should use GtkBuilder rather than libglade (LP: #403537) + - Ambiguous wording in confirmation alert box (LP: #349336) + - computer-janitor-gtk crashed with UnicodeDecodeError in + get_description() (LP: #352461) + - Can't deselect fixes with space in computer-janitor (LP: #355535) + - relatime tweak will not be necessary in karmic (LP: #369151) + - computer janitor needs filesize column (LP: #396522) + * Packaging now uses dh from debhelper 7. + + -- Lars Wirzenius Fri, 21 Aug 2009 15:48:12 +0300 + +computer-janitor (1.12.1-0ubuntu4) karmic; urgency=low + + [ Charlie Smotherman ] + * Fixed typo in manpage (Closes: LP: #366702). + + -- Michael Vogt Wed, 08 Jul 2009 18:29:56 +0200 + +computer-janitor (1.12.1-0ubuntu3) jaunty; urgency=low + + * plugins/*.py: Fix to use the computerjanitorapp gettext instance, + instead of the computerjanitor one. This should fix a couple of + translations problems. + * computerjanitorapp/ui_gtk.py: Really ugly (bug localized ugly!) + hack to extract parts of cruft descriptions that need to be + translated, translating them, and then putting back the whole + description string again. (Closes: LP: #361312, #358354) + + -- Lars Wirzenius Wed, 15 Apr 2009 18:22:01 +0300 + +computer-janitor (1.12.1-0ubuntu2) jaunty; urgency=low + + * Fix gettext translation domain to be "computerjanitor" everywhere. + (Closes: LP: #344704) + * Fix NameError crash when closing an error dialog. Can't reproduce + this, but I suspect it is some kind of weird race condition with + threads and GTK+. (Closes: LP: #335828) + * Fix typo on computerjanitorapp/app.py's help text for --no-act. + * When a cruft is selected, scroll it into view after the label has + been updated with the description. (Closes: LP: #349653) + * plugins/unsupported_plugin.py: Don't mark as cruft stuff that has + installed reverse dependencies. (Closes: LP: #345939) + * data/computer-janitor.desktop.in: Use the right translation + domain. (Closes: LP: #352770) + + -- Lars Wirzenius Wed, 01 Apr 2009 17:20:45 +0300 + +computer-janitor (1.12.1-0ubuntu1) intrepid; urgency=low + + * New upstream release, with minor GTK user interface changes. + Fixes bugs reported to Ubuntu: + - Duplicate shortcut keys for Cleanup and Close (LP: #311557) + - Better description(s) needed for cleanup actions (LP: #300354) + * Updated package descriptions to be clearer. + + -- Lars Wirzenius Wed, 04 Mar 2009 21:26:03 +0200 + +computer-janitor (1.12-0ubuntu1) jaunty; urgency=low + + * New upstream release. + * Upstream source has partially been moved to update-manager. This + has resulted in some packaging changes. + * debian/control: Add dependency on update-manager-core for + computer-janitor, on the version of update-manager-core that includes + the computer-janitor core code (plugin management, plugins). + + -- Lars Wirzenius Thu, 19 Feb 2009 09:37:52 +0200 + +computer-janitor (1.11-0ubuntu1) jaunty; urgency=low + + * New upstream release. + * Package renamed to computer-janitor and computer-janitor-gtk. + * /usr/share/omf/* removed, due to not being used. + * The manpage for the -gtk version moved to the -gtk package, where it + belongs. + * debian/computer-janitor-gtk.lintian-overrides: Wrote. Lintian complains + about using gksu rather than su-to-root, but that's not available on + Ubuntu by default. Lintian also complains about the Debian changelog + file being a symlink, which is something (Ubuntu's?) cdbs/debhelper + do automatically, so if it is to get fixed, it should be fixed there, + but I'm not sure it's worth fixing. Lintian's justification for this + seems unsatisfactory. + * Updated build-dependency on debhelper to 5.50.51~, since we use + dh_icons. + + -- Lars Wirzenius Tue, 03 Feb 2009 09:53:38 +0200 + +system-cleaner (1.10.5-0ubuntu1) jaunty; urgency=low + + * New upstream release. + + -- Lars Wirzenius Fri, 16 Jan 2009 14:38:04 +0200 + +system-cleaner (1.10.4-0ubuntu3) jaunty; urgency=low + + * New upload, without changes, to work around problem on Launchpad + (Soyuz) which has removed all "Architecture: all" packages from + the armel Packages files. On request from Colin Watson. + + -- Lars Wirzenius Mon, 22 Dec 2008 17:20:43 +0200 + +system-cleaner (1.10.4-0ubuntu2) intrepid-proposed; urgency=low + + * The "viime tingan pakettilisäykset ovat huono idea" release. + * Added Polish translation from Piotr Makowski. (LP: #290196) + * The apt Packages list is now checked for sanity. (LP: #290024) + * Icon is now shown in menu, and by the window manager. + (LP: #274714) + * The current kernel will now never be considered cruft. + (LP: #285657) + * Now asks user to confirm that they want to remove packages or remove + other cruft. (LP: #285888) + * Package short description is now shown in the user interface. + (LP: #286394) + * The GTK UI now shows column headers, so that it is clear what the + tick column means. (No bug reported about this explicitly, but it + has come up repeatedly.) + * Support for whitelists in /etc/cruft-remover.d/*.whitelist added. + See the cruft-remover(8) manual page for details. This can later be + seeded with the most common third-party packages, until dpkg+apt + get sufficient meta data to deal with this in a better way. + (Does not quite close LP: 285746.) + + -- Lars Wirzenius Fri, 07 Nov 2008 15:58:25 +0200 + +system-cleaner (1.10.4-0ubuntu1) intrepid; urgency=low + + * New upstream release. + - Renamed to Cruft Remover. Package name stays the same for release + management reasons. Name change is due to an existing trademark + for the old name. + - .desktop file now support translations via po files (Closes: LP#287538). + - Updated translations for Finnish, Japanese, French, Spanish. + - A code-crashing typo fixed (Closes: LP#286731). + - Moved to the System/Administration menu (Closes: LP#286458). + - Does not add the relatime mount option if noatime is used + (Closes: LP#286468). + + -- Lars Wirzenius Mon, 27 Oct 2008 14:04:43 +0200 + +system-cleaner (1.10.3-0ubuntu1) intrepid; urgency=low + + * New upstream version, with fixes for logging problems found by James + Westby. + + -- Lars Wirzenius Wed, 15 Oct 2008 16:09:53 +0300 + +system-cleaner (1.10.2-0ubuntu1) intrepid; urgency=low + + * New upstream version. Fixes bugs in Ubuntu: + - throws exception when syslog isn't installed/running (LP:#274970) + - Not translated and doesn't allow for translations (LP:#279580) + - system-cleaner crashed with LockFailedException in _fetchArchives() + (LP:#281657) + - help button isn't functional (LP:#279577) + - request to be included in intrepid (LP:#283682) + + -- Lars Wirzenius Wed, 15 Oct 2008 12:28:29 +0300 + +system-cleaner (1.10.1-0ubuntu1) intrepid; urgency=low + + * New uptream version. (LP: #279092) + + -- Lars Wirzenius Mon, 06 Oct 2008 21:45:54 +0300 + +system-cleaner (1.10-0ubuntu1) intrepid; urgency=low + + * New upstream version. + * debian/control: Added versioned dependency from system-cleaner-gtk + to system-cleaner, so that the packages don't get out of sync. + * debian/control: Added build dependency on python-apt. + + -- Lars Wirzenius Tue, 30 Sep 2008 23:57:49 +0300 + +system-cleaner (1.9-0ubuntu1) hardy; urgency=low + + * New upstream version, fixes bugs: + - "System Cleaner Does Not Refresh Following Cleaning" (LP: #274715) + - "System Cleaner Cleanup Button Is Always Enabled" (LP: #274717) + + -- Lars Wirzenius Fri, 26 Sep 2008 20:45:05 +0300 + +system-cleaner (1.8-0ubuntu1) intrepid; urgency=low + + * New upstream version. Fixes: + - "Clicking on lines should not {de}select options" (LP:271390) + - " system-cleaner wants to cleanup /" (LP:271234) + * debian/copyright: Include license-check's copyright info. Thanks to + Steve Langasek for pointing out that it was missing. + + -- Lars Wirzenius Tue, 23 Sep 2008 00:56:53 +0300 + +system-cleaner (1.7-0ubuntu1) intrepid; urgency=low + + * system-cleaner-gtk is now multi-threaded, so that the user interface + does not freeze during long operations. + * /var/lib/system-cleaner is now handled by postinst and postrm. + * debian/rules: Added Vcs-Bzr and Homepage. + * debian/copyright: Fixed to refer to GPL-3 only. + * debian/control: Removed warnings about alpha status of software, + suggested by Michael Vogt. + + -- Lars Wirzenius Fri, 12 Sep 2008 21:42:53 +0300 + +system-cleaner (1.6) hardy; urgency=low + + * Wrote a GUI version with GTK. + * Added a system-cleaner-gtk package. Not including the GUI version in + the main package, so that it can be install on, say, a server, without + dragging in lots of GUI stuff. + + -- Lars Wirzenius Wed, 20 Aug 2008 23:09:53 +0300 + +system-cleaner (1.5) hardy; urgency=low + + * Add fstab plugin. Added dependency on python-fstab; at least version + 1.2 is required, because the earlier versions were buggy. + + -- Lars Wirzenius Thu, 14 Aug 2008 23:41:53 +0300 + +system-cleaner (1.4) hardy; urgency=low + + * Make system-cleaner the command line version not emit a warning + from PyGTK when running without $DISPLAY. + + -- Lars Wirzenius Mon, 11 Aug 2008 21:16:53 +0300 + +system-cleaner (1.3) hardy; urgency=low + + * Undo the python-apt versioned dependency. Instead, don't install + the autoremoval plugin, for now. + * Cruft names are now prefixed with their type. This will avoid + conflicts between packages, files, users, etc, that have the same + name. + + -- Lars Wirzenius Wed, 06 Aug 2008 02:15:53 +0300 + +system-cleaner (1.2) hardy; urgency=low + + * Made the dependency on python-apt be versioned, since we need a + version that provides the isAutoRemovable method to Package + objects. + + -- Lars Wirzenius Wed, 06 Aug 2008 02:15:53 +0300 + +system-cleaner (1.1) hardy; urgency=low + + * Plugins are now included in the package. + + -- Lars Wirzenius Wed, 06 Aug 2008 01:15:53 +0300 + +system-cleaner (1.0) hardy; urgency=low + + * First public release. + + -- Lars Wirzenius Tue, 05 Aug 2008 21:16:53 +0300 --- computer-janitor-2.1.0.orig/debian/computer-janitor.postrm +++ computer-janitor-2.1.0/debian/computer-janitor.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +# postinst creates /var/lib/computer-janitor. Running computer-janitor +# creates state.dat in that directory. That file is similar to a config +# file: it should be deleted at purge, but not at normal package +# removal. We handle that here. + +case "$1" in + purge) + rm -f /var/lib/computer-janitor/state.dat + rmdir /var/lib/computer-janitor + ;; +esac + + +#DEBHELPER# --- computer-janitor-2.1.0.orig/debian/computer-janitor-gtk.lintian-overrides +++ computer-janitor-2.1.0/debian/computer-janitor-gtk.lintian-overrides @@ -0,0 +1,2 @@ +computer-janitor-gtk binary: su-wrapper-not-su-to-root +computer-janitor-gtk binary: debian-changelog-file-is-a-symlink --- computer-janitor-2.1.0.orig/debian/copyright +++ computer-janitor-2.1.0/debian/copyright @@ -0,0 +1,35 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59 +Source: http://archive.ubuntu.com/ubuntu/pool/main/c/computer-janitor/ +Maintainer: Lars Wirzenius + +Files: * +Copyright: © 2008-2009 Canonical, Ltd. +License: GPL-3 + +Files: license-check +Copyright: © 2007-2008 Lars Wirzenius +License: GPL-2+ + 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 2 of the License, or + (at your option) any later version. + . + On a Debian system, you can find a copy of the GPL version 2 in + /usr/share/common-licenses/GPL-2. + +Files: data/*.png +Copyright: © 2008 Marco Rodrigues +License: GPL-3 + +Files: debian/* +Copyright: © 2008-2009 Canonical, Ltd. + © 2009 Julian Andres Klode +License: GPL-3 + +License: GPL-3 + 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, version 3 of the License. + . + On a Debian system, you can find a copy of the GPL version 3 in + /usr/share/common-licenses/GPL-3. --- computer-janitor-2.1.0.orig/debian/computer-janitor.install +++ computer-janitor-2.1.0/debian/computer-janitor.install @@ -0,0 +1,8 @@ +usr/bin/computer-janitor +usr/share/locale +usr/share/man/man8/computer-janitor.8 +usr/share/computerjanitor +debian/default.whitelist etc/computer-janitor.d +usr/share/polkit-1/actions +usr/share/dbus-1 +etc/dbus-1