Ubuntu
conky package

Please merge conky_1.6.1-1 (universe) from Debian unstable (main)

Bug #322035 reported by Andrew Gee
2
Affects Status Importance Assigned to Milestone
conky (Ubuntu)
Invalid
Undecided
Unassigned

Bug Description

Binary package hint: conky

conky (1.6.1-1) unstable; urgency=low

  * New upstream release (1.6.1).
  * debian/patches:
    - man_page_typo_first_char: removed, incorporated upstream.
    - fix_hyphen_man_page, move_compile_end_man_page: refreshed these
      patches taking into account new changes to upstream man page.
    - ifaddr_buffer_overflow: fix buffer overflow in
      update_net_stats. Thanks to Miroslav Lichvar.
  * debian/control: added "mpd" to Suggests.
  * debian/NEWS: documented the need to re-examine the conky
    configuration file for the changes since version 1.5.x.
    Closes: #495864.

 -- Kapil Hari Paranjape <email address hidden> Tue, 09 Sep 2008 12:33:28 +0530

conky (1.6.1-0ubuntu3) intrepid; urgency=low

  * debian/patches:
    - fix_exec_buffer_size.patch (LP: #279493, LP: #279791):
      fix SIGSEGV due to wrong buffer size being used in all exec* calls.

 -- Cesare Tirabassi <email address hidden> Fri, 10 Oct 2008 22:40:09 +0200

Andrew Gee (andrewgee)
Changed in conky:
assignee: nobody → andrewgee
status: New → In Progress
Revision history for this message
Andrew Gee (andrewgee) wrote :

This is my first merge attempt, so I apologise if anything is stupidly wrong :)

As instructed from the guide, I'm going to include two debdiffs. One from conky-1.6.1-1 to my merge and one from conky-1.6.1-0ubuntu3.

I hope I've done everything right :)

Revision history for this message
Andrew Gee (andrewgee) wrote :
Andrew Gee (andrewgee)
Changed in conky:
assignee: andrewgee → nobody
status: In Progress → Confirmed
Revision history for this message
Andrew Gee (andrewgee) wrote :

Whoops. Missed out on the fact norsetto said there was no need to merge, from http://dad.dunnewind.net/universe.php

Changed in conky:
status: Confirmed → Invalid
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.