renamed with proper notations.

pmo-trunk-r3696

diff --git a/debian/control-maemo-bora b/debian/control-maemo-bora
deleted file mode 100644 (file)
index e6d9c78..0000000
--- a/debian/control-maemo-bora
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: modest
-Section: user/extra 
-Priority: optional
-Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
-Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, hildon-libs-dev, libdbus-1-dev, libdbus-glib-1-dev, libalarm-dev, gtk-doc-tools, libebook-dev, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libossomime-dev,libtinymail-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,libwpeditor-plus-dev,libosso-help-dev, maemo-providers-data
-Standards-Version: 3.6.0
-
-Package: modest
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},${launcher:Depends},maemo-providers-data
-Description: an e-mail client for platforms with modest resources
-
-Package: modest-dbg
-Section: devel
-Architecture: all
-Depends: modest (=${Source-Version})
-Description: debug package for modest
-
-Package: libmodest-dbus-client
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: library wrapping modest's dbus interface
-
-Package: libmodest-dbus-client-dev
-Section: devel
-Architecture: any
-Depends: libmodest-dbus-client
-Description: library wrapping modest's dbus interface (dev package)
-
-Package: libmodest-dbus-client-dbg
-Section: devel
-Architecture: all
-Depends: libmodest-dbus-client (=${Source-Version})
-Description: debug package for modest

diff --git a/debian/control-maemo-diablo b/debian/control-maemo-diablo
deleted file mode 100644 (file)
index 0d80428..0000000
--- a/debian/control-maemo-diablo
+++ /dev/null
@@ -1,41 +0,0 @@
-Source: modest
-Section: mail
-Priority: optional
-Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
-Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libhildonnotify-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymail-gnomevfs-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor0,wpeditor-dev,libhildonhelp-dev, modest-providers-data, libalarm-dev, gtk-doc-tools, libhildonnotify-dev, libnotify-dev, libogs1.2-dev, microb-engine-dev
-Standards-Version: 3.6.0
-
-Package: modest
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends},modest-providers-data,modest-l10n-mr0,osso-icons-theme,operator-wizard-settings,osso-countries-l10n-mr0
-Description: an e-mail client for platforms with modest resources
- e-mail client for osso
-
-Package: modest-dbg
-Section: devel
-Architecture: any
-Depends: modest (=${Source-Version})
-Description: debug package for modest
- Contains the debug symbols for modest app
-
-Package: libmodest-dbus-client
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: library wrapping modest's dbus interface
- This packages provides the library wrapping for modest's
- dbus interface
-
-Package: libmodest-dbus-client-dev
-Section: devel
-Architecture: any
-Depends: libmodest-dbus-client
-Description: library wrapping modest's dbus interface (dev package)
- Development packages for libmodest-dbus-client
-
-Package: libmodest-dbus-client-dbg
-Section: devel
-Architecture: any
-Depends: libmodest-dbus-client (=${Source-Version})
-Description: debug package for modest dbus client
- This package contains the debug symbols for modest dbus client

diff --git a/debian/control.maemo-bora b/debian/control.maemo-bora
new file mode 100644 (file)
index 0000000..e6d9c78
--- /dev/null
+++ b/debian/control.maemo-bora
@@ -0,0 +1,35 @@
+Source: modest
+Section: user/extra 
+Priority: optional
+Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
+Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, hildon-libs-dev, libdbus-1-dev, libdbus-glib-1-dev, libalarm-dev, gtk-doc-tools, libebook-dev, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libossomime-dev,libtinymail-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,libwpeditor-plus-dev,libosso-help-dev, maemo-providers-data
+Standards-Version: 3.6.0
+
+Package: modest
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},${launcher:Depends},maemo-providers-data
+Description: an e-mail client for platforms with modest resources
+
+Package: modest-dbg
+Section: devel
+Architecture: all
+Depends: modest (=${Source-Version})
+Description: debug package for modest
+
+Package: libmodest-dbus-client
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: library wrapping modest's dbus interface
+
+Package: libmodest-dbus-client-dev
+Section: devel
+Architecture: any
+Depends: libmodest-dbus-client
+Description: library wrapping modest's dbus interface (dev package)
+
+Package: libmodest-dbus-client-dbg
+Section: devel
+Architecture: all
+Depends: libmodest-dbus-client (=${Source-Version})
+Description: debug package for modest

diff --git a/debian/control.maemo-diablo b/debian/control.maemo-diablo
new file mode 100644 (file)
index 0000000..0d80428
--- /dev/null
+++ b/debian/control.maemo-diablo
@@ -0,0 +1,41 @@
+Source: modest
+Section: mail
+Priority: optional
+Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
+Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libhildonnotify-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymail-gnomevfs-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor0,wpeditor-dev,libhildonhelp-dev, modest-providers-data, libalarm-dev, gtk-doc-tools, libhildonnotify-dev, libnotify-dev, libogs1.2-dev, microb-engine-dev
+Standards-Version: 3.6.0
+
+Package: modest
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends},modest-providers-data,modest-l10n-mr0,osso-icons-theme,operator-wizard-settings,osso-countries-l10n-mr0
+Description: an e-mail client for platforms with modest resources
+ e-mail client for osso
+
+Package: modest-dbg
+Section: devel
+Architecture: any
+Depends: modest (=${Source-Version})
+Description: debug package for modest
+ Contains the debug symbols for modest app
+
+Package: libmodest-dbus-client
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: library wrapping modest's dbus interface
+ This packages provides the library wrapping for modest's
+ dbus interface
+
+Package: libmodest-dbus-client-dev
+Section: devel
+Architecture: any
+Depends: libmodest-dbus-client
+Description: library wrapping modest's dbus interface (dev package)
+ Development packages for libmodest-dbus-client
+
+Package: libmodest-dbus-client-dbg
+Section: devel
+Architecture: any
+Depends: libmodest-dbus-client (=${Source-Version})
+Description: debug package for modest dbus client
+ This package contains the debug symbols for modest dbus client