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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntu/wily/redshift

Sebastien Bacher: Approve on 2015-08-13

Diff: 68233 lines (+40309/-9790)

104 files modified

.pc/applied-patches (+0/-2)
.pc/remove_autostart.patch/src/redshift-gtk/statusicon.py (+0/-345)
.pc/retry-geoclue.patch/src/location-geoclue.c (+0/-209)
HACKING (+131/-12)
Makefile.am (+34/-7)
Makefile.in (+147/-45)
NEWS (+51/-4)
README (+15/-6)
aclocal.m4 (+6/-0)
config.guess (+99/-214)
config.h.in (+19/-3)
config.sub (+32/-24)
configure (+10127/-609)
configure.ac (+135/-5)
contrib/redshift.spec.in (+0/-135)
data/appdata/redshift-gtk.appdata.xml.in (+20/-0)
data/applications/redshift-gtk.desktop (+0/-11)
data/applications/redshift-gtk.desktop.in (+11/-0)
debian/README.Debian (+15/-0)
debian/changelog (+48/-0)
debian/compat (+1/-1)
debian/control (+9/-8)
debian/patches/remove_autostart.patch (+3/-5)
debian/redshift-gtk.menu (+1/-1)
debian/rules (+2/-2)
ltmain.sh (+9655/-0)
m4/intltool.m4 (+237/-0)
m4/libtool.m4 (+7992/-0)
m4/ltoptions.m4 (+384/-0)
m4/ltsugar.m4 (+123/-0)
m4/ltversion.m4 (+23/-0)
m4/lt~obsolete.m4 (+98/-0)
po/LINGUAS (+1/-0)
po/Makefile.in.in (+163/-370)
po/POTFILES.in (+7/-0)
po/Rules-quot (+0/-47)
po/ar.po (+0/-615)
po/bg.po (+337/-141)
po/boldquot.sed (+0/-10)
po/ca.po (+0/-641)
po/cs.po (+347/-137)
po/da.po (+336/-136)
po/de.po (+336/-136)
po/el.po (+335/-138)
po/en@boldquot.header (+0/-25)
po/en@quot.header (+0/-22)
po/es.po (+336/-136)
po/et.po (+336/-139)
po/eu.po (+336/-136)
po/fi.po (+336/-136)
po/fr.po (+336/-136)
po/gl.po (+0/-629)
po/he.po (+337/-139)
po/hi.po (+335/-138)
po/hr.po (+336/-136)
po/hu.po (+845/-0)
po/insert-header.sin (+0/-23)
po/it.po (+336/-136)
po/ja.po (+337/-141)
po/ka.po (+337/-141)
po/lt.po (+336/-136)
po/nb.po (+336/-136)
po/nl.po (+0/-642)
po/pl.po (+0/-639)
po/pt.po (+335/-135)
po/pt_BR.po (+336/-136)
po/quot.sed (+0/-6)
po/redshift.pot (+0/-614)
po/remove-potcdate.sin (+0/-19)
po/ru.po (+336/-136)
po/stamp-po (+0/-1)
po/sv.po (+337/-138)
po/zh_CN.po (+337/-141)
redshift.1 (+37/-6)
src/Makefile.am (+32/-0)
src/Makefile.in (+241/-39)
src/colorramp.c (+29/-6)
src/colorramp.h (+6/-2)
src/gamma-drm.c (+2/-2)
src/gamma-drm.h (+4/-1)
src/gamma-dummy.c (+5/-4)
src/gamma-dummy.h (+3/-3)
src/gamma-quartz.c (+145/-0)
src/gamma-quartz.h (+44/-0)
src/gamma-randr.c (+9/-9)
src/gamma-randr.h (+3/-3)
src/gamma-vidmode.c (+5/-4)
src/gamma-vidmode.h (+5/-3)
src/gamma-w32gdi.c (+4/-4)
src/gamma-w32gdi.h (+5/-3)
src/hooks.c (+113/-0)
src/hooks.h (+29/-0)
src/location-corelocation.h (+38/-0)
src/location-corelocation.m (+163/-0)
src/location-geoclue.c (+0/-221)
src/location-geoclue.h (+0/-44)
src/location-geoclue2.c (+298/-0)
src/location-geoclue2.h (+38/-0)
src/redshift-gtk/Makefile.in (+67/-15)
src/redshift-gtk/statusicon.py (+308/-121)
src/redshift.c (+436/-165)
src/redshift.h (+20/-4)
src/systemtime.c (+42/-13)
src/systemtime.h (+2/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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.

19. By Daniel Holbach on 2014-03-11

merged lp:~dragly/redshift/appindicator-dependency

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.