aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-08-07 19:02:11 +0100
committerTed Gould <ted@canonical.com>2009-08-07 19:02:11 +0100
commit1a01d82a307045a9f07f47aaec13d1731501a9b3 (patch)
tree3720f9113dc4a301503d0027c519f4638383ba00
parenta3eb3eaa1500d9c9778f407c7e939a890aa9bdca (diff)
parent4aa0584cde9bd48652d211c4500cc012507e281e (diff)
parent853ef5b9085fa6167babd0e8ea962666eeab3d7f (diff)
downloadlibayatana-indicator-1a01d82a307045a9f07f47aaec13d1731501a9b3.tar.gz
libayatana-indicator-1a01d82a307045a9f07f47aaec13d1731501a9b3.tar.bz2
libayatana-indicator-1a01d82a307045a9f07f47aaec13d1731501a9b3.zip
* Merging onto the main packaging branch.
* Renaming the second Bonobo server description file to match that of the FastUserSwitchApplet. * Upstream merge for better naming of the applet. * Updating from upstream with two (count them) two applets installed in the source. * debian/control: Adding information on indicator-applet-sus which is a different applet for the SUS indicator. * debian/indicator-applet.install: Making it more specific so that it doesn't grab the directories that now have additional files created by indicator-applet-sus existing. * debian/indicator-applet-sus.install: List files that are now used by the new binary package.