[Pkg-maemo-commits] r77 ./hildon-1/debian: * Merge changes.

[Jonny Lamb]

------------------------------------------------------------
revno: 77
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-1
timestamp: Fri 2007-10-12 20:49:56 +0100
message:
  * Merge changes.
modified:
  debian/changelog
    ------------------------------------------------------------
    revno: 60.1.1
    committer: Adilson Oliveira <adilson at cartman>
    branch nick: hildon-1
    timestamp: Mon 2007-08-06 12:57:53 -0300
    message:
      Added patch to avoid hildon window to crash due wrong memory allocation.
    modified:
      debian/changelog
      src/hildon-window.c
    ------------------------------------------------------------
    revno: 60.1.2
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: hildon-1
    timestamp: Fri 2007-08-10 13:44:09 +0200
    message:
      * Update Maintainer field to be ubuntu-mobile.
    modified:
      debian/changelog
      debian/control
    ------------------------------------------------------------
    revno: 60.1.3
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: hildon-1
    timestamp: Fri 2007-08-10 13:46:13 +0200
    message:
      releasing version 1.0.5-1ubuntu7
    modified:
      debian/changelog
    ------------------------------------------------------------
    revno: 75.1.1
    committer: Riku Voipio <riku.voipio at iki.fi>
    branch nick: debian
    timestamp: Fri 2007-09-28 23:38:56 +0300
    message:
      Merged ubuntu changes
    modified:
      debian/changelog
      src/hildon-window.c
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-09-21 16:52:39 +0000
+++ b/debian/changelog	2007-10-12 19:49:56 +0000
@@ -175,6 +175,17 @@
 
  -- Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>  Tue, 22 May 2007 13:45:59 +0300
 
+libhildon (1.0.5-1ubuntu7) gutsy; urgency=low
+
+  [ Adilson Oliveira ]
+  * Added patch from Peter Zhu to hildon-window.c to avoid crash when
+    hildon window is destroyed in some cases.
+
+  [ Tollef Fog Heen ]
+  * Update Maintainer field to be ubuntu-mobile.
+
+ -- Tollef Fog Heen <tfheen at ubuntu.com>  Fri, 10 Aug 2007 13:45:58 +0200
+
 libhildon (1.0.5-1ubuntu6) gutsy; urgency=low
 
   * It's libhildon-1-0, not libhildon1-0, fix control file.