← Back to branch summary

~juliank/software-properties/debian

~juliank/software-properties/debian

Viewing all changes in revision 675.

Committer: Julian Andres Klode
Date: 2013-07-14 15:48:15 UTC
mfrom: (656.1.217 main)
Revision ID: jak@debian.org-20130714154815-p0wh01q5uwld94bx

Merge with Ubuntu saucy.

files added:
data/icons/16x16/apps/software-properties.png

data/icons/24x24/apps/software-properties.png

data/icons/64x64

data/icons/64x64/apps

data/icons/64x64/apps/software-properties.png

data/icons/scalable/apps/disable-device.svg

data/icons/scalable/apps/other-driver.svg

data/icons/scalable/apps/recommended-driver.svg

data/icons/scalable/apps/software-properties.svg

data/software-properties-gnome.desktop.in

debian/python-software-properties.install

debian/python3-software-properties.install

debian/software-properties-common.links

debian/software-properties-common.manpages

debian/tests

debian/tests/control

debian/tests/run-tests

tests/__init__.py

files removed:
data/icons/22x22

data/icons/22x22/apps

debian/dirs

debian/python-software-properties.install

debian/python-software-properties.links

debian/python-software-properties.manpages

tests/Makefile

tests/test_whitelist_adding.py

files modified:
.bzr-builddeb/default.conf

add-apt-repository

data/gtkbuilder/main.ui

data/icons/48x48/apps/software-properties.png

data/software-properties-gtk.desktop.in

debian/changelog

debian/compat

debian/control

debian/manpages/add-apt-repository.1

debian/rules

debian/software-properties-common.install

debian/software-properties-gtk.install

debian/software-properties-kde.install

setup.cfg

setup.py

software-properties-dbus

software-properties-gtk

software-properties-kde

softwareproperties/AptAuth.py

softwareproperties/CountryInformation.py

softwareproperties/MirrorTest.py

softwareproperties/SoftwareProperties.py

softwareproperties/__init__.py

softwareproperties/dbus/SoftwarePropertiesDBus.py

softwareproperties/gtk/DialogAdd.py

softwareproperties/gtk/DialogAddSourcesList.py

softwareproperties/gtk/DialogCacheOutdated.py

softwareproperties/gtk/DialogEdit.py

softwareproperties/gtk/DialogMirror.py

softwareproperties/gtk/SimpleGtkbuilderApp.py

softwareproperties/gtk/SoftwarePropertiesGtk.py

softwareproperties/gtk/utils.py

softwareproperties/kde/CdromProgress.py

softwareproperties/kde/DialogAdd.py

softwareproperties/kde/DialogEdit.py

softwareproperties/kde/DialogMirror.py

softwareproperties/kde/I18nHelper.py

softwareproperties/kde/SoftwarePropertiesKDE.py

softwareproperties/ppa.py

tests/test_aptsources.py

tests/test_dbus.py

tests/test_lp.py *

Show diffs side-by-side

added added

removed removed

.bzr-builddeb/default.conf

add-apt-repository

data/gtkbuilder/main.ui

data/icons/16x16/apps/software-properties.png

data/icons/22x22/

data/icons/22x22/apps/

data/icons/24x24/apps/software-properties.png

data/icons/48x48/apps/software-properties.png

data/icons/64x64/

data/icons/64x64/apps/

data/icons/64x64/apps/software-properties.png

data/icons/scalable/apps/disable-device.svg

data/icons/scalable/apps/other-driver.svg

data/icons/scalable/apps/recommended-driver.svg

data/icons/scalable/apps/software-properties.svg

data/software-properties-gnome.desktop.in

data/software-properties-gtk.desktop.in

debian/changelog

debian/manpages/add-apt-repository.1

debian/python-software-properties.install

debian/python-software-properties.install

debian/python-software-properties.links

debian/python-software-properties.manpages

debian/python3-software-properties.install

debian/software-properties-common.install

debian/software-properties-common.links

debian/software-properties-common.manpages

debian/software-properties-gtk.install

debian/software-properties-kde.install

debian/tests/control

debian/tests/run-tests

software-properties-dbus

software-properties-gtk

software-properties-kde

softwareproperties/AptAuth.py

softwareproperties/CountryInformation.py

softwareproperties/MirrorTest.py

softwareproperties/SoftwareProperties.py

softwareproperties/__init__.py

softwareproperties/dbus/SoftwarePropertiesDBus.py

softwareproperties/gtk/DialogAdd.py

softwareproperties/gtk/DialogAddSourcesList.py

softwareproperties/gtk/DialogCacheOutdated.py

softwareproperties/gtk/DialogEdit.py

softwareproperties/gtk/DialogMirror.py

softwareproperties/gtk/SimpleGtkbuilderApp.py

softwareproperties/gtk/SoftwarePropertiesGtk.py

softwareproperties/gtk/utils.py

softwareproperties/kde/CdromProgress.py

softwareproperties/kde/DialogAdd.py

softwareproperties/kde/DialogEdit.py

softwareproperties/kde/DialogMirror.py

softwareproperties/kde/I18nHelper.py

softwareproperties/kde/SoftwarePropertiesKDE.py

softwareproperties/ppa.py

tests/__init__.py

tests/test_aptsources.py

tests/test_dbus.py

tests/test_lp.py

tests/test_whitelist_adding.py

Older »