Created by Julian Andres Klode and last modified
Get this branch:
bzr branch lp:~juliank/software-properties/debian
Only Julian Andres Klode can upload to this branch. If you are Julian Andres Klode please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Julian Andres Klode
Software Properties

Recent revisions

680. By Julian Andres Klode

* Merge with Ubuntu, remaining changes:
  - Drop driver handling
  - Drop Ubuntu release upgrade thing
  - Do not use dh-translations
  - Use copyright-format 1.0 for debian/copyright
* .assert_called() is not a valid mock method. This silently passed in
  earlier versions of Python because mocks create attributes on the fly,
  however Python 3.5 throws AttributeErrors when the missing method
  starts with "assert" for exactly this reason. Use assertTrue() on
  .called instead.
* debian/control: Bump Standards-Version to 3.9.6.
* Fix syntax errors in the KDE frontend.
* lp:~mpt/software-properties/1377742-markup:
  - Factors out Pango markup from translatable strings, to avoid problems
    like LP: #1377742. Also switches to using <small> for alert secondary
    text, rather than <b><big> for primary text.
* SoftwareProperties.py: self.options can be None, don't crash if this is
  the case.
* lp:~evarlast/software-properties/support-update:
  - add -u, --update option to apt-add-repository
* data/gtkbuilder/dialog-add.ui: set label width, that's needed with
  the new gtk
* Add missing dbus-x11 test dependency.
* cloudarchive: Enable support for the Kilo Ubuntu Cloud Archive on
  14.04 (LP: #1412465).
* fix autopkgtest failure
* Port kde ui to Qt 5
* list some extra known keys for translation, thanks feng-kylin
  (lp: #1306494)
* lp:~larsu/software-properties/fix-wide-dialog:
  - dialog-cache-outofdate: make sure the label is wrapped at ~70

* lp:~brunonova/software-properties/lp1383289:
  - fix dragging a key into the list of keys in the "Authentication"
    tab (LP: 1383289)
* lp:~brunonova/software-properties/lp1381050:
  - fix import of keys with special chars (LP: #1381050)
* If adding a PPA from a foreign distribution, use that distribution's
  current series as the codename.
* Add pyflakes to autopkgtest dependencies.
* fix autopkgtest
* add more tests
* pyflakes cleanup
* make PPA suggestions work again by using the LP api
  directly instead of using python-launchpadlib (which is
  not available for py3)

* support distros like "ubuntu-rtm" in add-apt-repository
* cloudarchive: Teach cloud-archive: prefix which Ubuntu Cloud Archive's
  map to which Ubuntu releases, adding support for Juno on 14.04
  (LP: #1350291).
* cloudarchive: Tidy messages to have correct capitalization.
* software-properties-dbus:
  - do not crash if locale.setlocale() fails (LP: #1314660)
* software-properties-dbus: force C.utf-8 locale if C is used
  to ensure utf-8 support when reading sources.list LP: #1069019
* software-properties-kde : Work around crash in sip by skipping the
  + destructors of SIP objects. (LP: #1307170)
* Add "Additional Drivers" desktop file for the non {GNOME,Unity,KDE}
  flavors (LP: #1060543) - thanks to Unity193
* gnupg version 1.4.16 was changed not to require a trustdb with
  --trust-model set to always
* The new gtk doesn't wrap label by itself, do that for the drivers text
* data/software-properties-gtk.desktop.in:
  - Show in both GNOME control center and Unity control center (LP: #1257505)
* Stop using deprecated GObject constructors with positional arguments.
* Remove unneeded setting of modified_sourceslist. Thanks to Bruno Nova
  for the patch.

* do not crash for packages without a candidate
* debian/control:
  - depends on python-apt-common (>= 0.9), which is the version containing
    the trusty definition, without it you can't use add-apt-repository
    without error (lp: #1257765)
  - depends on python-pycurl, ppa.py uses it (lp: #1249080)
* Ensure package sources are refreshed after modification
  Fixes Bug LP: #1075537 (and, indirectly, Bug LP: #782953 it seems).
* Restore the removal of a line feed from a source (LP: #1239893)
* debian/manpages/add-apt-repository.1: Documented options -m and -s of
  add-apt-repository (LP: #1229092)
* softwareproperties/gtk/SoftwarePropertiesGtk.py: don't use the
  gtk-logout-helper command, it has been deprecated and dropped from the
  indicator-session binary, use gnome-session instead (lp: #1241210)
* support adding cloud-archive repositories using syntax like
  cloud-archive:havana (LP: #1233486)
* SECURITY UPDATE: possible privilege escalation via policykit UID lookup
  - softwareproperties/dbus/SoftwarePropertiesDBus.py: pass
    system-bus-name as a subject instead of pid so policykit can get the
    information from the system bus.
  - CVE-2013-1061

679. By Julian Andres Klode

Release 0.92.25debian1

678. By Julian Andres Klode

Drop help/* from debian/copyright

677. By Julian Andres Klode

Merge 0.92.25

676. By Julian Andres Klode

Disable Ubuntu stuff like drivers and new releases (Closes: #666869)

675. By Julian Andres Klode

Merge with Ubuntu saucy.

674. By Julian Andres Klode


673. By Julian Andres Klode

Disable tests for now, they still don't work

672. By Julian Andres Klode

Merge with Ubuntu 12.04 ("precise") LTS

671. By Julian Andres Klode

Release 0.82.4debian3

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.