lp:~noskcaj/ubuntu/wily/redshift/merge

Created by Jackson Doak on 2015-06-27 and last modified on 2015-06-27
Get this branch:
bzr branch lp:~noskcaj/ubuntu/wily/redshift/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jackson Doak
Status:
Development

Recent revisions

23. By Jackson Doak on 2015-06-27

leave patches unapplied

22. By Jackson Doak on 2015-06-27

* Merge from Debian. Remaining changes:
  - debian/rues: Add --enable-ubuntu
  - debian/patches/retry-geoclue.patch: Retry geoclue a few times so
    redshift does not explode at startup.
* [a62084b] Fix exact version in Breaks and Replaces.
  Thanks to Axel Beckert (Closes: #789966)
* [e7f571d] Add build dependency on dh-python
* [f7ea959] Refresh patches
* [3263caa] No need to override dh_auto_install
* [2b1374c] Bump compat level to 9
* debian/control: Created transitional package for
  gtk-redshift → redshift-gtk
* debian/gtk-redshift.* files renamed to redshift-gtk.*.
* debian/redshift-gtk.links: Created to make transitional symlink
  from old name to new.
* [d087430] Explicitly disable old geoclue support
* [16db3c2] Add a Recommends on geoclue 2
* [cf236e4] Add documentation about how to use Geoclue 2
* [9d8f9bb] Use X-Python3-Version for the required python3 version.
  Thanks to Jackson Doak (Closes: #786818)
* [03c69c5] Rename package from gtk-redshift -> redshift-gtk.
  Thanks to Jackson Doak (Closes: #757557)
* [56e5b64] Imported Upstream version 1.10 (Closes: #786638)
* [6d3d69c] Add intltool as build dep
* [b2c49de] Enable geoclue2 support

21. By Jackson Doak on 2015-06-27

Merging shared upstream rev into target branch.

20. By Jackson Doak on 2014-11-01

[ Jackson Doak ]
* Merge from Debian (LP: #1309666). Remaining changes:
  - debian/control:
    + Created transitional package for gtk-redshift → redshift-gtk.
    + Added python-appindicator as a dependency for redshift-gtk.
    + Added dependency on geoclue-hostip.
  - debian/gtk-redshift.* files renamed to redshift-gtk.*.
  - debian/redshift-gtk.links: Created to make transitional symlink from old
    name to new.
  - debian/rules:
    + add --enable-ubuntu to install ubuntu icons
    + Removed dh_auto_install override.
  - debian/patches/retry-geoclue.patch: Retry geoclue a few times so
    redshift does not explode at startup.
* debian/control: Use X-Python3-Version instead of XS-Python-Version

[ Dmitry Shachnev ]
* Update dependency: python-appindicator → gir1.2-appindicator3-0.1.

18. By Iain Lane on 2013-11-11

Fix Breaks/Replaces versions to be << first-version-without-new-files.
Fixes upgrade failure caused by conflicting files. (LP: #1250006)

17. By Jonathan Davies on 2013-11-08

[ Mark Russell ]
Added dependency on geoclue-hostip. (LP: #868904)

16. By Jonathan Davies <email address hidden> on 2013-11-08

debian/patches/retry-geoclue.patch: Reinstated and sent to upstream
developer.

15. By Jonathan Davies <email address hidden> on 2013-11-08

debian/control: Added automake to build-dependencies too.

14. By Jonathan Davies on 2013-11-08

* New upstream release.
* debian/control:
  - Created transition package for gtk-redshift → redshift-gtk.
  - Added autoconf, autopoint and libtool to build-dependencies for upstream
    "bootstrap" script.
  - Added libxext-dev to build-dependencies, needed for vidmode check.
  - Updated Standards-Version.
* debian/gtk-redshift.* files renamed to redshift-gtk.*.
* debian/redshift-gtk.links: Created to make transitional symlink from old
  name to new.
* Dropped: debian/patches/retry-geoclue.patch - let's try upstream's code
  instead.
* debian/patches/retry-geoclue.patch: Also dropped, this seems to have been
  a provider issue.
* debian/rules:
  - Removed dh_auto_install override.
  - Created dh_clean override to clean up files left behind by upstream
    bootstrap script.

Branch metadata

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

Subscribers