lp:~noskcaj/ubuntu/saucy/plasma-widget-quickaccess/upstream-merge

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/saucy/plasma-widget-quickaccess

Jonathan Riddell (community): Disapprove on 2013-07-13

Ubuntu branches: Pending requested 2013-07-13

Diff: 1641 lines (+941/-436)

18 files modified

.directory (+6/-0)
.pc/applied-patches (+0/-1)
.pc/fix_ftbfs_gcc4.6.diff/popupdialog.cpp (+0/-358)
ChangeLog (+7/-0)
README (+14/-1)
debian/changelog (+6/-0)
po/de/CMakeLists.txt (+2/-0)
po/de/plasma_applet_quickaccess.po (+216/-0)
popupdialog.cpp (+32/-35)
popupdialog.h (+1/-1)
quickaccess.cpp (+37/-3)
quickaccess.cpp.orig (+341/-0)
quickaccess.h (+2/-0)
quickaccess.h.orig (+85/-0)
quickaccessGeneralConfig.ui (+5/-19)
quickaccessGeneralConfig.ui.org (+169/-0)
settings.cpp (+14/-14)
settings.h (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1152698: update to version 0.8.2

Wishlist

Invalid

Link a bug report

Related blueprints

17. By Jackson Doak on 2013-07-13

Merged from upstream, properly this time

16. By Scott Kitterman on 2011-07-20

No change rebuild for libkonq transition (powerpc was missed before)

15. By Felix Geyer on 2011-05-31

Fix FTBFS with gcc 4.6.

14. By Alessandro Ghersi on 2010-10-28

Build against libkonq5-dev (>= 4:4.5.2) for libkonq5 -> libkonq5a
transition

13. By Jonathan Thomas on 2010-09-16

Rebuild upload for libkonq5 ABI breakage (LP: #636470)

12. By Jonathan Thomas on 2010-05-18

* Switch to source format 3.0 (quilt):
  - Bump debhelper build-depend to 7.3.16 or higher
  - Bump pkg-kde-tools build-depend to 0.5.0 or higher
  - Remove quilt build-dependency
* Transition from cdbs to the kde dh sequence from pkg-kde-tools

11. By Alexander Sack on 2010-03-07

rebuild rest of main for armel armv7/thumb2 optimization;
UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2

10. By Jonathan Riddell on 2009-07-29

Add missing debhelper.mk

9. By Jonathan Riddell on 2009-07-29

Use kde.mk from pkg-kde-tools

8. By Jonathan Thomas on 2009-05-27

* New upstream bugfix release (LP: #):
  - debian/control:
    + libplasma-dev -> kdelibs5-dev
    + remove now-unnecessary cmake build-dep
    + build-depend on pkg-kde-tools
  - debian/rules:
    + switch from kde4.mk to debian-qt-kde.mk