lp://qastaging/~noskcaj/ubuntu/wily/redshift/merge2
- Get this branch:
- bzr branch lp://qastaging/~noskcaj/ubuntu/wily/redshift/merge2
Branch merges
- Michael Terry: Approve
-
Diff: 1046 lines (+108/-795)16 files modified.pc/applied-patches (+0/-2)
.pc/remove_autostart.patch/src/redshift-gtk/statusicon.py (+0/-520)
.pc/retry-geoclue.patch/src/location-geoclue.c (+0/-217)
debian/README.Debian (+0/-24)
debian/changelog (+36/-0)
debian/control (+1/-1)
debian/gbp.conf (+2/-0)
debian/patches/add-desktop-file.patch (+34/-0)
debian/patches/retry-geoclue.patch (+8/-6)
debian/patches/series (+1/-1)
debian/redshift-gtk.docs (+0/-1)
debian/redshift-gtk.install (+2/-1)
debian/redshift.install (+1/-0)
debian/rules (+3/-2)
src/location-geoclue.c (+8/-20)
src/redshift-gtk/statusicon.py (+12/-0)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 22. By Jackson Doak
-
* Merge from Debian. (LP: #1485153) Remaining changes:
- debian/rues: Add --enable-ubuntu
- debian/patches/ retry-geoclue. patch: Retry geoclue a few times so
redshift does not explode at startup.
* [8a88246] Add some changes from Laurent Bigonville
* [ca45b49] Drop README.Debian
* [4b34f2c] Add header to quilt patch
* [9e854c4] Add debian/gbp.conf
* [c3cdd0e] Drop patch remove_autostart. patch (Closes: #791598)
* [47e94ba] Ship appdata file in redshift-gtk.
Thanks to Laurent Bigonville (Closes: #791600)
* [3a6b76d] Fix reference to correct name.
Thanks to Torquil Macdonal Sorensen (Closes: #795502)
* [26605bd] Add redshift.desktop file entry. Needed for GeoClue activation.
Thanks to Laurent Bigonville (Closes: #789883)
* [536ef7e] Add dh-autoreconf to build. Drop autotools_dev from build.
Call intltoolize to update po/ files
* [4983734] Ship redshift.desktop file
* [a1397f2] Add configure flag for systemd user unit dir
* [fb6fb18] Add redshift-gtk.desktop file that got dropped off mistakenly
in the redshift.desktop patch - 21. By Jackson Doak
-
* 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. - 20. By Jackson Doak
-
[ 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
-
Fix Breaks/Replaces versions to be << first-version-
without- new-files.
Fixes upgrade failure caused by conflicting files. (LP: #1250006) - 16. By Jonathan Davies <email address hidden>
-
debian/
patches/ retry-geoclue. patch: Reinstated and sent to upstream
developer. - 15. By Jonathan Davies <email address hidden>
-
debian/control: Added automake to build-dependencies too.
- 14. By Jonathan Davies
-
* 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. - 13. By Andrew Starr-Bochicchio
-
* Merge from Debian unstable. Remaining Ubuntu changes:
- d/control: add libgeoclue-dev to enable new geoclue support.
- d/rules: add --enable-ubuntu to install ubuntu icons.
- d/patches/retry-geoclue. patch: Retry geoclue a few times so
redshift does not explode at startup.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/wily/redshift