Jump to content

Digikam/GSoC2012: Difference between revisions

From KDE Community Wiki
Ochurlaud (talk | contribs)
 
(165 intermediate revisions by 12 users not shown)
Line 1: Line 1:
= digiKam Google Summer of Code 2012 Projects list =
= digiKam Google Summer of Code 2012 Projects list =
* [[Digikam/GSoC2012/CloneTool]]
* [[Digikam/GSoC2012/FaceRecognition]]
* [[Digikam/GSoC2012/LibKipi_and_KipiPlugin_restructuring_using_KDE_XML_GUI_API]]


== Video Slide Show Generator ==
== Video Slide Show Generator ==


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/janardhan/40001 Melange page]
* Student            : [https://plus.google.com/u/0/115189234663281150047 Janardhan Reddy] <annapareddyjanardhanreddy at gmail dot com>
* Student            : Janardhan Reddy <annapareddyjanardhanreddy at gmail dot com>
* Come from          : Chennai, India
* Lead Mentor        : Angelo Naselli <anaselli at linux dot it>
* Lead Mentor        : Angelo Naselli
* Alternative Mentor : Gilles Caulier <caulier dot gilles at gmail dot com>
* Alternative Mentor : Gilles Caulier
* Working on        : Kipi-plugins 3.0.0 Git branch
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/janardhan/1 Proposal page]
* Status : completed
 
http://farm9.staticflickr.com/8040/7995338984_5500a17e7e_n.jpg
[http://www.flickr.com/photos/digikam/7995338984/sizes/o/in/photostream/ full size screenshot from Flickr]


== Camera User Interface Revamp ==
== Camera User Interface Revamp ==


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/menopia/48002 Melange page]
* Student            : [https://plus.google.com/u/0/114444774108176364727 Islam Wazery] <wazery at ubuntu dot com>
* Student            : Islam Wazery <al dot wazery at gmail dot com>
* Come from          : Saudi Arabia, Egypt
* Lead Mentor        : Gilles Caulier <caulier dot gilles at gmail dot com>
* Lead Mentor        : Gilles Caulier
* Alternative Mentor : Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
* Alternative Mentor : Marcel Wiesweg
* Working on        : digiKam 3.0.0 Git branch
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/menopia/2002 Proposal page]
* [[Digikam/GSoC2012/CameraUserInterfaceRevamp | Wiki page]]
* Status : Completed
 
http://farm9.staticflickr.com/8170/7995731048_ee4de33600_n.jpg
[http://www.flickr.com/photos/digikam/7995731048/sizes/o/in/photostream/ full size screenshot from Flickr]
 
http://farm9.staticflickr.com/8318/7995724027_572f96392e_n.jpg
[http://www.flickr.com/photos/digikam/7995724027/sizes/o/in/photostream/ full size screenshot from Flickr]


== Face Recognition ==  
== Face Recognition ==  


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/mamun_nightcrawler/53002 Melange page]
* Student            : [https://plus.google.com/u/0/101180789924578850564 Mahfuzur Rahman Mamun] <mamun dot nightcrawler at gmail.com>
* Student            : Mahfuzur Rahman Mamun <mamun dot nightcrawler at gmail.com>
* Come from          : Dhaka, Bangladesh
* Lead Mentor        : Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
* Lead Mentor        : Marcel Wiesweg
* Alternative Mentor : Alex Jironkin <alexjironkin at gmail dot com>
* Alternative Mentor : Alex Jironkin
* Working on        : libkface 3.0.0 and digiKam 3.0.0 Git branches
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/mamun_nightcrawler/23002 Proposal page]
* [http://community.kde.org/Digikam/GSoC2012/FaceRecognition Wiki page]
* Status : Not completed.


== Improve integration of Photivo ==
== Improve integration of Photivo ==


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/sixtripleeight/18003 Melange page]
* Student            : [https://plus.google.com/u/0/100130453939428403605 Dominic Lyons] <domlyons at googlemail dot com>
* Student            :  
* Come from          : Deizisau, Germany
* Lead Mentor        : Benjamin Girault <benjamin dot girault at gmail dot com>
* Lead Mentor        : Benjamin Girault
* Alternative Mentor : ???
* Alternative Mentor : Bernd Schöler
* Working on        : Kipi-plugins 3.0.0 Git branch
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/sixtripleeight/2003 Proposal page]
* [[Digikam/GSoC2012/PhotivoIntegration|Wiki page: Photivo Integration]]
* Status : Not completed.


== UPnP / DLNA plugin ==
== UPnP / DLNA plugin ==


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/smitmehta/22001 Melange page]
* Student            : [https://plus.google.com/u/0/113404087048256151794 Smit Mehta] <smit dot tmeh at gmail dot com>
* Student            : Smit Mehta <smit dot tmeh at gmail dot com>
* Come from          : Chennai, India
* Lead Mentor        : Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
* Lead Mentor        : Marcel Wiesweg
* Alternative Mentor : Gilles Caulier <caulier dot gilles at gmail dot com>
* Alternative Mentor : Gilles Caulier
* Working on        : Kipi-plugins 3.0.0 Git branch
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/smitmehta/1 Proposal page]
* Status : Completed
 
