Mer/Documentation/Common Packages
Help bringing a package up to date
- Make yourself a launchpad.net account, and upload your SSH keys and install Bazaar.
- Grab the source package the Mer package is based on, and the new one from fremantle alpha, extract them. diff -ruN them, and save the diff (from now on patchname).
- Typical files to avoid patching (you can delete them in the resulting patch):
- .in files
- configure
- (feel free to add more to the list)
- bzr branch <lp:something listed in table below>
- cd into the checked out directory
- apply patch from before (patch -p1 < patchname probably, you can patch -p1 --dry-run < patchname to test run the patch) , fix it if it doesn't apply cleanly (watch out for configure and autoconf generated things)
- bzr add any added files (avoid .rej and .orig, bzr status is a good tool.)
- dch -m -i , and add your personal log message. Name the version, mer version + 1.
- bzr commit -m "your personal log message"
- bzr push lp:~yourusername/m-r/packagename
- Ideally, bzr export <some dir> lp:~yourusername/m-r/packagename , cd <some dir> and try to dpkg-buildpackage -b it.
- Point us to the branch and we'll put the branch in the repository and build it.
Most patches apply cleanly, though, you will most likely see patch failed in debian/changelog, is fairly easy to fix, just add the items from .rej without the +'s in the front and add an according version above it using dch.
Typical package repositories
- Diablo versions: http://repository.maemo.org/pool/diablo/free/
- Pre-alpha1: http://repository.maemo.org/pool/maemo5.0prealpha1/free/
- Pre-alpha2: http://repository.maemo.org/pool/maemo5.0prealpha2/free/
- Alpha: http://repository.maemo.org/pool/maemo5.0alpha/free/
- Stage SVN trunk: https://stage.maemo.org/viewcvs.cgi/projects/haf/trunk?root=maemo , https://stage.maemo.org/svn/maemo/projects/haf/trunk/
- Stage SVN tags: https://stage.maemo.org/viewcvs.cgi/projects/haf/tags?root=maemo , https://stage.maemo.org/svn/maemo/projects/haf/tags/
Current package status
| Same version | Same version root, but Mer specific changes | Package missing in Fremantle SDK | Version root differs, and Fremantle has a newer version | Version root differs, but Mer has a newer version |
| Source package | Mer version | Fremantle SDK version | Bzr branch | Comments |
|---|---|---|---|---|
| certman | 1.7.19 | 1.7.19 | - | - |
| clinkc | 2.0-0osso16mr2 | 2.0-0osso16 | - | - |
| clipboard-manager | 0.6.8-1 | 0.6.8-2 | - | - |
| dbus-glib | 0.78-0maemo1mer2 | 0.78-0maemo2 | - | - |
| epeg | 0.9.0.005maemo2mer1 | 0.9.1.042maemo0 | - | - |
| gail | 1:1.18.0-osso14mer2 | - | - | |
| gconf2 | 1:2.16.0-2osso1mer8 | 2.16.0-2osso4 | lp:~mer-committers/m-r/gconf2 | - |
| glib2.0 | 2.18.1-1maemo1 | 2.18.1-1maemo2 | - | - |
| gnome-vfs-filechooser-backend | 1.9.6-1mer1 | 1.9.6-2 | - | - |
| gstreamer0.10-ffmpeg-osso | 1.11.6 | - | - | |
| gtk+2.0 | 2:2.12.12-1maemo9mer9 | 2:2.12.12-1maemo8 | lp:~mer-committers/m-r/gtk+ | Ahead as we use the stage.* SVN |
| gtk20-l10n | 4.2 | 4.2 | - | - |
| gtkhtml | 3.24.0-osso3mer1 | 3.13.91-3osso15 | - | Ahead, using stage.* SVN |
| hildon-application-manager | 1:2.1.20~unreleased-r1465-mer3 | 1:2.2.10 | lp:~mer-committers/m-r/hildon-application-manager | - |
| hildon-application-manager-l10n-public | 6.0+r6453mer1 | 6.0+r6481alphasdk | lp:~mer-translations/m-r/hildon-application-manager-l10n-public | - |
| hildon-common-strings-l10n-public | 6.0+r6368mer1 | 6.0+r6481 | lp:~mer-translations/m-r/hildon-common-strings-l10n-public | - |
| hildon-control-panel | 1:2.2.5-1mer5 | 1:2.2.5-1 | lp:~mer-committers/m-r/hildon-control-panel | - |
| hildon-control-panel-l10n-public | 6.0+r6453mer1 | 6.0+r6481 | lp:~mer-translations/m-r/hildon-control-panel-l10n-public | - |
| hildon-desktop | 1:2.0.19-1mer21 | 1:2.2.20-1 | lp:~carsten-munk/m-r/hildon-desktop-um-patches | Fremantle uses Clutter UI. |
| hildon-fm-l10n-public | 6.0+r6440mer1 | 6.0+r6492 | lp:~mer-translations/m-r/hildon-fm-l10n-public | - |
| hildon-games-wrapper | 1.9.4-1 | 1.9.4-1 | - | - |
| hildon-initscripts | 1.18-1mer2 | 1.21-1 | lp:~mer-committers/m-r/hildon-initscripts | - |
| hildon-input-method | 1:2.0.4-1mer4 | 1:2.1.10-1 | r44 lp:~mer-committers/m-r/hildon-input-method-mer, r44 | Kept back because of Fremantle HIM requiring a thumb keyboard |
| hildon-input-method-framework | 1:2.0.1-1mer2 | 1:2.1.10-1 | lp:~mer-committers/m-r/hildon-input-method-framework-mer | Kept back because of Fremantle HIM requiring a thumb keyboard |
| hildon-input-method-l10n-public | 6.0+r6368mer1 | 6.0+r6459 | - | |
| hildon-input-method-plugins-example | 2.0.0-1mer3 | 1.99.5-1 | lp:~carsten-munk/m-r/hildon-input-method-plugins-example | Based on SVN tag, hence in front.. |
| hildon-libs-l10n-public | 6.0+r6417mer1 | 6.0+r6492 | lp:~mer-translations/m-r/hildon-libs-l10n-public | - |
| hildon-plugins-settings | 0.0.10-1mer2 | - | - | |
| hildon-theme-cacher | 0.4.3-1mer1 | 0.4.3-1-recomp1 | lp:~carsten-munk/m-r/hildon-theme-cacher | just a rebuild. |
| hildon-theme-layout-4 | 0.14.9-1mer3 | 0.14.8-1 | lp:~mer-committers/m-r/hildon-theme-layout-4 | Basically invalid with new Mer desktop layout. Based on a SVN tag (0.14.9) |
| hildon-theme-plankton | 4.14.5-1mer4 | - | Basically invalid with new Mer desktop layout. | |
| icd2-osso-ic-dev | 2.0mer1 | 2.0 | - | Only in repository. |
| ke-recv-l10n-public | 6.0+r6368mer1 | 6.0+r6492 | lp:~mer-translations/m-r/ke-recv-l10n-public | - |
| kernel-diablo | 2.6.21-200829maemo1 | - | From Diablo SDK | |
| libconbtui | 1.4.1mer1 | 1.4.1 | - | Just in repository. |
| libconic | 0.19mer2 | 0.19 | - | Just in repository. |
| libdb1 | 1.85.4-osso7 | 1.85.4-osso8 | - | From Diablo SDK initially. |
| libhildon | 2.1.42-2mer6 | 2.1.42-2 | lp:~mer-committers/m-r/libhildon-2.1.24 | - |
| libhildonfm | 1:2.1.7mer2 | 1:2.1.7 | - | Just in repository. |
| libhildonhelp | 2.0.5-1 | 2.0.3-0 | - | Ahead, stage.* SVN |
| libhildonmime | 2.1.2-1mer1 | 2.1.2-1 | lp:~carsten-munk/m-r/libhildonmime | - |
| libmatchbox1 | 2:1.9-osso6mer1 | lp:~mer-committers/m-r/libmatchbox1 | - | |
| libosso | 2.19-1mer1 | 2.18-1 | lp:~carsten-munk/m-r/libosso | From stage.* SVN, hence in front. |
| libxsp | 1.2.3-4mer1 | 1.2.3-4.1 | lp:~carsten-munk/m-r/libxsp | - |
| maemo-af-desktop-l10n-public | 6.0+r6405mer1 | 6.0+r6459 | lp:~mer-translations/m-r/maemo-af-desktop-l10n-public | - |
| maemo-launcher | 0.31-2mer3 | 0.32-1 | lp:~carsten-munk/m-r/maemo-launcher | - |
| maemopad | 2.4-3 | 2.4-3 | - | - |
| marketing-release-public | 6.0 | 6.0 | - | - |
| matchbox-window-manager | 2:1.2-fremantle-osso18mer1 | - | - | |
| matchbox-window-manager-2 | 0.2.4-0maemo1mer3 | 0.2.17-1 | lp:~mer-committers/m-r/matchbox-window-manager-2 | Clutter UI based. |
| mce-dev | 1.6.3 | 1.8.8 | lp:~carsten-munk/m-r/mce-dev | - |
| osso-af-utils | 2.0-1 | 2.0-1 | - | - |
| osso-applet-tasknavigator-l10n-public | 5.0+r5892 | - | Required for "diablo" hildon-desktop | |
| osso-gnome-vfs2 | 2:2.16.3-2osso2mer2 | 2.16.3-2osso2 | - | In repository only. |
| osso-gnomevfs-extra | 2:1.9.6-3mer1 | 1.9.6-3 | lp:~mer-committers/m-r/osso-gnomevfs-extra | Ignore the 2: part. |
| osso-gwconnect | 1.0.12-mer3 | 1.0.12 | lp:~carsten-munk/m-r/osso-gwconnect | - |
| osso-gwobex | 0.61mer2 | 0.60 | lp:~carsten-munk/m-r/osso-gwobex | - |
| osso-systemui-dbus-dev | 0.1.2 | 0.1.2 | - | - |
| osso-uri-l10n-public | 6.0+r6405mer1 | 6.0+r6481 | lp:~mer-translations/m-r/osso-uri-l10n-public | - |
| osso-xterm | 0.14.mh13mer2 | 0.14.mh13 | lp:~mer-committers/m-r/osso-xterm | - |
| sapwood | 3.1.1-1-mer2 | 3.1.1-1 | lp:~carsten-munk/m-r/sapwood | - |
| sudo | 1:1.6.8p12-4osso8 | 1:1.6.8p12-4osso21 | lp:~mer-committers/m-r/sudo | - |
| tablet-browser-interface | 0.0.5-1 | - | Browser should come in beta SDK? | |
| tslib | 1.0-4ubuntu2mer2 | 1.0-4 | lp:~mer-committers/m-r/tslib-1.0 | - |
| x11proto-xsp | 1.2-1mer1 | 1.2-1 | lp:~carsten-munk/m-r/x11proto-xsp | - |