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

[Jonny Lamb]

------------------------------------------------------------
revno: 45
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-theme-tools
timestamp: Thu 2007-12-27 11:33:48 +0000
message:
  * Merged with trunk branch.
modified:
  ChangeLog
  NEWS
  configure.ac
  debian/changelog
  scripts/hildon-theme-bootstrap
    ------------------------------------------------------------
    revno: 23.1.3
    committer: mdk
    timestamp: Thu 2007-08-16 12:10:36 +0000
    message:
      [0.5.2-1 release]
    modified:
      ChangeLog
      NEWS
      configure.ac
      debian/changelog
      scripts/hildon-theme-bootstrap
-------------- next part --------------
=== modified file 'ChangeLog'
--- a/ChangeLog	2007-06-19 09:14:14 +0000
+++ b/ChangeLog	2007-08-16 12:10:36 +0000
@@ -1,3 +1,12 @@
+2007-08-16  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	[0.5.2-1 release]
+
+	* NEWS:
+	* configure.ac:
+	* debian/changelog:
+	* scripts/hildon-theme-bootstrap: Updating.
+
 2007-06-19  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	[0.5.1-1 release]

=== modified file 'NEWS'
--- a/NEWS	2007-06-19 09:14:14 +0000
+++ b/NEWS	2007-08-16 12:10:36 +0000
@@ -1,3 +1,7 @@
+[0.5.2 release]
+* Updated repo addresses for bootstrap tool
+* Mention the CC license intead of GPL in the bootstrap tool
+
 [0.5.1 release]
 * Fixing the memory allocation problem 
 * Updated repo addresses for bootstrap tool

=== modified file 'configure.ac'
--- a/configure.ac	2007-06-19 09:14:14 +0000
+++ b/configure.ac	2007-08-16 12:10:36 +0000
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-theme-tools, 0.5.1)
+AM_INIT_AUTOMAKE(hildon-theme-tools, 0.5.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-08-01 11:35:06 +0000
+++ b/debian/changelog	2007-12-27 11:33:48 +0000
@@ -1,4 +1,4 @@
-hildon-theme-tools (0.5.1-1-1) UNRELEASED; urgency=low
+hildon-theme-tools (0.5.2-1-1) UNRELEASED; urgency=low
 
   [ Jonny Lamb ]
   * Merged with trunk branch.
@@ -16,7 +16,17 @@
   * Wrap Uploaders.
   * Honor failures of make maintainer-clean.
 
- -- Loic Minier <lool at dooz.org>  Wed, 01 Aug 2007 13:33:41 +0200
+  [ Jonny Lamb ]
+  * Merged with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Thu, 27 Dec 2007 11:31:40 +0000
+
+hildon-theme-tools (0.5.2-1) unstable; urgency=low
+
+  * Updated repo addresses for bootstrap tool
+  * Mention the CC license instead of the GPL license
+
+ -- Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>  Thu, 16 Aug 2007 15:08:04 +0300
 
 hildon-theme-tools (0.5.1-1) unstable; urgency=low
 

=== modified file 'scripts/hildon-theme-bootstrap'
--- a/scripts/hildon-theme-bootstrap	2007-06-19 09:11:32 +0000
+++ b/scripts/hildon-theme-bootstrap	2007-08-16 12:10:36 +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.9.0-1/"
+                        SVN_ADDRESS="https://stage.maemo.org/svn/maemo/projects/haf/tags/hildon-theme-plankton/4.11.0-2/"
                         return
                 else
                         echo "Bad selection!"
@@ -245,6 +245,7 @@
 echo "and modify the graphics to your liking."
 echo 
 echo "Please note that the theme package has all the licensing data"
-echo "set to GPL. If you'd like to license your theme under different terms"
+echo "set to Creative Commons Share Alike 2.5 license. "
+ecgo "If you'd like to license your theme under different terms"
 echo "make sure to change the copyright information manually."
 echo