[Pkg-maemo-commits] r26 ./osso-af-settings/debian: * Merged with trunk branch.

[Jonny Lamb]

------------------------------------------------------------
revno: 26
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: osso-af-settings
timestamp: Thu 2007-12-27 08:48:03 +0000
message:
  * Merged with trunk branch.
modified:
  configure
  configure.ac
  debian/changelog
    ------------------------------------------------------------
    revno: 5.1.1
    committer: lucasr
    timestamp: Wed 2007-06-13 14:24:01 +0000
    message:
      Change default application .desktop directory to /usr/share/applications.
    modified:
      osso-af-settings.pc.in
    ------------------------------------------------------------
    revno: 5.1.2
    committer: lucasr
    timestamp: Wed 2007-06-27 07:29:05 +0000
    message:
      New version of debian package (0.9.1)
    modified:
      configure
      configure.ac
      debian/changelog
    ------------------------------------------------------------
    revno: 5.1.3
    committer: lucasr
    timestamp: Wed 2007-06-27 07:32:35 +0000
    message:
      Fixed version number.
    modified:
      debian/changelog
    ------------------------------------------------------------
    revno: 5.1.4
    committer: lucasr
    timestamp: Fri 2007-07-06 07:50:30 +0000
    message:
      New release of debian package (0.9.2-1)
    modified:
      configure
      configure.ac
      debian/changelog
      osso-af-settings.pc.in
-------------- next part --------------
=== modified file 'configure'
--- a/configure	2007-05-31 13:31:11 +0000
+++ b/configure	2007-12-27 08:48:03 +0000
@@ -2200,7 +2200,7 @@
 
 # Define the identity of the package.
  PACKAGE=osso-af-settings
- VERSION=0.9.0
+ VERSION=0.9.2
 
 
 cat >>confdefs.h <<_ACEOF

=== modified file 'configure.ac'
--- a/configure.ac	2007-03-22 12:21:11 +0000
+++ b/configure.ac	2007-07-06 07:50:30 +0000
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-settings, 0.9.0)
+AM_INIT_AUTOMAKE(osso-af-settings, 0.9.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-09-28 20:51:51 +0000
+++ b/debian/changelog	2007-12-27 08:48:03 +0000
@@ -1,4 +1,4 @@
-osso-af-settings (0.9.0-1-1) UNRELEASED; urgency=low
+osso-af-settings (0.9.2-1-1) UNRELEASED; urgency=low
 
   [ Loic Minier ]
   * Add download URL to copyright.
@@ -17,7 +17,22 @@
   [ Loic Minier ]
   * Fix typo in description.
 
- -- Tollef Fog Heen <tfheen at ubuntu.com>  Fri, 29 Jun 2007 09:27:02 +0200
+  [ Jonny Lamb ]
+  * Merged with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Thu, 27 Dec 2007 08:47:36 +0000
+
+osso-af-settings (0.9.2-1) unstable; urgency=low
+
+  * Revert back the applications directory to /usr/share/applications/hildon 
+
+ -- Lucas Rocha <lucas.rocha at nokia.com>  Fri,  6 Jul 2007 10:47:30 +0300
+
+osso-af-settings (0.9.1-1) unstable; urgency=low
+
+  * Change the standard applications directory to "/usr/share/applications"
+
+ -- Lucas Rocha <lucas.rocha at nokia.com>  Wed, 27 Jun 2007 10:24:30 +0300
 
 osso-af-settings (0.9.0-1ubuntu1) gutsy; urgency=low