Editing Mer/Documentation/Common Packages

Warning: You are not logged in. Your IP address will be recorded in this page's edit history.
The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision Your text
Line 1: Line 1:
-
{{Mer}}
 
-
 
-
== Help bringing a package up to date ==
 
-
 
-
* Make yourself a launchpad.net account, upload your SSH keys, and install Bazaar.
 
-
* Grab the source package that Mer package is based on, and the new one from the Fremantle alpha, extract them. <code>diff -ruN</code> them, and save the diff (from now on ''patchname'').
 
-
* Typical files to avoid patching (you can delete them in the resulting patch):
 
-
** <code>.in</code> files
 
-
** <code>configure</code>
 
-
** ''(feel free to add more to the list)''
 
-
* <code>bzr branch <lp:''something listed in table below''></code>
 
-
* <code>cd</code> into the checked out directory
 
-
* Apply the patch from before (<code>patch -p1 < ''patchname''</code> probably, you can <code>patch -p1 --dry-run < ''patchname''</code> to test run the patch), fix it if it doesn't apply cleanly (watch out for <code>configure</code> and <code>autoconf</code> generated things)
 
-
* <code>bzr add</code> any added files (avoid <code>.rej</code> and <code>.orig</code>, <code>bzr status</code> is a good tool)
 
-
*<code> dch -m -i</code>, and add your personal log message. Name the version, Mer version + 1.
 
-
* <code>bzr commit -m "your personal log message"</code>
 
-
* <code>bzr push lp:~''yourusername''/m-r/''packagename''</code>
 
-
* Ideally, <code>bzr export ''<some dir>'' lp:~''yourusername''/m-r/''packagename''</code>, <code>cd ''<some dir>''</code> and try to <code>dpkg-buildpackage -b</code> 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 <code>debian/changelog</code>, is fairly easy to fix, just add the items from <code>.rej</code> without the <code>+</code>'s in the front and add an according version above it using <code>dch</code>.
 
-
 
-
== 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/
 
-
* Beta: http://repository.maemo.org/pool/maemo5.0beta/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 ==
 
-
 
{| class="wikitable"
{| class="wikitable"
| style="background:LightGreen" | Same version
| style="background:LightGreen" | Same version
| style="background:LightBlue" | Same version root, but Mer specific changes
| style="background:LightBlue" | Same version root, but Mer specific changes
| style="background:Orange" | Package missing in Fremantle SDK  
| style="background:Orange" | Package missing in Fremantle SDK  
-
| style="background:Tomato" | Version root differs, and Fremantle has a newer version
+
| style="background:Tomato" | Version root differs
-
| style="background:Lime" | Version root differs, but Mer has a newer version
+
|}
|}
-
 
