[Pkg-maemo-commits] r24 ./osso-af-settings/debian: merge ubuntu

[Riku Voipio]

------------------------------------------------------------
revno: 24
committer: Riku Voipio <riku.voipio at iki.fi>
branch nick: debian
timestamp: Fri 2007-09-28 23:51:51 +0300
message:
  merge ubuntu
modified:
  debian/changelog
  debian/control
  osso-af-settings.pc.in
    ------------------------------------------------------------
    revno: 11.1.1
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: osso-af-settings
    timestamp: Fri 2007-06-29 09:27:24 +0200
    message:
      Merge from Debian, but revert Maintainer change and substitute Ubuntu
      Mobile there.
    added:
      debian/watch
    modified:
      debian/changelog
      debian/control
      debian/copyright
      debian/rules
    ------------------------------------------------------------
    revno: 11.1.2
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: osso-af-settings
    timestamp: Fri 2007-06-29 09:29:54 +0200
    message:
      releasing version 0.9.0-1ubuntu2
    modified:
      debian/changelog
    ------------------------------------------------------------
    revno: 11.1.3
    committer: Rusty Lynch <rusty at rusty-laptop>
    branch nick: osso-af-settings-bzr2
    timestamp: Thu 2007-07-12 09:00:13 -0700
    message:
      * Adding configuration changes for the new ume marquee
    modified:
      debian/changelog
      osso-af-settings.pc.in
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-30 10:34:40 +0000
+++ b/debian/changelog	2007-09-28 20:51:51 +0000
@@ -2,7 +2,6 @@
 
   [ Loic Minier ]
   * Add download URL to copyright.
-  * Set Maintainer to Debian Maemo Maintainers; add myself to Uploaders.
   * Bump up Standards-Version to 3.7.2.
   * Cleanup rules.
   * Add watch file.
@@ -18,7 +17,7 @@
   [ Loic Minier ]
   * Fix typo in description.
 
- -- Loic Minier <lool at dooz.org>  Mon, 30 Jul 2007 12:34:34 +0200
+ -- Tollef Fog Heen <tfheen at ubuntu.com>  Fri, 29 Jun 2007 09:27:02 +0200
 
 osso-af-settings (0.9.0-1ubuntu1) gutsy; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2007-07-30 10:34:40 +0000
+++ b/debian/control	2007-09-28 20:51:51 +0000
@@ -1,7 +1,7 @@
 Source: osso-af-settings
 Section: devel
 Priority: optional
-Maintainer: Debian Maemo Maintainers <pkg-maemo-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Mobile Developers <ubuntu-mobile at lists.ubuntu.com>
 XSBC-Original-Maintainer: Kimmo H?m?l?inen <kimmo.hamalainen at nokia.com>
 Uploaders: Loic Minier <lool at dooz.org>, Jonny Lamb <jonnylamb at jonnylamb.com>
 Build-Depends: debhelper (>= 5.0.0)

=== modified file 'osso-af-settings.pc.in'
--- a/osso-af-settings.pc.in	2007-03-22 12:56:40 +0000
+++ b/osso-af-settings.pc.in	2007-07-12 16:00:13 +0000
@@ -1,8 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-desktopentrydir=@datadir@/applications/hildon
+desktopentrydir=@datadir@/applications
+datarootdir=@datadir@
 tasknavigatordesktopentrydir=@datadir@/applications/hildon-navigator
 statusbardesktopentrydir=@datadir@/applications/hildon-status-bar
+marqueedesktopentrydir=@datadir@/applications/hildon-marquee
 homedesktopentrydir=@datadir@/applications/hildon-home
 hildondesktoplibdir=@libdir@/hildon-desktop
 legacyhomelibdir=@libdir@/hildon-home