Merge lp://staging/~larsu/eog/add-disable-appmenu-patch into lp://staging/eog
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~larsu/eog/add-disable-appmenu-patch |
| Merge into: | lp://staging/eog |
| Diff against target: |
2318 lines (+2210/-0) 21 files modified
.bzr-builddeb/default.conf (+2/-0) debian/changelog (+1058/-0) debian/compat (+1/-0) debian/control (+89/-0) debian/control.in (+85/-0) debian/copyright (+66/-0) debian/eog-dev.install (+4/-0) debian/eog.1 (+62/-0) debian/eog.install (+12/-0) debian/eog.manpages (+1/-0) debian/gnome-eog.xpm (+392/-0) debian/menu (+4/-0) debian/patches/02_grip_gestures.patch (+274/-0) debian/patches/03_unity_control_center.patch (+30/-0) debian/patches/disable-appmenu-on-unity.patch (+25/-0) debian/patches/git_dialog_dont_lock.patch (+44/-0) debian/patches/git_icc_color.patch (+32/-0) debian/patches/series (+5/-0) debian/rules (+20/-0) debian/source/format (+1/-0) debian/watch (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~larsu/eog/add-disable-appmenu-patch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| VCS imports | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-03-11.
Commit message
Add disable-
Disables the application menu on platforms that show an app menu and a menubar (such as unity). The menubar already contains all the actions of the appmenu. Having both is redundant.
Description of the change
Add disable-
Disables the application menu on platforms that show an app menu and a menubar (such as unity). The menubar already contains all the actions of the appmenu. Having both is redundant.
Unmerged revisions
- 148. By Lars Karlitski
-
disable-appmenu patch: add header
- 147. By Lars Karlitski
-
Add disable-
appmenu- on-unity. patch Disables the application menu on platforms that show an app menu and a menubar
(such as unity). The menubar already contains all the actions of the appmenu.
Having both is redundant. - 146. By Sebastien Bacher
-
releasing package eog version 3.10.2-0ubuntu4
- 145. By Sebastien Bacher
-
* debian/
patches/ git_icc_ color.patch
- use sRGB when there is no profile attached to the image (lp: #272584) - 144. By Sebastien Bacher
-
releasing package eog version 3.10.2-0ubuntu3
- 143. By Sebastien Bacher
-
* debian/
patches/ git_dialog_ dont_lock. patch:
- don't lock when closing dialogs, thanks Lars Uebernickel (lp:#1262801) - 142. By Robert Ancell
-
* debian/
patches/ 03_unity_ control_ center. patch:
- Use Unity control center in Unity (LP: #1257505) - 141. By Sebastien Bacher
-
releasing package eog version 3.10.2-0ubuntu1
- 140. By Sebastien Bacher
-
New upstream version
- 139. By Daniel Holbach
-
* Resynchronize on Debian. Remaining changes:
- debian/control.in:
+ Build-Depends on dh-autoreconf, libgrip-dev
+ Use ubuntu vcs fields
- debian/patches/ 02_grip_ gestures. patch:
+ support pinch-to-zoom, rotate, and drag gestures
(and re-enabled now that libgrip is fixed)
- debian/rules
+ use dh-autoreconf
* New upstream release.
* Bump build-dependency on libgtk-3-dev to >= 3.7.8.
