Last commit made on 2012-06-17
Get this branch:
git clone -b debian/wheezy https://git.launchpad.net/ubuntu/+source/software-properties
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

13bcd6c... by Julian Andres Klode on 2012-06-16

Import patches-unapplied version to debian/sid

Imported using git-ubuntu import.

Changelog parent: aeb8f89fb2845e68691d4b79cb576305782869fe

New changelog entries:
  * Merge with Ubuntu 12.04 ("precise") LTS
  * manually shift the policy index to work around wrong upgrade policy being
    set. (LP: #944876)
  * software-properties-dbus: Use GLib instead of the deprecated gobject.
    Update debian/control accordingly.
  * debian/control: Fix -gtk dependency: python-gobject → python-gi.
  [ Gabor Kelemen ]
  * data/gtkbuilder/main.ui:
    - fix missing "translatable" property (LP: #953918)
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: Drop duplicate definition
    of on_treeview_sources_cursor_changed().
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: Fix crash when closing
    the application with the window title bar button. (LP: #911834)
  * add-apt-repository: Intercept ValueError in addition to URLError, as this
    is the error thrown when trying to decode invalid JSON (which happens on
    404 pages etc.). (LP: #861258)
  * softwareproperties/SoftwareProperties.py, _find_source_from_string():
    Reload the sources list before searching, as it might have changed while
    the D-BUS backend was running. (LP: #854818, #820150)
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: Add missing argument to
    menu popup() call. (LP: #815236)

aeb8f89... by Julian Andres Klode on 2012-03-06

Import patches-unapplied version 0.82.4debian3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 92153897d90aa89a90d819c4952c6a231e3d5b9e

New changelog entries:
  * Fix the GPL-3 license statement to refer to GPL-3, not LGPL-3
  * Rewrite copyright file, use copyright-format 1.0
  * Upload 0.8X branch from experimental to unstable
  * Merge with Ubuntu, remaining differences:
    - debian/control: Maintainer, VCS differences
    - debian/rules: Do not use dh-translations
  * The following issues are fixed:
    - Now build against Python 2.7 (Closes: #644539)
    - Updated for latest GObject Introspection (Closes: #639611)
  * Change Standards-Version to 3.9.3, no further changes required
  * Move KeysModified signal so add-apt-repository doesn't crash.
    (LP: #926152)
  [ Brian Murray ]
  * when adding new repositories use sourceslist.add instead of append thereby
    preventing duplicate entires. Thanks to Nick Russo for the patch.
    LP: #854841
  [ Robert Roth ]
  * Updated expand properties to properly expand the bottom component to avoid
    putting empty space between components. LP: #912557
  * Added symbolic link for add-apt-repository manpage under the
    apt-add-repository name, LP: #620098
  * Changed Revert button mnemonic to avoid collision with Remove, LP: #652523
  * Handle URLError from ppa pages, instruct the user to check the internet
    connection (LP: #502698)
  [ Marc Deslauriers ]
  * SECURITY UPDATE: incorrect ssl certificate validation (LP: #915210)
    - softwareproperties/ppa.py: use pycurl to download the signing key
    - tests/test_lp.py: add test.
    - debian/control: add python-pycurl dependency.
    - CVE-2011-4407
  * Wait for PPA GPG key to get imported before ending thread (LP: #888417)
  [ Michael Vogt ]
  * merged from debian-sid, thanks to Julian Andres Klode
  * add-apt-repository:
    - fail if the user tries to add a private PPA
  [ Sebastien Bacher ]
  * Stop listing software-properties in gnome-control-center since
    it's available from software-center and update-manager
    (desktop-p-control-center-cleanup spec)
  [ Manish Sinha (मनीष सिन्हा) ]
  * lp:~manishsinha/software-properties/fix-887249-handle-404-error:
    - improve error handling for incorrect/misspelled PPAs (LP: #887249)
  * lp:~manishsinha/software-properties/list-ppa-names-for-user-or-team:
    - Made the change to alert the user that a user/team does not have any PPAs

  [ Robert Roth ]
  * lp:~evfool/software-properties/lintianfixes:
    - Fixed capitalization issue in control file
  * Fix warnings logged to terminal about inexistent handlers by checking
    if the handlers exist
  * Change geeky authentication text displayed on policykit auth dialog to
    the one suggested by mpt (LP: #828285)
  * Reset the popcon checkbox value if changed, but auth failed (LP: #874759)
  * Apt-add-repository --remove changed to also remove the debsrc
    line (LP: #838507)
  * Apt-add-repository PPA warning changed to warn you about add/removal
    depending on what you really want to do.
  * Update the manpage of apt-add-repository with the available
    options. (LP: #697546)
  * Reset the text on the mirror testing dialog after closing/canceling
    it (LP: #875679)
  * Unicode encode PPA description and displaynam to avoid
    UnicodeDecodeErrors (LP: #827355)
  * Do not expand the server combobox (LP: #875131)
  * add-apt-repository:
    - honor FORCE_ADD_APT_REPOSITORY (LP: #890708)
  * lp:~yofel/software-properties/lp-819793:
    - Fix for bug 819793 as disable_child_source() now need the template
      name as parameter, not the template itself )LP: #819793
  [ Philip Muskovac ]
  * lp:~yofel/software-properties/lp-819793:
    - Fix for bug 819793 as disable_child_source() now need the template
      name as parameter, not the template itself )LP: #819793

  [ Robert Roth ]
  * Fix warnings logged to terminal about inexistent handlers by checking
    if the handlers exist
  * Reset the popcon checkbox value if changed, but auth failed (LP: #874759)
  * Apt-add-repository --remove changed to also remove the debsrc
    line (LP: #838507)
  * Update the manpage of apt-add-repository with the available
    options. (LP: #697546)
  * Reset the text on the mirror testing dialog after closing/canceling
    it (LP: #875679)
  * Unicode encode PPA description and displaynam to avoid
    UnicodeDecodeErrors (LP: #827355)
  * Do not expand the server combobox (LP: #875131)
  * lp:~kelemeng/software-properties/bug853231:
    - Build with dh_translations, to localize the .policy file at
      runtime. LP: #853231
    - Add missing files to POTFILES.in (LP: #853231)
      Many thanks to Gabor Kelemen
  * lp:~kelemeng/software-properties/bug853231-upstream:
    - Add missing files to POTFILES.in (LP: #853231)
    Many thanks to Gabor Kelemen
  * softwareproperties/dbus/SoftwarePropertiesDBus.py, tests/test_dbus.py:
    - fix crash when there are unicode comments in the sources.list
      file (LP: #820028). Dbus always sends us a dbus.String which is
      type unicode, but python-apt expects utf8 encoded str
  * lp:~gandelman-a/software-properties/lp829109 :
    - add "-y" to add-apt-repository (LP: #829109). This can be
      used to avoid the confirmation prompt. Alternatively you
      can redirect stdin to /dev/null for skipping of the confirmation
  * Move from static gobject to GI GObject module, to be compatible to
    upcoming pygobject 3.0.
  * softwareproperties/ppa.py:
    - fix incorrect call call to apt-key for the fingerprint, thanks
      to Martin Pitt for the report
  [ Michael Vogt ]
  * softwareproperties/ppa.py:
    - show PPA description and confirm before adding
      (security-o-catch-all spec)
  [ Martin Pitt ]
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: Fix encoding error,
    thanks to sokolov-m-v for the patch! (LP: #815480)
  * softwareproperties/gtk/DialogMirror.py:
    - sort automatic mirror on top of the mirror list
  * debian/control:
    - remove old conflicts/replaces
  * softwareproperties/AptAuth.py:
    - move trustdb into tmpdir as gnupg insists in creating it
  * softwareproperties/gtk/SoftwarePropertiesGtk.py:
    - use policykit for changing the update interval (LP: #816061)
  * softwareproperties/gtk/SimpleGtkbuilderApp.py:
    - remove unneeded debug output for gobjects without a get_name()
  * softwareproperties/gtk/SoftwarePropertiesGtk.py:
    - do not crash if update-notifier is not installed (LP: #815016)
  * softwareproperties/AptAuth.py:
    - do not access ~/.gnupg from AptAuth() (LP: #815034)
  * softwareproperties/SoftwareProperties.py:
    - add CDROM add support into the dbus backend (LP: #815860)
  * fix crash when clicking on "updates" tab child sources,
    thanks to Sebastien Bacher
  * data/software-properties-gtk.desktop.in:
    - don't use gksu
  * debian/control:
    - remove the gksu dependency and add software-properties-common
  * debian/software-properties-common.install:
    - fix missing dbus include (thanks to seb128)
  * data/com.ubuntu.SoftwareProperties.service:
    - fix service path (thanks to seb128)
  [ Mohamed Amine IL Idrissi ]
  * Redesigned the Updates tab according to
    https://wiki.ubuntu.com/SoftwareUpdateHandling#settings (LP:
    #351484, #357676, #253412)
  [ Michael Vogt ]
  * add dbus/polkit backend, based on
  * use new dbus backend
  * automatically run tests at bzr-buildpackage time
  * data/gtkbuilder/dialog-mirror.ui: string fix regarding testing
  * merge control center fix from Rodrigo Moya, many thanks!
    (lp:~rodrigo-moya/software-properties/fix-787694) LP: #787694
  * softwareproperties/gtk/DialogCacheOutdated.py: Stop calling synaptics, use
    aptdaemon instead.
  * debian/control: Drop synaptics dependency, add
  * data/gtkbuilder/*.ui: Drop deprecated has_separator properites.
  [ Martin Pitt ]
  * debian/rules: Drop deprecated simple-patchsys. This is a native package
    anyway, we don't need a patch system.

  [ Michael Vogt ]
  * move from python-central to dh_python2
  * move from cdbs to dh7
  [ Michael Vogt ]
  * merged lp:~hodgestar/software-properties/configurable-key-server,
    many thanks
  [ Martin Pitt ]
  * software-properties-gtk: Stop forcing GTK 2, we want to use GTK 3 now.
    Update gir dependency accordingly.
  * In "Updates" tab (qt and gtk), ignore all deb-src templates.
    (LP: #768363, LP: #768469)
  * data/designer/main.ui make strings match GTK UI file LP: #760825
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: Fix wrong Gtk.MenuItem
    construction. (LP: #753570)

9215389... by Julian Andres Klode on 2011-04-06

Import patches-unapplied version 0.80.6debian1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 7ff591b08d17426cc7ce6f2f1fca3fffe945ea2d

New changelog entries:
  * Rebase Debian package against Ubuntu one.
  * python-apt 0.8 conform (Closes: #572350)
  * softwareproperties/gtk/CdromProgress.py:
    - Fix python-apt 0.8 progress->progress.base incompatibility
  * Move to debhelper 7 and dh_python2
  * software-properties-gtk: Fix crash on invalid locale. (LP: #730643)
  * softwareproperties/gtk/DialogAddSourcesList.py: Drop leftover pygtk
  * software-properties-gtk: Fix --enable-ppa to work again.
  * softwareproperties/gtk/DialogAddSourcesList.py: Fix WMFunction Gdk
    constant. (LP: #736393)
  * software-properties-gtk: Update require_version() call to current
    pygobject API. Bump python-gobject dependency accordingly.
  * softwareproperties/gtk/DialogAdd.py: Fix UnicodeDecodeError in "Add
    source" dialog. (LP: #721778)
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: Gdk.window_foreign_new()
    is currently not introspectable (and went away entirely in Gtk 3), so
    don't crash if it is not available. (LP: #718811)
  * fix typo in changelog
  * software-properties-gtk, ./softwareproperties/gtk/*: Port from pygtk to
    gobject-introspection. This works with both GTK 2 and 3, but in GTK2 we
    have to disable the drag&drop functionality (as current GTK2 does not have
    a gtk_target_entry_new() and thus you can't construct those).
  * softwareproperties/gtk/SoftwarePropertiesGtk.py: When doing string
    interpolation with translated text and unicode objects, encode the latter
    into UTF-8 first. pygtk did that for us using some black magic (by calling
  * software-properties-gtk: Force using GTK 2 for now, as in Natty we don't
    currently ship GTK 3 on the default installation (we don't have a theme
  * debian/control: Update dependencies for the pygtk → pygi switch.
  * software-properties-gtk, softwareproperties/gtk/DialogMirror.py: Drop
    calls to Gdk.threads_*(). They were insufficient and causing lockups, and
    since multi-threaded Gtk is a pain to get right, we'll rather change the
    code structure to only use Gtk from the main thread.
  * softwareproperties/gtk/DialogMirror.py: Run GTK operations in main thread,
    to avoid thread lockups.
  * softwareproperties/MirrorTest.py: Move additional MirrorTestGtk
    functionality (setting threading.Event flag and storing current
    action/progress into main MirrorTest class, so that we can entirely drop
    MirrorTestGtk from softwareproperties/gtk/DialogMirror.py. KDE still uses
    its own implementation with real threads, as this is still easier to do.
  * use port 80 by default when getting gpg keys for PPAs
    (LP: #615788)
  * add support for simplified syntax LP: #686348
  * po/pt_BR.po:
    - updated translations, thanks to Sergio Cipolla
      (closes: #593693)
  * merged lp:~kelemeng/software-properties/bug657835, many
    thanks to Gabor Kelemen (LP: #657835)
  [ Gabor Kelemen ]
  * Add translation domain info to setup_ui and its invocations.
    Fixes LP:644404
  * data/gtkbuilder/main.ui:
    - fix expand property of the button pane
  * fix deprecation warnings from python-apt 0.8
  [ Mohamed Amine IL Idrissi ]
  * data/software-properties-gtk.desktop.in: desktop file is now really
    hidden (LP: #624072)
  * Add release upgrade option to KDE UI to select between LTS and
    normal upgrade prompts LP: #631708
  * po/POTFILES.in,
    Correctly define the gtkbuilder types to those strings are in the template
  * Correct a typo in one of the add-apt-repository strings
    (lp: #630613)
  [ Michael Vogt ]
  * fix ftbfs
  [ Mohamed Amine IL Idrissi ]
  * data/software-properties-gtk.desktop.in: Menu entry is now hidden
    (LP: #624072)
  [ Amicahi Rothman ]
  * Fixed "Select Best Server" broken by PyQt signal argument changes

  [ Michael Vogt ]
  * po/pt_BR.po:
    - updated, thanks to Sergio Cipolla
  * merged lp:~and471/software-properties/gtkbuilder-and-gui-polish,
    many thanks!
  [ Jonathan Harker ]
  * Improve documentation for apt-add-repository (LP: #586790)

  [ mac9416 ]
  * Fixed bug LP: #446216: added --remove option to add-apt-reporitory.
  * Fixed Bug LP: #579669 which points out that add-apt-repository will
    create a sources.list.d file with illegal characters
    if there are illegal characters in a PPA name

  [ Andrea Corbellini ]
  * Automatically create a deb-src line when adding a new repository
    (LP: 399711)

  [ Michael Vogt ]
  * add test for LP: #579669 and use re.sub() instead of urllib.quote()
  * merged lp:~alexzak/software-properties/fixes, many thanks
  [ Erik B. Andersen ]
  * Fixed depreciation warnings

  [ Brandon Tomlinson ]
  * Altered data/glade/main.glade Put the bottom buttons in a button box
    to make the buttons assume the correct width (LP: #515990)
  * Port software-properties-kde from using install-package to using
    qapt-batch, a C++ drop-in replacement (LP: #497803)
  * Replace dependency on install-package to qapt-batch in debian/control
  * Bump Standards-Version to 3.9.1, no changes required
  * softwareproperties/ppa.py:
    - fix launchpad API path when looking for the PPA archive
      signing key
  * [KDE] Fix crash caused by translations containing distro name (LP: #545927)
  [ Michael Vogt ]
  * softwareproperties/gtk/SoftwarePropertiesGtk.py:
    - do not crash if tranient parent can not be set (LP: #83914)
  * debian/manpages/software-properties-gtk.1:
    - add man-page (thanks to Gabe Gorelick) LP: #290308
  * add-apt-repository:
    - better help output (LP: #407779)
    - do not crash if setlocale fails (LP: #467369)
  * software-properties-gtk:
    - ensure newly created ppa files are readalbe (LP: #497778)
  * data/software-properties-gtk.desktop.in:
    - fix desktop file location (thanks to Ricardo Pérez López)
      LP: #543637
  * provide apt-add-repository link (LP: #547194)
  * debian/manpages/add-apt-repository.1:
    - add man-page, thanks to Chow Loong Jin (LP: #407779)
  * fix lintian warnings
  * softwareproperties/SoftwareProperties.py:
    - show summary in addition to comment for disabled entries
      (LP: #543207)

  [ Harald Sitter ]
  * [KDE] Fix bug in I18nHelper, where it would trigger a crash if unicode()
    to UTF-8 fails. Fallback to latin1 in this case. This for example happens
    when the APT keyring contains a key with non-latin characters, which can
    happen with PPA keys, since those contain the owner's name.
  * [KDE] Fix a crash on startup encountered with localized environments
    (LP: #505964)
  * Fix cdrom progress bar popping up after being canceled (LP: #496257)
  * Fix adding cdrom source to top of sources list (LP: #162395)
  * Fix instability after failed cdrom addition (LP: #221667)
  * Fix focus in add source dialog
  [ Harald Sitter ]
  * KDE frontend: replace old manual listing of file endings for key import
    with mimetype based model (no need to support old stuff since it is so
    incredibly wrong... ending-wise that is)
  [ Amichai Rothman ]
  * Fix import of keys with non-ascii filename (LP: #350485)
  * Add source line input validation when adding a new source (LP: #116445)
  * Fix selected item and edit/remove button state after toggling a source
  * Fix alternate mirror selection corrupting sources.list (LP: #464707)
  * Fix selected mirror not shown in combobox (LP: #96110)
  * Fix mirror selection dialog error in non-ascii locale (LP: #96201)
  * Fix crash when modifying sources selection (LP: #102792)
  * Fix error handling when ppa key is missing (LP: #475220)
  * Improve keyboard tab order in some dialogs (LP: #464569)
  * Fix and improve mirror test and GUI (LP: #223047)
  * Fix mirror test timeout handling (LP: #456365)
  * Fix i18n, accelerators and styling on all dialogs (LP: #102773)
  * Fix utf8 in edit source dialog comments (LP: #489960)
  * Suffix software-properties.desktop with -gtk.desktop
  * Create a copy of that file with suffix -kde.desktop
    + Change to KDE icon and exec
    + Add NoDisplay=true, the desktop file is only necessary for kdesudo to
      have it show a proper name and icon which does not require it to show
      up anywhere
  * software-properties-kde depends on install-package for reloading the
    repository information and cache updating (LP: #367972)
  * Fix typo in software-properties-kde description (QT -> Qt)
  * if != if not ... only show key removal error if there really was a
    problem (LP: #123372)
  * Make python-software-properties go to section python
  * Add manpage for software-properties-kde (generated by kdemangen.pl from
    the kdesdk-scripts package (low maintenance)
  * Clearify license versions in copyright file
  * Bump standards version to 3.8.3
  [ Kyle Nitzsche ]
  * Use "Other Software" instead of "Third Party Software" (LP: #420672)
  [ Michael Vogt ]
  * update software-properties.pot (LP: #407240)
  [ Harald Sitter ]
  * Add actual PGP key file endings to the KDE file picker whitelist (keep
    old endings around for compability)
  * Fix the KDE UI's enable-component arg, add output to that function and
    reorder help output to list --attach as last
  * add-apt-repository:
    - fix typo (thanks to Brian Murray), LP: #399864
  * debian/control:
    - add Vcs-Bzr header
  * softwareproperties/SoftwareProperties.py:
    - allow removing of sources.list.d files with just a single
      line (LP: #399898)
  * add-apt-repository:
    - ensure that new files are created with 0644 by default
      (LP: #399709)
  * new helper script "add-apt-repository" that can be used to
    enable a repository from the commandline. Useful for e.g.
    'add-apt-repository ppa:gnome-desktop'
  * fix error in auto-upgrade settings when
    dpkg-reconfigure unattended-upgrades was used (LP: #387704)
  * po/zh_TW.po:
    - updated, thanks to Roy Chan (LP: #365040)
  * softwareproperties/kde/SoftwarePropertiesKDE.py:
    - do not error on cancel (LP: #364288)
    - use the SUDO_USER home instead of /root (if available)
      (LP: #364197)
    - add utf8() function and replace the custom converts to it
      (hopefully fixes LP: #362188)
    - disable "Find best server" for now, the threading crashing
  * softwareproperties/gtk/DialogCacheOutdated.py:
    - fix incorrect wait on synaptic (LP: #357617, LP: #349639)
  * softwareproperties/SoftwareProperties.py:
    - check/ensure apt daily cron job is executable (LP: #390319)
  * debian/rules:
    - use DH_PYTHON=include-links
  * add support for drag-n-drop public key blocks
  * fix error() function
  * add right click menu to authication treeview to
    support adding key via copy-n-paste (LP: #372577)
  * software-properties-kde:
    - set bugAddress to ""
  * Support adding PPA keys automatically (thanks to
  * support shorthand syntax for PPAs (ppa:owner or
    ppa:owner/ppa_name) when clicking on "add"
  * support new commandline option "--enable-ppa name"
  * softwareproperties/kde/DialogEdit.py,
    - fix unicode problems with KDE (thanks to Savvas)
  * debian/control:
    - put "software-properties-kde" into the kde section
      (LP: #323556)
  * softwareproperties/SoftwareProperties.py:
    - fix crash in the way md5 from hashlib is used (LP: #346863)
  * softwareproperties/gtk/DialogMirror.py:
    - fix crash when no mirrors are available (LP: #332205)
  * softwareproperties/gtk/SoftwarePropertiesGtk.py:
    - make is_seperator() more robust (LP: #335637)
  * PyKDE4 frontend polish:
    - QFileDialog -> KFileDialog
    - Pushbuttons get appropriate KIcons
    - The "Remove..." gpg key pushbutton is disabled when nothing is selected
      in the key treeview, just like the remove pushbutton in the sources
      editor tab
  * fix combobox_server unicode for bug #102773
    (thanks to Savvas Radevic)
  * fix warning from 'import md5', thanks to Marco Rodrigues
  * softwareproperties/SoftwareProperties.py:
    - if a entry is added that matches a known channel automatically
      add the right gpg signing key (LP: #328486)
  * softwareproperties/gtk/SoftwarePropertiesGtk.py:
    - show the cache outdate dialog when run with toplevel
  * sofware-properties-gtk:
    - add "--open-tab" option that opens a spefic tab number
      on startup
  * debian/*.install:
    - updated for new python policy
  * use iso_3166.xml instead of iso_3166.tab
  * softwareproperties/gtk/DialogMirror.py:
    - fixes in the mirror speed test for small sets of

7ff591b... by Gustavo Noronha Silva on 2008-12-04

Import patches-unapplied version 0.70.debian-1 to debian/experimental

Imported using git-ubuntu import.