lp://staging/~ari-tczew/shotwell/merge
- Get this branch:
- bzr branch lp://staging/~ari-tczew/shotwell/merge
Branch merges
- Robert Ancell: Approve
- Iain Lane: Pending requested
-
Diff: 1177 lines (+514/-386)14 files modifieddebian/changelog (+160/-0)
debian/control (+31/-31)
debian/copyright (+279/-296)
debian/manpages (+0/-1)
debian/patches/02_desktop_translations.patch (+4/-0)
debian/patches/06_uoa.patch (+1/-10)
debian/patches/format_string.patch (+0/-16)
debian/patches/hardening.patch (+18/-5)
debian/patches/series (+0/-1)
debian/patches/update_translation_list.patch (+7/-3)
debian/rules (+9/-7)
debian/shotwell-video-thumbnailer.1 (+0/-13)
debian/shotwell.lintian-overrides (+4/-1)
debian/watch (+1/-2)
Branch information
Recent revisions
- 169. By Artur Rona
-
* Merge from Debian unstable. Remaining changes:
- debian/control, debian/test/*:
+ Add autopilot autopkgtest to check import from a libgphoto2
camera (simulated with umockdev, recorded from a Canon
PowerShot SX200).
debian/tests/import will run under a local session D-BUS
and xvfb, but you can also run the test interactively with
"cd debian/tests; autopilot run autopilot_tests".
- debian/control:
+ Suggest account plugins.
+ Bump breaks/replaces since we didn't take the package
split until now.
- debian/control, debian/rules:
+ Run intltool-update on build.
+ Build-Depends on intltool.
- debian/patches/ 02_desktop_ translations. patch:
+ Don't translate the .desktop files, they work with gettext
and the build system translates them all into English.
- debian/patches/ 06_uoa. patch, debian/control:
+ Add Ubuntu Online Accounts support.
+ Build-Depends on libaccounts-glib-dev and libsignon-glib-dev.
- debian/patches/ update_ translation_ list.patch:
+ Don't list deprecated source to translate.
- debian/patches/ libexec. patch:
+ Dropped, upstream supports libexecdir now.
+ Set libexec to /usr/lib/shotwell.
- debian/control, debian/rules:
+ Build with Unity support.
+ Build-Depends on libunity-dev.
+ configure --disable-icon-update
- debian/control, debian/rules:
+ Build with scour for SVG optimization.
+ Build-Depends on python-scour.
* Drop following change, already fixed in Debian:
- debian/watch: Update to GNOME FTP location.
* Refresh patches.
* New upstream release.
* Add sharedobject-in-library- directory- missing- soname to
lintian-overrides.
* debian/patch/hardening .patch:
- Add removal of --fatal-warnings at plugins/Makefile. plugins. mk
to prevent build errors on armel and mips.
* New upstream release (Closes: #762357).
* debian/control:
- Bump Standards-Version to 3.9.6 (no changes required).
- Change Vcs-Browser to cgit.
* debian/copyright:
- Remove deleted file icons/hidden.svg.
- Add missed file icons/import-all.png.
- Remove whitspaces at EOL.
* debian/rules:
- Enable hardening=+all because files can open over network.
- Remove useless variable assignments.
- Add --debug to configure.
* New Maintainer (Closes: #755416).
* debian/copyright:
- Rewrite into machine-readable format.
- Add myself to the list of authors for debian/*.
* debian/control:
- Set myself as maintainer.
- For previously not existing Vcs
+ Create a new git repository on alioth.
+ Add the Fields Vcs-Browser and Vcs-Git.
* New upstream release.
* debian/control:
- Set Homepage field to the new home page.
* debian/control:
- Set download reference to the new site.
* New upstream release.
* Upload to unstable.
* debian/patches/ hardening. patch:
- Refresh for new upstream release.
* debian/patches/ thumbnailer_ path.patch:
- Removed, not needed.
* debian/control:
- Re-add myself as Uploader.
- Add gnome-doc-utils to Build-Depends.
- Replace libgphoto2-2-dev with libgphoto2-dev (Closes: #739355).
* debian/manpages:
- Do not install shotwell-video-thumbnail er anymore.
* debian/shotwell- video-thumbnail er.1:
- Removed, no longer needed.
* debian/rules:
- Explicitly set libexecdir to /usr/lib (Closes: #742083).
* debian/watch:
- Point to the GNOME FTP server.
* Team upload.
* New upstream release.
* debian/patches/ format_ string. patch:
- Removed, applied upstream.
* debian/patches/ hardening. patch:
- Refresh for new upstream release.
* debian/patches/ libexec. patch
- Refresh for new upstream release.
* debian/patches/ thumbnailer_ path.patch:
- Refresh for new upstream release.
* debian/shotwell. lintian- overrides:
- Remove useless library-not-linked- against- libc tag.
* Team upload to unstable.
* debian/control:
- Bump Standards-Version to 3.9.5.
* Team upload.
* New upstream release (Closes: #726594).
- Fix FTBFS with vala 0.22 (Closes: #726510).
* debian/patches/ document- mode.patch:
- Removed, applied upstream.
* debian/patches/ hardening. patch:
- Refresh for new upstream release.
* debian/patches/ libexec. patch
- Refresh for new upstream release.
* debian/patches/ thumbnailer_ path.patch:
- Install shotwell-video-thumbnail er under /usr/bin.
* debian/control:
- Build-depend against desktop-file-utils.
- Refresh build-dependency miminum versions. - 164. By Sebastien Bacher
-
* New upstream version
* debian/patches/ 06_uoa. patch:
- refreshed for the new version
* debian/patches/ update_ translation_ list.patch:
- don't list deprecated source to translate
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/shotwell