http://farm9.staticflickr.com/8029/7995339050_66e2e6d27b_n.jpg
[http://www.flickr.com/photos/digikam/7995339050/sizes/o/in/photostream/ full size screenshot from Flickr]


== Video Metadata Support ==
== Video Metadata Support ==


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/badola/26001 Melange page]
* Student            : [https://plus.google.com/u/0/107198225472060439855 Abhinav Badola] <mail dot abu dot to at gmail dot com>
* Student            :  
* Come from          : Chandigarh, India
* Lead Mentor        : Andreas Huggel <ahuggel at gmail dot com>
* Lead Mentor        : Andreas Huggel
* Alternative Mentor : Gilles Caulier <caulier dot gilles at gmail dot com>
* Alternative Mentor : Gilles Caulier
* Working on        : A dedicated Svn branch for Exiv2, and digiKam 3.0.0 git branches.
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/badola/1 Proposal page]
* KDE bugzilla entries :[https://bugs.kde.org/show_bug.cgi?id=164442 164442]
* Status : Completed.
 
http://farm9.staticflickr.com/8295/7995672480_9ffa1b9bd3_n.jpg
[http://www.flickr.com/photos/digikam/7995672480/sizes/o/in/photostream/ full size screenshot from Flickr]
 
http://farm9.staticflickr.com/8032/7995672380_eb5e6abf24_n.jpg
[http://www.flickr.com/photos/digikam/7995672380/sizes/o/in/photostream/ full size screenshot from Flickr]
 
==  Porting Libkipi and KIPI-Plugins to KDE XML-GUI ==
 
* Student            : [https://plus.google.com/u/0/100091879091303936121 Victor Dodon] <dodonvictor at gmail dot com>
* Come from          : Bucuresti, Romania
* Lead Mentor        : Benjamin Girault
* Alternative Mentor : Gilles Caulier
* Working on        : Libkipi-2.0.0 Git branch, digiKam 3.0.0 branch and Kipi-plugins 3.0.0 Git branch
* [http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/dodonvictor/10002 Proposal page]
* [[Digikam/GSoC2012/KipiPluginInterfaceToolbarAccess | Wiki page]]
* Status : Completed.
 
http://farm9.staticflickr.com/8314/7995333879_1f9817dc31_n.jpg
[http://www.flickr.com/photos/digikam/7995333879/sizes/o/in/photostream/ full size screenshot from Flickr]
 
http://farm9.staticflickr.com/8319/7995333795_5124aa5a5a_n.jpg
[http://www.flickr.com/photos/digikam/7995333795/sizes/o/in/photostream/ full size screenshot from Flickr]
 
= digiKam Summer of KDE 2012 Projects list =
 
== Wallpaper plugin ==
 
* Student            : [https://plus.google.com/u/0/101368009729475459723 Varun Herale] <varun dot herale at gmail dot com>
* Come from          : Chennai, India
* Lead Mentor        : Gilles Caulier
* Alternative Mentor : Angelo Naselli
* Working on        : Kipi-plugins 3.0.0 Git branch
* [https://bugs.kde.org/show_bug.cgi?id=254932 Bugzilla entry]
* [[Digikam/SoK2012/WallpaperPlugin | Wiki page]]
* Status : Completed.
 
== Auto Noise Reduction ==
 
* Student            : [https://plus.google.com/100302360459800439676 Sayantan Datta] <sayantan dot knz at gmail dot com>
* Come from          : Durgapur, India
* Lead Mentor        : Gilles Caulier
* Alternative Mentor : Marcel Wiesweg
* Working on        : digiKam 3.0.0 Git branch
* [https://bugs.kde.org/show_bug.cgi?id=166820 Bugzilla entry]
* [[Digikam/SoK2012/AutoNR|  Wiki page]]
* Status : Completed
 
http://farm9.staticflickr.com/8344/8182299222_72d7d6b73c_n.jpg
[http://www.flickr.com/photos/digikam/8182299222/sizes/o/in/photostream/ full size screenshot from Flickr]
 
http://farm9.staticflickr.com/8484/8182261461_9b4a514dfe_n.jpg
[http://www.flickr.com/photos/digikam/8182261461/sizes/o/in/photostream/ full size screenshot from Flickr]
 
== Extending Presentation View using Kipi plugins ==
 
* Student            : [https://plus.google.com/u/0/102278849478968549402 Dhruv Patel] <dhruvkumarr dot patel51 at gmail dot com>
* Come from          : Gandhinagar, India
* Lead Mentor        : Gilles Caulier
* Alternative Mentor : Angelo Naselli
* Working on        : Kipi-plugins 3.0.0 Git branch
* [[SoK/2011/digikam/presentation_view | Wiki page]]
* Status : Not Completed.
 
== Parallelization of code into Batch Queue manager ==
 
* Student            : [https://plus.google.com/114958890691877878308 Pankaj Kumar] <me at panks dot me>
* Come from          : India
* Lead Mentor        : Gilles Caulier
* Alternative Mentor : Marcel Wiesweg
* Working on        : digiKam 3.0.0 Git branch
* Summary            : Right now the processing of items in BQM take place in serial fashion, the goal of this project is to allow processing of items from queue in parallel, using multicore CPU.
* [https://bugs.kde.org/show_bug.cgi?id=254033 Bugzilla entry]
* Status : Completed
 
http://farm9.staticflickr.com/8485/8246746029_75f4fc40ec_n.jpg
[http://www.flickr.com/photos/digikam/8246746029/sizes/o/in/photostream/ full size screenshot from Flickr]
 
= Extra projects relevant of digiKam Software Compilation 3.0.0 =
 
== Kipi-plugins Factoring ==
 
=== Summary ===
 
In order to branch Kipi-plugins to 3.0.0, and to optimize time loading of KIPI host applications at startup, some tools need to be binary factored to the same plugin.
 
=== Import/Export tools To Web Services to factorize ===
 
* Facebook
* FlickrExport
* GalleryExport
* PicasaWebExport
* Smug
* Shwup
* PiwigoExport
* DebianScreenshots
* YandexFotki
* MediaWiki
* RajceExport
* Vkontakte
* ImageShackExport
* ImgurExport
 
= Mentors List and Coordination =
 
* [https://plus.google.com/u/0/116398684787400584523 Gilles Caulier] <caulier dot gilles at gmail dot com> from France
* [http://www.facebook.com/profile.php?id=1332031299 Marcel Wiesweg] <marcel dot wiesweg at gmx dot de> from Germany
* [https://plus.google.com/u/0/114940207804615740560 Andreas Huggel] <ahuggel at gmx dot net> from Malaysia
* [https://plus.google.com/u/0/109802167766760530845 Angelo Naselli] <anaselli at linux dot it> from Italia
* [https://plus.google.com/u/0/109282675370620103497 Benjamin Girault] <benjamin dot girault at gmail dot com> from France
* [https://plus.google.com/u/0/104524345956473229784 Alex Jironkin] <alexjironkin at gmail dot com> from UK
* Bernd Schöler <brother dot john at photivo dot org>
 
Students and mentors will use [https://mail.kde.org/mailman/listinfo/digikam-soc-devel digikam-soc-devel at kde dot org] mailing-list to coordinate projects.
 
= Repositories Branching and Dates =
 
== Branches Creation and Maintenance ==
 
* To create remote working branches in KDE git repository, please look on [http://techbase.kde.org/Development/Git/Recipes#Creating_.2F_Deleting_Remote_Branches this tutorial] from KDE TechBase.
 
* During GoSC2012 coding time, git/master will still the stable implementation receiving important fixes. A development branch must be sync with git/master periodically. To do it, see below as example how to sync digiKam "3.0.0" branch tracking "remotes/origin/development/3.0.0" from KDE git repository:
 
<source lang="bash">
$>git checkout master
$>git pull --rebase
$>git checkout -b 3.0.0 remotes/origin/development/3.0.0
  Branch 3.0.0 set up to track remote branch development/3.0.0 from origin.
  Switched to a new branch '3.0.0'
$>git merge master
  Merge made by the 'recursive' strategy.
  ...
$>git push
</source>
 
The 2 first lines take a sure that your local master repository is up to date.
The 3rd line create in local the "3.0.0" development branch.
Merge between master and 3.0.0 branch is done with 4th line. Git can ask you to resolve conflicts here. When it's done, it will ask you a commit comment.
Finally push your merge into remote KDE repository.
 
Note: If you have already created 3.0.0 branch, just run "git checkout 3.0.0" as well instead git checkout -b 3.0.0 remotes/origin/development/3.0.0. This give this concatened command line:
 
<source lang="bash">
$>git checkout master; git pull --rebase; git checkout 3.0.0; git pull; git merge master
  ...
$>git push
</source>
 
 
=== digiKam 3.0.0 ===
* Assigned to : Islam Wazery
* Git name : "development/3.0.0"
* [https://projects.kde.org/projects/extragear/graphics/digikam/repository/show?rev=development%2F3.0.0 Git Web interface]
 
=== Kipi-plugins 3.0.0 ===
* Assigned to : Smit Mehta
* Git name "development/3.0.0"
* [https://projects.kde.org/projects/extragear/graphics/kipi-plugins/repository/show?rev=development%2F3.0.0 Git Web interface]
 
=== Libkface 3.0.0 ===
* Assigned to :  Mahfuzur Rahman Mamun
* Git name "libkface-3.0.0"
* [https://projects.kde.org/projects/extragear/libs/libkface/repository/show?rev=libkface-3.0.0 Git Web interface]
 
=== Libkipi 2.0.0 ===
* Assigned to : Victor Dodon
* Git name "development/2.0.0"
* [https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi/repository/show?rev=development%2F2.0.0 Git Web interface]
 
=== Exiv2 ===
* Assigned to : Abhinav Badola
* Svn name "gsoc2012"
* [http://dev.exiv2.org/projects/exiv2/repository/show/branches/gsoc2012 Exiv2 subversion Web interface]
 
== Roadmap and Releases Plan including all GoSC-2012 works ==
 
* 09 May 2012 : digiKam and Kipi-plugins 2.6.0-RC released from KDE git/master.
* 13 May 2012 : digiKam 3.0.0 branch created from KDE git/master.
* 13 May 2012 : Kipi-plugins 3.0.0 branch created from KDE git/master.
* 13 May 2012 : Libkface 3.0.0 branch created from KDE git/master.
* 13 May 2012 : Libkipi 2.0.0 branch created from KDE git/master.
* 13 May 2012 : Exiv2 GSoC2012 branch created from SVN.
* 04 Jun 2012 : digiKam and Kipi-plugins 2.6.0-final released from KDE git/master.
* 08 Jul 2012 : digiKam and Kipi-plugins 2.7.0 released from KDE git/master.
* 05 Aug 2012 : digiKam and Kipi-plugins 2.8.0 released from KDE git/master.
* 20 Aug 2012 : Exiv2 GSoC2012 branch merged to SVN trunk.
* 02 Sep 2012 : digiKam and Kipi-plugins 2.9.0 released from KDE git/master.
* 05 sep 2012 : All GoSC 2012 development branches are merged back to git/master.
* 16 Sep 2012 : digiKam Software Collection 3.0.0 beta1 including all GoSC-2012 works.
* 08 Oct 2012 : digiKam Software Collection 3.0.0 beta2 .
* 11 Nov 2012 : digiKam Software Collection 3.0.0 beta3.
* 26 Dec 2012 : digiKam Software Collection 3.0.0 RC.
* 6 feb 2013 : digiKam Software Collection 3.0.0 Final (released at the same time than KDE 4.10).
 
== Coding Sprint ==
 
As a lots of students come from India this year, it will be nice to plan a reunion between developers in  this country to reduce travel and hotel costs.


==  Porting KIPI-Plugins and Libkipi to KDE XML-GUI ==
* [https://plus.google.com/u/0/105465824670275586186 Colin Guthrie] suggesting to apply for [http://atulchitnis.net/2012/one-more-thing FOSS.IN/2012] event.


* [http://www.google-melange.com/gsoc/project/google/gsoc2012/dodonvictor/31002 Melange page]
* [https://plus.google.com/113691654116060042197 Pradeepto Bhattacharya] propose through G+ to organize the events somewhere in India.
* Student            : Victor Dodon <dodonvictor at gmail dot com>
* Lead Mentor        : Benjamin Girault <benjamin dot girault at gmail dot com>
* Alternative Mentor : Gilles Caulier <caulier dot gilles at gmail dot com>

Latest revision as of 10:05, 9 March 2016

digiKam Google Summer of Code 2012 Projects list

Video Slide Show Generator

  • Student  : Janardhan Reddy <annapareddyjanardhanreddy at gmail dot com>
  • Come from  : Chennai, India
  • Lead Mentor  : Angelo Naselli
  • Alternative Mentor : Gilles Caulier
  • Working on  : Kipi-plugins 3.0.0 Git branch
  • Proposal page
  • Status : completed

7995338984_5500a17e7e_n.jpg full size screenshot from Flickr

Camera User Interface Revamp

  • Student  : Islam Wazery <wazery at ubuntu dot com>
  • Come from  : Saudi Arabia, Egypt
  • Lead Mentor  : Gilles Caulier
  • Alternative Mentor : Marcel Wiesweg
  • Working on  : digiKam 3.0.0 Git branch
  • Proposal page
  • Wiki page
  • Status : Completed

7995731048_ee4de33600_n.jpg full size screenshot from Flickr

7995724027_572f96392e_n.jpg full size screenshot from Flickr

Face Recognition

  • Student  : Mahfuzur Rahman Mamun <mamun dot nightcrawler at gmail.com>
  • Come from  : Dhaka, Bangladesh
  • Lead Mentor  : Marcel Wiesweg
  • Alternative Mentor : Alex Jironkin
  • Working on  : libkface 3.0.0 and digiKam 3.0.0 Git branches
  • Proposal page
  • Wiki page
  • Status : Not completed.

Improve integration of Photivo

UPnP / DLNA plugin

  • Student  : Smit Mehta <smit dot tmeh at gmail dot com>
  • Come from  : Chennai, India
  • Lead Mentor  : Marcel Wiesweg
  • Alternative Mentor : Gilles Caulier
  • Working on  : Kipi-plugins 3.0.0 Git branch
  • Proposal page
  • Status : Completed

7995339050_66e2e6d27b_n.jpg full size screenshot from Flickr

Video Metadata Support

  • Student  : Abhinav Badola <mail dot abu dot to at gmail dot com>
  • Come from  : Chandigarh, India
  • Lead Mentor  : Andreas Huggel
  • Alternative Mentor : Gilles Caulier
  • Working on  : A dedicated Svn branch for Exiv2, and digiKam 3.0.0 git branches.
  • Proposal page
  • KDE bugzilla entries :164442
  • Status : Completed.

7995672480_9ffa1b9bd3_n.jpg full size screenshot from Flickr

7995672380_eb5e6abf24_n.jpg full size screenshot from Flickr

Porting Libkipi and KIPI-Plugins to KDE XML-GUI

  • Student  : Victor Dodon <dodonvictor at gmail dot com>
  • Come from  : Bucuresti, Romania
  • Lead Mentor  : Benjamin Girault
  • Alternative Mentor : Gilles Caulier
  • Working on  : Libkipi-2.0.0 Git branch, digiKam 3.0.0 branch and Kipi-plugins 3.0.0 Git branch
  • Proposal page
  • Wiki page
  • Status : Completed.

7995333879_1f9817dc31_n.jpg full size screenshot from Flickr

7995333795_5124aa5a5a_n.jpg full size screenshot from Flickr

digiKam Summer of KDE 2012 Projects list

Wallpaper plugin

  • Student  : Varun Herale <varun dot herale at gmail dot com>
  • Come from  : Chennai, India
  • Lead Mentor  : Gilles Caulier
  • Alternative Mentor : Angelo Naselli
  • Working on  : Kipi-plugins 3.0.0 Git branch
  • Bugzilla entry
  • Wiki page
  • Status : Completed.

Auto Noise Reduction

  • Student  : Sayantan Datta <sayantan dot knz at gmail dot com>
  • Come from  : Durgapur, India
  • Lead Mentor  : Gilles Caulier
  • Alternative Mentor : Marcel Wiesweg
  • Working on  : digiKam 3.0.0 Git branch
  • Bugzilla entry
  • Wiki page
  • Status : Completed

8182299222_72d7d6b73c_n.jpg full size screenshot from Flickr

8182261461_9b4a514dfe_n.jpg full size screenshot from Flickr

Extending Presentation View using Kipi plugins

  • Student  : Dhruv Patel <dhruvkumarr dot patel51 at gmail dot com>
  • Come from  : Gandhinagar, India
  • Lead Mentor  : Gilles Caulier
  • Alternative Mentor : Angelo Naselli
  • Working on  : Kipi-plugins 3.0.0 Git branch
  • Wiki page
  • Status : Not Completed.

Parallelization of code into Batch Queue manager

  • Student  : Pankaj Kumar <me at panks dot me>
  • Come from  : India
  • Lead Mentor  : Gilles Caulier
  • Alternative Mentor : Marcel Wiesweg
  • Working on  : digiKam 3.0.0 Git branch
  • Summary  : Right now the processing of items in BQM take place in serial fashion, the goal of this project is to allow processing of items from queue in parallel, using multicore CPU.
  • Bugzilla entry
  • Status : Completed

8246746029_75f4fc40ec_n.jpg full size screenshot from Flickr

Extra projects relevant of digiKam Software Compilation 3.0.0

Kipi-plugins Factoring

Summary

In order to branch Kipi-plugins to 3.0.0, and to optimize time loading of KIPI host applications at startup, some tools need to be binary factored to the same plugin.

Import/Export tools To Web Services to factorize

  • Facebook
  • FlickrExport
  • GalleryExport
  • PicasaWebExport
  • Smug
  • Shwup
  • PiwigoExport
  • DebianScreenshots
  • YandexFotki
  • MediaWiki
  • RajceExport
  • Vkontakte
  • ImageShackExport
  • ImgurExport

Mentors List and Coordination

Students and mentors will use digikam-soc-devel at kde dot org mailing-list to coordinate projects.

Repositories Branching and Dates

Branches Creation and Maintenance

  • To create remote working branches in KDE git repository, please look on this tutorial from KDE TechBase.
  • During GoSC2012 coding time, git/master will still the stable implementation receiving important fixes. A development branch must be sync with git/master periodically. To do it, see below as example how to sync digiKam "3.0.0" branch tracking "remotes/origin/development/3.0.0" from KDE git repository:
$>git checkout master
$>git pull --rebase
$>git checkout -b 3.0.0 remotes/origin/development/3.0.0
  Branch 3.0.0 set up to track remote branch development/3.0.0 from origin.
  Switched to a new branch '3.0.0'
$>git merge master
  Merge made by the 'recursive' strategy.
  ...
$>git push

The 2 first lines take a sure that your local master repository is up to date. The 3rd line create in local the "3.0.0" development branch. Merge between master and 3.0.0 branch is done with 4th line. Git can ask you to resolve conflicts here. When it's done, it will ask you a commit comment. Finally push your merge into remote KDE repository.

Note: If you have already created 3.0.0 branch, just run "git checkout 3.0.0" as well instead git checkout -b 3.0.0 remotes/origin/development/3.0.0. This give this concatened command line:

$>git checkout master; git pull --rebase; git checkout 3.0.0; git pull; git merge master
  ...
$>git push


digiKam 3.0.0

Kipi-plugins 3.0.0

Libkface 3.0.0

Libkipi 2.0.0

Exiv2

Roadmap and Releases Plan including all GoSC-2012 works

  • 09 May 2012 : digiKam and Kipi-plugins 2.6.0-RC released from KDE git/master.
  • 13 May 2012 : digiKam 3.0.0 branch created from KDE git/master.
  • 13 May 2012 : Kipi-plugins 3.0.0 branch created from KDE git/master.
  • 13 May 2012 : Libkface 3.0.0 branch created from KDE git/master.
  • 13 May 2012 : Libkipi 2.0.0 branch created from KDE git/master.
  • 13 May 2012 : Exiv2 GSoC2012 branch created from SVN.
  • 04 Jun 2012 : digiKam and Kipi-plugins 2.6.0-final released from KDE git/master.
  • 08 Jul 2012 : digiKam and Kipi-plugins 2.7.0 released from KDE git/master.
  • 05 Aug 2012 : digiKam and Kipi-plugins 2.8.0 released from KDE git/master.
  • 20 Aug 2012 : Exiv2 GSoC2012 branch merged to SVN trunk.
  • 02 Sep 2012 : digiKam and Kipi-plugins 2.9.0 released from KDE git/master.
  • 05 sep 2012 : All GoSC 2012 development branches are merged back to git/master.
  • 16 Sep 2012 : digiKam Software Collection 3.0.0 beta1 including all GoSC-2012 works.
  • 08 Oct 2012 : digiKam Software Collection 3.0.0 beta2 .
  • 11 Nov 2012 : digiKam Software Collection 3.0.0 beta3.
  • 26 Dec 2012 : digiKam Software Collection 3.0.0 RC.
  • 6 feb 2013 : digiKam Software Collection 3.0.0 Final (released at the same time than KDE 4.10).

Coding Sprint

As a lots of students come from India this year, it will be nice to plan a reunion between developers in this country to reduce travel and hotel costs.