{|
{|
Line 49: Line 13:
! Bzr branch
! Bzr branch
! Comments
! Comments
-
|- style="background:Tomato"
 
-
| alarmd || 0.5.20mer1 || 1.1.3+0m5 || - 
 
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| certman || 1.7.19 || 1.7.19 || - || -
+
| certman || 1.7.19 || 1.7.19 || - || -
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| clinkc || 2.0-0osso16mr2 || 2.0-0osso16 || - || -
+
| clinkc || 2.0-0osso16mr2 || 2.0-0osso16 || - || -
-
|- style="background:LightGreen"
+
-
| clipboard-manager || 0.6.8-4+0m5 || 0.6.8-4+0m5 || -  || -
+
|- style="background:Tomato"
|- style="background:Tomato"
-
| dbus-glib || 0.78-0maemo1mer2 || 0.78-0maemo2 || -  || -
+
| clipboard-manager || 0.6.8-1 || 0.6.8-2 || - || -
-
|- style="background:LightGreen"
+
-
| epeg || 0.9.1.042maemo0 || 0.9.1.042maemo0 || -  || -
+
-
|- style="background:Orange"
+
-
| gail || 1:1.18.0-osso14mer2 || - || - || -
+
|- style="background:Tomato"
|- style="background:Tomato"
-
| gconf2 || 1:2.16.0-2osso4mer1 || 2.16.0-2osso5+0m5 || [http://code.launchpad.net/~mer-committers/m-r/gconf2 lp:~mer-committers/m-r/gconf2]  || Dirty tricks here. (Ignore the 1:) Needs update to osso5
+
| dbus-glib || 0.78-0maemo1mer2 || 0.78-0maemo2 || - || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| glib2.0 || 2.18.1-1maemo2mer2 || 2.18.1-1maemo4+0m5 || [http://code.launchpad.net/~mer-committers/m-r/glib lp:~mer-committers/m-r/glib] || -
+
| epeg || 0.9.0.005maemo2mer1 || 0.9.1.042maemo0 || - || -
 +
|- style="backgrund:Orange"
 +
| gail || 1:1.18.0-osso14mer2 || || - || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| gnome-vfs-filechooser-backend || 1.10.0-1mer1 || 1.10.0-1+0m5 || [http://code.launchpad.net/~carsten-munk/m-r/gnome-vfs-filechooser-backend lp:~carsten-munk/m-r/gnome-vfs-filechooser-backend]  || Just a rebuild?
+
| gconf2 || 1:2.16.0-2osso1mer8 || 2.16.0-2osso4 || lp:~mer-committers/m-r/gconf2 || -
-
|- style="background:Orange"
+
-
| gstreamer0.10-ffmpeg-osso || 1.11.6 || - || -  || -
+
-
|- style="background:Lime"
+
-
| gtk+2.0 || 2:2.12.12-1maemo13mer9 || 2:2.12.12-1maemo12+0m5 || [http://code.launchpad.net/~mer-committers/m-r/gtk+ lp:~mer-committers/m-r/gtk+]  || Ahead as we use the stage.* SVN
+
-
|- style="background:Orange"
+
-
| gtkhtml || 3.24.0-osso3mer1 || - || -  || Has a new name it seems?
+
|- style="background:Tomato"
|- style="background:Tomato"
-
| hildon-application-manager || 1:2.1.20~unreleased-r1465-mer3 || 1:2.2.17+0m5 || [http://code.launchpad.net/~mer-committers/m-r/hildon-application-manager lp:~mer-committers/m-r/hildon-application-manager]  || -
+
| glib2.0 || 2.18.1-1maemo1 || 2.18.1-1maemo2 || - || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| hildon-control-panel || 1:2.2.5-1mer5 || 1:2.2.6-1+0m5 || [http://code.launchpad.net/~mer-committers/m-r/hildon-control-panel lp:~mer-committers/m-r/hildon-control-panel]  || -
+
| gnome-vfs-filechooser-backend || 1.9.6-1mer1 || 1.9.6-2 || - || -
 +
|- style="backgrund:Orange"
 +
| gstreamer0.10-ffmpeg-osso || 1.11.6 ||  || - || -
 +
|- style="background:Tomato"
 +
| 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
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| hildon-games-wrapper || 1.9.4-3+0m5 || 1.9.4-3+0m5 || - || -
+
| gtk20-l10n || 4.2 || 4.2 || - || -
 +
|- style="background:Tomato"
 +
| gtkhtml || 3.24.0-osso3mer1 || 3.13.91-3osso15 || - || -
 +
|- style="background:Tomato"
 +
| hildon-application-manager || 1:2.1.20~unreleased-r1465-mer3 || 1:2.2.10 || lp:~mer-committers/m-r/hildon-application-manager || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| hildon-input-method || 1:2.0.4-1mer4 || 1:2.1.16-1+0m5 || [http://code.launchpad.net/~mer-committers/m-r/hildon-input-method-mer, r44 lp:~mer-committers/m-r/hildon-input-method-mer, r44] || Kept back because of Fremantle HIM requiring a thumb keyboard
+
| hildon-application-manager-l10n-public || 6.0+r6453mer1 || 6.0+r6481alphasdk || lp:~mer-translations/m-r/hildon-application-manager-l10n-public || -
 +
|- style="backgrund:Orange"
 +
| hildon-common-strings-l10n || 3.0-2r4455 || || - || Should be deleted in repository.
|- style="background:Tomato"
|- style="background:Tomato"
-
| hildon-input-method-framework || 1:2.0.1-1mer2 || 1:2.1.16-1+0m5 || [http://code.launchpad.net/~mer-committers/m-r/hildon-input-method-framework-mer lp:~mer-committers/m-r/hildon-input-method-framework-mer]  || Kept back because of Fremantle HIM requiring a thumb keyboard
+
| hildon-common-strings-l10n-public || 6.0+r6368mer1 || 6.0+r6481 || lp:~mer-translations/m-r/hildon-common-strings-l10n-public || -
-
|- style="background:Lime"
+
-
| hildon-theme-cacher || 0.4.3-1mer1 || 0.4.3-1-recomp1 || [http://code.launchpad.net/~carsten-munk/m-r/hildon-theme-cacher lp:~carsten-munk/m-r/hildon-theme-cacher]  || just a rebuild.
+
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| hildon-theme-tools || 0.5.2-1mer1 || 0.5.2-1 || ||
+
| hildon-control-panel || 1:2.2.5-1mer5 || 1:2.2.5-1 || lp:~mer-committers/m-r/hildon-control-panel || -
 +
|- style="background:Tomato"
 +
| hildon-control-panel-l10n-public || 6.0+r6453mer1 || 6.0+r6481 || lp:~mer-translations/m-r/hildon-control-panel-l10n-public || -
 +
|- style="background:Tomato"
 +
| 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.
 +
|- style="backgrund:Orange"
 +
| hildon-fm-l10n || 3.0-2r4515-mer1 ||  || - || Should be deleted in repository.
 +
|- style="background:Tomato"
 +
| hildon-fm-l10n-public || 6.0+r6440mer1 || 6.0+r6492 || lp:~mer-translations/m-r/hildon-fm-l10n-public || -
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| hildon-thumbnail || 3.0.21+0m5 || 3.0.21+0m5 || -  ||  
+
| hildon-games-wrapper || 1.9.4-1 || 1.9.4-1 || - || -
 +
|- style="background:Tomato"
 +
| hildon-initscripts || 1.18-1mer2 || 1.21-1 || lp:~mer-committers/m-r/hildon-initscripts || -
 +
|- style="background:Tomato"
 +
| hildon-input-method || 1:2.0.4-1mer4 || 1:2.1.10-1 || lp:~mer-committers/m-r/hildon-input-method-mer, r44 || Kept back because of Fremantle HIM requiring a thumb keyboard
 +
|- style="background:Tomato"
 +
| 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
 +
|- style="background:Tomato"
 +
| hildon-input-method-l10n-public || 6.0+r6368mer1 || 6.0+r6459 ||  || -
 +
|- style="background:Tomato"
 +
| 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..
 +
|- style="background:Tomato"
 +
| hildon-libs-l10n-public || 6.0+r6417mer1 || 6.0+r6492 || lp:~mer-translations/m-r/hildon-libs-l10n-public || -
 +
|- style="backgrund:Orange"
 +
| hildon-plugins-settings || 0.0.10-1mer2 || || - || -
 +
|- style="background:Tomato"
 +
| hildon-theme-cacher || 0.4.3-1mer1 || 0.4.3-1-recomp1 || lp:~carsten-munk/m-r/hildon-theme-cacher || just a rebuild.
 +
|- style="background:Tomato"
 +
| 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)
 +
|- style="backgrund:Orange"
 +
| hildon-theme-plankton || 4.14.5-1mer4 ||  || - || Basically invalid with new Mer desktop layout.
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| icd2-osso-ic-dev || 2.0mer1 || 2.0 || - || Only in repository.
+
| icd2-osso-ic-dev || 2.0mer1 || 2.0 || - || Only in repository.
 +
|- style="background:Tomato"
 +
| ke-recv-l10n-public || 6.0+r6368mer1 || 6.0+r6492 || lp:~mer-translations/m-r/ke-recv-l10n-public || -
 +
|- style="backgrund:Orange"
 +
| kernel-diablo || 2.6.21-200829maemo1 ||  || - || From Diablo SDK
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| libconbtui || 1.4.1mer1 || 1.4.1 || - ||  
+
| libconbtui || 1.4.1mer1 || 1.4.1 || - || Just in repository.
 +
|- style="background:LightBlue"
 +
| libconic || 0.19mer2 || 0.19 || - || Just in repository.
|- style="background:Tomato"
|- style="background:Tomato"
-
| libconic || 0.19mer2 || 0.20+0m5 || - ||  
+
| libdb1 || 1.85.4-osso7 || 1.85.4-osso8 || - || From Diablo SDK initially.
-
|- style="background:LightGreen"
+
|- style="background:LightBlue"
-
| libdb1 || 1.85.4-osso8 || 1.85.4-osso8 || - ||  
+
| libhildon || 2.1.42-2mer6 || 2.1.42-2 || lp:~mer-committers/m-r/libhildon-2.1.24 || -
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| libhildon || 2.1.62-1+0m5mer1 || 2.1.62-1+0m5 || [http://code.launchpad.net/~carsten-munk/m-r/libhildon-2.1.24 lp:~carsten-munk/m-r/libhildon-2.1.24]  || -
+
| libhildonfm || 1:2.1.7mer2 || 1:2.1.7 || - || Just in repository.
|- style="background:Tomato"
|- style="background:Tomato"
-
| libhildonfm || 1:2.1.7mer2 || 1:2.10+0m5 || -  || Just in repository.
+
| libhildonhelp || 2.0.5-1 || 2.0.3-0 || - || -
-
|- style="background:Orange"
+
-
| libhildonhelp || 2.0.5-1 || - || lp:~mer-committers/m-r/libhildonhelp  || Removed in Fremantle.
+
|- style="background:Tomato"
|- style="background:Tomato"
-
| libhildonmime || 2.1.2-1mer2 || 2.1.3-1+0m5 || [http://code.launchpad.net/~carsten-munk/m-r/libhildonmime lp:~carsten-munk/m-r/libhildonmime]  || -
+
| libhildonmime || 2.0.2-2mer1 || 2.1.2-1 || lp:~carsten-munk/m-r/libhildonmime || -
-
|- style="background:LightBlue"
+
|- style="backgrund:Orange
-
| libosso || 2.19-1mer1 || 2.19-1 || [http://code.launchpad.net/~carsten-munk/m-r/libosso lp:~carsten-munk/m-r/libosso]  || From stage.* SVN, hence in front.
+
| libmatchbox1 || 2:1.9-osso6mer1 || || lp:~mer-committers/m-r/libmatchbox1 || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| maemo-launcher || 0.31-2mer4 || 0.35-1+0m5 || [http://code.launchpad.net/~mer-committers/m-r/maemo-launcher lp:~mer-committers/m-r/maemo-launcher]  || -
+
| libosso || 2.19-1mer1 || 2.18-1 || lp:~carsten-munk/m-r/libosso || From stage.* SVN, hence in front.
 +
|- style="background:Tomato"
 +
| libxsp || 1.2.3-4mer1 || 1.2.3-4.1 || lp:~carsten-munk/m-r/libxsp || -
 +
|- style="backgrund:Orange"
 +
| maemo-af-desktop-l10n || 3.0-2r4480 ||  || - || Should be removed from repository.
 +
|- style="background:Tomato"
 +
| maemo-af-desktop-l10n-public || 6.0+r6405mer1 || 6.0+r6459 || lp:~mer-translations/m-r/maemo-af-desktop-l10n-public || -
 +
|- style="background:Tomato"
 +
| maemo-launcher || 0.31-2mer3 || 0.32-1 || lp:~carsten-munk/m-r/maemo-launcher || -
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| maemopad || 2.4-6+0m5 || 2.4-6+0m5 || - || -
+
| maemopad || 2.4-3 || 2.4-3 || - || -
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| mce-dev || 1.8.10+0m5 || 1.8.10+0m5 || [http://code.launchpad.net/~carsten-munk/m-r/mce-dev lp:~carsten-munk/m-r/mce-dev] || REVERTED.
+
| marketing-release-public || 6.0 || 6.0 || - || -
-
|- style="background:Lime"
+
|- style="backgrund:Orange"
-
| osso-af-settings || 0.9.3-1mer1 || 0.9.2-1 || [http://code.launchpad.net/~carsten-munk/m-r/osso-af-settings lp:~carsten-munk/m-r/osso-af-settings] || -
+
| matchbox-window-manager || 2:1.2-fremantle-osso18mer1 || || - || -
 +
|- style="background:Tomato"
 +
| matchbox-window-manager-2 || 0.2.4-0maemo1mer3 || 0.2.17-1 || lp:~mer-committers/m-r/matchbox-window-manager-2 || Clutter UI based.
 +
|- style="background:Tomato"
 +
| mce-dev || 1.6.3 || 1.8.8 || lp:~carsten-munk/m-r/mce-dev || -
 +
|- style="backgrund:Orange"
 +
| mce-dummy || 1.2.0 || || - || Should be removed from repository.
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| osso-af-utils || 2.0-3+0m5 || 2.0-3+0m5 || - || -
+
| osso-af-utils || 2.0-1 || 2.0-1 || - || -
-
|- style="background:Lime"
+
|- style="backgrund:Orange"
-
| osso-gnome-vfs2 || 2:2.16.3-2osso2mer2 || 2.16.3-2osso3+0m5 || - || Needs update to osso3
+
| osso-applet-tasknavigator-l10n-public || 5.0+r5892 ||  || - || Required for "diablo" hildon-desktop
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| osso-gnomevfs-extra || 2:1.9.6-3mer1 || 1.9.6-3 || [http://code.launchpad.net/~mer-committers/m-r/osso-gnomevfs-extra  lp:~mer-committers/m-r/osso-gnomevfs-extra ] || Ignore the 2: part.
+
| osso-gnome-vfs2 || 2:2.16.3-2osso2mer2 || 2.16.3-2osso2 || - || In repository only.
 +
|- style="background:Tomato"
 +
| osso-gnomevfs-extra || 2:1.9.6-2mer3 || 1.9.6-3 || lp:~mer-committers/m-r/osso-gnomevfs-extra  || -
|- style="background:LightBlue"
|- style="background:LightBlue"
-
| osso-gwconnect || 1.0.12-mer4 || 1.0.12 || [http://code.launchpad.net/~carsten-munk/m-r/osso-gwconnect lp:~carsten-munk/m-r/osso-gwconnect]  || -
+
| osso-gwconnect || 1.0.12-mer3 || 1.0.12 || bzr branch lp:~carsten-munk/m-r/osso-gwconnect || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| osso-gwobex || 0.61mer2 || 0.62+0m5 || [http://code.launchpad.net/~carsten-munk/m-r/osso-gwobex lp:~carsten-munk/m-r/osso-gwobex]  || Ahead, from SVN.
+
| osso-gwobex || 0.61mer2 || 0.60 || lp:~carsten-munk/m-r/osso-gwobex || -
|- style="background:LightGreen"
|- style="background:LightGreen"
-
| osso-systemui-dbus-dev || 0.1.2 || 0.1.2 || -  || -
+
| osso-systemui-dbus-dev || 0.1.2 || 0.1.2 || - || -
 +
|- style="backgrund:Orange"
 +
| osso-uri-l10n || 3.0-2r4455 || || - || Should be removed from repository.
|- style="background:Tomato"
|- style="background:Tomato"
-
| sapwood || 3.1.1-1-mer2 || 3.1.1-2+0m5 || [http://code.launchpad.net/~carsten-munk/m-r/sapwood lp:~carsten-munk/m-r/sapwood]  || -
+
| osso-uri-l10n-public || 6.0+r6405mer1 || 6.0+r6481 || lp:~mer-translations/m-r/osso-uri-l10n-public || -
-
|- style="background:LightGreen"
+
|- style="background:LightBlue"
-
| screenshot-tool || 1.23-2 || 1.23-2 || ||
+
| osso-xterm || 0.14.mh13mer2 || 0.14.mh13 || lp:~mer-committers/m-r/osso-xterm || -
-
|- style="background:LightGreen"
+
|- style="background:LightBlue"
-
| tablet-browser-interface || 0.0.5-4 || 0.0.5-4 || - || Browser is coming in final SDK.
+
| sapwood || 3.1.1-1-mer2 || 3.1.1-1 || lp:~carsten-munk/m-r/sapwood || -
|- style="background:Tomato"
|- style="background:Tomato"
-
| wpeditor || 2.18-0mer1 || 2.22-0+0m5 || - || -
+
| sudo || 1:1.6.8p12-4osso8 || 1:1.6.8p12-4osso21 || lp:~mer-committers/m-r/sudo || -
 +
|- style="backgrund:Orange"
 +
| tablet-browser-interface || 0.0.5-1 || || - || Browser should come in beta SDK?
 +
|- style="background:LightBlue"
 +
| tslib || 1.0-4ubuntu2mer2 || 1.0-4 || lp:~mer-committers/m-r/tslib-1.0 || -
 +
|- style="background:LightBlue"
 +
| x11proto-xsp || 1.2-1mer1 || 1.2-1 || lp:~carsten-munk/m-r/x11proto-xsp || -
|}
|}

Learn more about Contributing to the wiki.


Please note that all contributions to maemo.org wiki may be edited, altered, or removed by other contributors. If you do not want your writing to be edited mercilessly, then do not submit it here.
You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see maemo.org wiki:Copyrights for details). Do not submit copyrighted work without permission!


Cancel | Editing help (opens in new window)

Templates used on this page:

Retrieved from "http://wiki.maemo.org/Mer/Documentation/Common_Packages"