./hildon-desktop/ubuntu r355: * Sort out changelog and upload.

[Steve Kowalik]

------------------------------------------------------------
revno: 355
committer: Steve Kowalik <stevenk at ubuntu.com>
branch nick: ubuntu
timestamp: Fri 2008-09-19 18:03:25 +1000
message:
   * Sort out changelog and upload.
   * Add 24_no_werror.patch to disable -Werror.
   * Remove libhildonfm from the Build-Depends.
added:
  debian/patches/24_no_werror.patch
modified:
  debian/changelog
  debian/control
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-21 08:35:06 +0000
+++ b/debian/changelog	2008-09-19 08:03:25 +0000
@@ -1,11 +1,4 @@
-hildon-desktop (1:2.0.11-1~svn15367-0ubuntu3) UNRELEASED; urgency=low
-
-  * modified 21_multiple_resolution_support.patch to fix crash in
-    function tasknavigator_item_screen_changed. Fix for LP: #227329 
-
- -- Bill Filler <bill.filler at canonical.com>  Wed, 21 May 2008 10:32:41 +0200
-
-hildon-desktop (1:2.0.11-1~svn15367-0ubuntu2) UNRELEASED; urgency=low
+hildon-desktop (1:2.0.11-1~svn15367-0ubuntu2) intrepid; urgency=low
 
   [ Loic Minier ]
   * Document where SVN snapshots and tarballs are downloaded from in the
@@ -14,8 +7,15 @@
   [ Bill Filler ]
   * added patch 23_close_notification_crash.patch to fix crash
     when closing a notification window
-
- -- Bill Filler <bill.filler at canonical.com>  Fri, 25 Apr 2008 16:01:18 -0400
+  * modified 21_multiple_resolution_support.patch to fix crash in
+    function tasknavigator_item_screen_changed. (LP: #227329)
+
+  [ Steve Kowalik ]
+  * Sort out changelog and upload.
+  * Add 24_no_werror.patch to disable -Werror.
+  * Remove libhildonfm from the Build-Depends.
+
+ -- Steve Kowalik <stevenk at ubuntu.com>  Fri, 19 Sep 2008 18:03:04 +1000
 
 hildon-desktop (1:2.0.11-1~svn15367-0ubuntu1) hardy; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2008-04-10 11:53:40 +0000
+++ b/debian/control	2008-09-19 08:03:25 +0000
@@ -13,7 +13,6 @@
                libosso-dev (>= 0.9.19),
                libgnomevfs2-dev,
                osso-af-settings (>= 0.9.0-1ubuntu4),
-               libhildonfm2-dev | hildon-fm-dev,
                libhildonhelp-dev | libosso-help-dev,
                libxtst-dev,
                libxml2-dev,

=== added file 'debian/patches/24_no_werror.patch'
--- a/debian/patches/24_no_werror.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/24_no_werror.patch	2008-09-19 08:03:25 +0000
@@ -0,0 +1,15 @@
+diff -Nur -x '*.orig' -x '*~' ubuntu/configure.ac ubuntu.new/configure.ac
+--- ubuntu/configure.ac	2008-09-19 13:04:47.000000000 +1000
++++ ubuntu.new/configure.ac	2008-09-19 13:04:59.000000000 +1000
+@@ -59,9 +59,9 @@
+ 
+ if test "x${hildon_use_instrumenting}" = "xyes"
+ then
+-    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Werror -Wno-format-extra-args -g -finstrument-functions"
++    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format-extra-args -g -finstrument-functions"
+ else
+-    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Werror -Wno-format-extra-args"
++    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-format-extra-args"
+ fi
+ 
+ if test "x${enable_safe_mode}" = "xyes"