[Pkg-maemo-commits] r33 ./hildon-theme-tools/debian: * Merged with trunk branch.

Jonny Lamb jonnylamb at jonnylamb.com
Mon Jul 23 18:20:45 UTC 2007


------------------------------------------------------------
revno: 33
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-theme-tools
timestamp: Mon 2007-07-23 19:20:45 +0100
message:
  * Merged with trunk branch.
modified:
  ChangeLog
  NEWS
  configure.ac
  debian/changelog
  scripts/hildon-theme-bootstrap
  src/slicer.c
    ------------------------------------------------------------
    revno: 23.1.1
    merged: vcs-imports at canonical.com-20070619091132-wyim1j012o77vtr3
    committer: mdk
    timestamp: Tue 2007-06-19 09:11:32 +0000
    message:
      Free the keyfile using proper deallocator.
      Fix the confusion with logical vs. bitewise operator.
    ------------------------------------------------------------
    revno: 23.1.2
    merged: vcs-imports at canonical.com-20070619091414-wctpgu3gw20m4g0o
    committer: mdk
    timestamp: Tue 2007-06-19 09:14:14 +0000
    message:
      [0.5.1-1 release]
-------------- next part --------------
=== modified file 'ChangeLog'
--- a/ChangeLog	2007-05-09 13:00:26 +0000
+++ b/ChangeLog	2007-06-19 09:14:14 +0000
@@ -1,3 +1,19 @@
+2007-06-19  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	[0.5.1-1 release]
+
+	* NEWS:
+	* configure.ac:
+	* debian/changelog: Updating.
+
+2007-06-19  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* scripts/hildon-theme-bootstrap: Updating.
+
+	* src/common.c: Free the keyfile using proper deallocator.
+
+	* src/slicer.c: Fix the confusion with logical vs. bitewise operator.
+
 2007-05-09  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	[0.5.0-1 release]

=== modified file 'NEWS'
--- a/NEWS	2007-05-09 13:00:26 +0000
+++ b/NEWS	2007-06-19 09:14:14 +0000
@@ -1,3 +1,7 @@
+[0.5.1 release]
+* Fixing the memory allocation problem 
+* Updated repo addresses for bootstrap tool
+
 [0.5.0 release]
 * Removing the 'separate_alpha' keyword
 * Adding the 'noalpha' keyword

=== modified file 'configure.ac'
--- a/configure.ac	2007-05-09 13:00:26 +0000
+++ b/configure.ac	2007-06-19 09:14:14 +0000
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-theme-tools, 0.5.0)
+AM_INIT_AUTOMAKE(hildon-theme-tools, 0.5.1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-06-12 08:40:11 +0000
+++ b/debian/changelog	2007-07-23 18:20:45 +0000
@@ -1,3 +1,16 @@
+hildon-theme-tools (0.5.1-1) UNRELEASED; urgency=low
+
+  * Merged with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 19:20:09 +0100
+
+hildon-theme-tools (0.5.1-1) unstable; urgency=low
+
+  * Fixing the memory allocation problem 
+  * Updated repo addresses for bootstrap tool
+
+ -- Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>  Tue, 19 Jun 2007 12:13:51 +0300
+
 hildon-theme-tools (0.5.0-1ubuntu4) gutsy; urgency=low
 
   * Install ChangeLog and debian/copyright in binary package.

=== modified file 'scripts/hildon-theme-bootstrap'
--- a/scripts/hildon-theme-bootstrap	2007-02-22 08:57:13 +0000
+++ b/scripts/hildon-theme-bootstrap	2007-06-19 09:11:32 +0000
@@ -47,7 +47,7 @@
                         return
                 elif [ "$opt" == "hildon-theme-layout-4" ]; then
                         LAYOUT="hildon-theme-layout-4"
-                        SVN_ADDRESS="https://stage.maemo.org/svn/maemo/projects/haf/tags/hildon-theme-plankton/4.2.0-1/"
+                        SVN_ADDRESS="https://stage.maemo.org/svn/maemo/projects/haf/tags/hildon-theme-plankton/4.9.0-1/"
                         return
                 else
                         echo "Bad selection!"

=== modified file 'src/slicer.c'
--- a/src/slicer.c	2007-06-08 01:00:03 +0000
+++ b/src/slicer.c	2007-07-23 18:20:45 +0000
@@ -271,9 +271,9 @@
         /* Check the optional directory argument */
         if (argc >= 4 && argv [3] != NULL) {
                 directory = argv [3];
-                if (! g_file_test (directory, G_FILE_TEST_IS_DIR || G_FILE_TEST_EXISTS)) {
+                if (! g_file_test (directory, G_FILE_TEST_IS_DIR | G_FILE_TEST_EXISTS)) {
                         g_print ("Creating directory %s\n", directory);
-                        if (g_mkdir_with_parents (directory, 493) != 0) {
+                        if (g_mkdir_with_parents (directory, 0755) != 0) {
                                 g_printerr ("ERROR: Failed to create directory!\n");
                                 goto Error;
                         }



More information about the Pkg-maemo-commits mailing list