Viewing all changes in revision 28.
- Committer: Bazaar Package Importer
- Date: 2011-05-16 22:21:08 UTC
- mfrom: (1.1.12 upstream) (18.1.1 experimental)
- Revision ID: james.westby@ubuntu.com-20110516222108-wrn3jqqa6crsbwii
* Merge with Debian experimental. Remaining Ubuntu changes:
- Add 02_lpi.patch: Add Launchpad integration.
- Add 03_unit_fix.patch: Correct base-10 prefix from KB to kB (LP #538732)
- debian/watch: Update download link.
- debian/control: Build-depend on dh-autoreconf, gnome-common.
- debian/rules: Use autoreconf.mk.
* Add bzr-builddeb configuration (merge mode).
* debian/control: Fix libnautilus-extension-dev build dependency to add our
nautilus package epoch, to ensure nautilus from GNOME 3.
- Add 02_lpi.patch: Add Launchpad integration.
- Add 03_unit_fix.patch: Correct base-10 prefix from KB to kB (LP #538732)
- debian/watch: Update download link.
- debian/control: Build-depend on dh-autoreconf, gnome-common.
- debian/rules: Use autoreconf.mk.
* Add bzr-builddeb configuration (merge mode).
* debian/control: Fix libnautilus-extension-dev build dependency to add our
nautilus package epoch, to ensure nautilus from GNOME 3.
- data/icons/256x256
- data/icons/32x32
- help/ro
- help/ro/figures
- files removed:
- .pc/00git-palimpsest-small-screens.patch
- .pc/00git-palimpsest-small-screens.patch/src
- .pc/00git-palimpsest-small-screens.patch/src/palimpsest
- files modified:
- .pc/02_lpi.patch/configure.ac
expand all
collapse all
added
removed
data/icons/16x16/palimpsest.png
data/icons/22x22/palimpsest.png
data/icons/24x24/palimpsest.png
data/icons/256x256/palimpsest.png
data/icons/32x32/palimpsest.png
data/icons/48x48/palimpsest.png
data/icons/scalable/palimpsest.svg
help/ro/figures/main-app.png
