18291
Comment: status update and misc cleanup
|
18345
converted to 1.6 markup
|
Deletions are marked like this. | Additions are marked like this. |
Line 5: | Line 5: |
* [http://alioth.debian.org/projects/pkg-e/ Alioth Project Home Page] * [http://lists.alioth.debian.org/mailman/listinfo/pkg-e-devel E17 Maintainers Mailing List] * [https://alioth.debian.org/tracker/?group_id=30943 Alioth BTS] * [http://bugs.debian.org/cgi-bin/pkgreport.cgi?maint=pkg-e-devel@lists.alioth.debian.org Debian BTS] * [http://qa.debian.org/developer.php?login=pkg-e-devel@lists.alioth.debian.org QA Page] |
* [[http://alioth.debian.org/projects/pkg-e/|Alioth Project Home Page]] * [[http://lists.alioth.debian.org/mailman/listinfo/pkg-e-devel|E17 Maintainers Mailing List]] * [[https://alioth.debian.org/tracker/?group_id=30943|Alioth BTS]] * [[http://bugs.debian.org/cgi-bin/pkgreport.cgi?maint=pkg-e-devel@lists.alioth.debian.org|Debian BTS]] * [[http://qa.debian.org/developer.php?login=pkg-e-devel@lists.alioth.debian.org|QA Page]] |
Line 15: | Line 15: |
||||eina ||||[http://git.debian.org/?p=pkg-e/libs/eina.git;a=summary libs/eina.git] |||| -- ||||0.0.1~svn20081120-1 in source NEW, API break pending vs current SVN || ||||eet ||||[http://git.debian.org/?p=pkg-e/libs/eet.git;a=summary eet.git] ||||1.0.1-1 |||| || ||||ecore ||||[http://git.debian.org/?p=pkg-e/libs/ecore.git;a=summary ecore.git] ||||0.9.9.050-1 ||||0.9.9.050+svn20081201-1 pending, API break || ||||efreet ||||[http://git.debian.org/?p=pkg-e/libs/efreet.git;a=summary efreet.git] ||||0.5.0.050-1 ||||0.5.0.050+svn20081114-1 pending, API break pending vs current SVN || ||||embryo ||||[http://git.debian.org/?p=pkg-e/libs/embryo.git;a=summary embryo.git] ||||0.9.9.050-1 |||| || ||||edje ||||[http://git.debian.org/?p=pkg-e/libs/edje.git;a=summary edje.git] ||||0.9.9.050-1.1 |||| 0.9.9.050+svn20081206-1 pending, API break|| ||||evas |||| [http://git.debian.org/?p=pkg-e/libs/evas.git;a=summary evas.git] |||| 0.9.9.050-2 ||||0.9.9.050+svn20081206-1 pending, API break || ||||edbus ||||[http://git.debian.org/?p=pkg-e/libs/edbus.git;a=summary edbus.git] |||| 0.5.0.050-1 |||| 0.5.0.050+svn20081126-1 pending, API break|| ||||e17 ||||[http://git.debian.org/?p=pkg-e/apps/e.git;a=summary e.git] ||||0.16.999.050-2 ||||0.16.999.050+svn20081207-1 pending || ||||ewl ||||[http://git.debian.org/?p=pkg-e/libs/ewl.git;a=summary ewl.git] |||| -- ||||Not ready || ||||python-ecore ||||[http://git.debian.org/?p=pkg-e/proto/python-efl/python-ecore.git;a=summary python-ecore.git] ||||0.2.1-2 ||||Uploaded || ||||python-edbus ||||[http://git.debian.org/?p=pkg-e/proto/python-efl/python-edbus.git;a=summary python-edbus.git] ||||0.2.1-1 ||||Not ready || ||||python-edje ||||[http://git.debian.org/?p=pkg-e/proto/python-efl/python-edje.git;a=summary python-edje.git] ||||0.2.1-2 ||||Uploaded || ||||python-evas ||||[http://git.debian.org/?p=pkg-e/proto/python-efl/python-evas.git;a=summary python-evas.git] ||||0.2.1-2 ||||Uploaded || |
||||eina ||||[[http://git.debian.org/?p=pkg-e/libs/eina.git;a=summary|libs/eina.git]] |||| -- ||||0.0.1~svn20081120-1 in source NEW, API break pending vs current SVN || ||||eet ||||[[http://git.debian.org/?p=pkg-e/libs/eet.git;a=summary|eet.git]] ||||1.0.1-1 |||| || ||||ecore ||||[[http://git.debian.org/?p=pkg-e/libs/ecore.git;a=summary|ecore.git]] ||||0.9.9.050-1 ||||0.9.9.050+svn20081201-1 pending, API break || ||||efreet ||||[[http://git.debian.org/?p=pkg-e/libs/efreet.git;a=summary|efreet.git]] ||||0.5.0.050-1 ||||0.5.0.050+svn20081114-1 pending, API break pending vs current SVN || ||||embryo ||||[[http://git.debian.org/?p=pkg-e/libs/embryo.git;a=summary|embryo.git]] ||||0.9.9.050-1 |||| || ||||edje ||||[[http://git.debian.org/?p=pkg-e/libs/edje.git;a=summary|edje.git]] ||||0.9.9.050-1.1 |||| 0.9.9.050+svn20081206-1 pending, API break|| ||||evas |||| [[http://git.debian.org/?p=pkg-e/libs/evas.git;a=summary|evas.git]] |||| 0.9.9.050-2 ||||0.9.9.050+svn20081206-1 pending, API break || ||||edbus ||||[[http://git.debian.org/?p=pkg-e/libs/edbus.git;a=summary|edbus.git]] |||| 0.5.0.050-1 |||| 0.5.0.050+svn20081126-1 pending, API break|| ||||e17 ||||[[http://git.debian.org/?p=pkg-e/apps/e.git;a=summary|e.git]] ||||0.16.999.050-2 ||||0.16.999.050+svn20081207-1 pending || ||||ewl ||||[[http://git.debian.org/?p=pkg-e/libs/ewl.git;a=summary|ewl.git]] |||| -- ||||Not ready || ||||python-ecore ||||[[http://git.debian.org/?p=pkg-e/proto/python-efl/python-ecore.git;a=summary|python-ecore.git]] ||||0.2.1-2 ||||Uploaded || ||||python-edbus ||||[[http://git.debian.org/?p=pkg-e/proto/python-efl/python-edbus.git;a=summary|python-edbus.git]] ||||0.2.1-1 ||||Not ready || ||||python-edje ||||[[http://git.debian.org/?p=pkg-e/proto/python-efl/python-edje.git;a=summary|python-edje.git]] ||||0.2.1-2 ||||Uploaded || ||||python-evas ||||[[http://git.debian.org/?p=pkg-e/proto/python-efl/python-evas.git;a=summary|python-evas.git]] ||||0.2.1-2 ||||Uploaded || |
Line 39: | Line 39: |
attachment:git-workflow-legend.png | {{attachment:git-workflow-legend.png}} |
Line 43: | Line 43: |
attachment:git-workflow-upstream.png | {{attachment:git-workflow-upstream.png}} |
Line 47: | Line 47: |
attachment:git-workflow-debian.png | {{attachment:git-workflow-debian.png}} |
Line 51: | Line 51: |
attachment:git-workflow-gitk.png | {{attachment:git-workflow-gitk.png}} |
e17 Desktop Environment
e17 is currently maintained by the Debian e17 Maintainer Group.
- irc.freenode.net #pkg-e
E17 Maintainers < pkg-e-devel@lists.alioth.debian.org >
Packages
Package Name |
Repository |
Version |
Status |
||||
eina |
-- |
0.0.1~svn20081120-1 in source NEW, API break pending vs current SVN |
|||||
eet |
1.0.1-1 |
|
|||||
ecore |
0.9.9.050-1 |
0.9.9.050+svn20081201-1 pending, API break |
|||||
efreet |
0.5.0.050-1 |
0.5.0.050+svn20081114-1 pending, API break pending vs current SVN |
|||||
embryo |
0.9.9.050-1 |
|
|||||
edje |
0.9.9.050-1.1 |
0.9.9.050+svn20081206-1 pending, API break |
|||||
evas |
0.9.9.050-2 |
0.9.9.050+svn20081206-1 pending, API break |
|||||
edbus |
0.5.0.050-1 |
0.5.0.050+svn20081126-1 pending, API break |
|||||
e17 |
0.16.999.050-2 |
0.16.999.050+svn20081207-1 pending |
|||||
ewl |
-- |
Not ready |
|||||
python-ecore |
0.2.1-2 |
Uploaded |
|||||
python-edbus |
0.2.1-1 |
Not ready |
|||||
python-edje |
0.2.1-2 |
Uploaded |
|||||
python-evas |
0.2.1-2 |
Uploaded |
GIT Workflow
This is based on madcoder's talk at FOSDEM 2008. It will allow us to do:
git clone git://git.debian.org/git/pkg-e/libs/embryo.git cd embryo git-buildpackage
This will build the current development version in the repository without having any other local setup.
At first we import the upstream tarballs into git and tell git which tarball (in the upstream branch, with upstream/{version} tags) corresponds to which version in upstream's VCS (in the upstream-vcs branch, with upstream-vcs/{version} tags). This will allow us to easily pull fixes from there. After importing three versions our repository looks like this:
Then we can branch from a upstream/{version} tag and add the debian packaging. When we have a new version in the upstream branch, we simply merge it into the master branch. The tree corresponding to a version uploaded to Debian is tagged debian/{version}.
This is how it looks in gitk:
The original upstream tarballs are stored as deltas to upstream/{version} in the pristine-tar branch.
Updating to a new version
# update the 'upstream-vcs' branch $ git fetch --no-tags upstream master:upstream-vcs remote: Generating pack... remote: Done counting 111 objects. remote: Result has 96 objects. remote: Deltifying 96 objects... remote: 100% (96/96) done remote: Total 96 (delta 57), reused 95 (delta 56) Unpacking objects: 100% (96/96), done. From git://staff.get-e.org/e17/libs/eet 67bc060..a69a053 master -> upstream-vcs # take a look at the changes with gitk and find the release revision $ gitk upstream-vcs # or use git log $ git log --grep=asparagus -n 3 upstream-vcs commit 1182419995c64bb11e53652769d3e0bc7215d242 Author: raster <raster> Date: Mon May 19 00:07:11 2008 +0000 pass make distcheck and a snapshot asparagus release - been a while commit e1497e2a7edc2ffb1dc17a066792c5e7cf3a48d4 Author: raster <raster> Date: Fri Jan 25 03:35:46 2008 +0000 asparagus! also pass distcheck and have common autofoo init that is consistent for package, version etc. commit a2292c0ccb10b08d432d14c4e4220aa09aee83e4 Author: raster <raster> Date: Sun Aug 26 14:33:38 2007 +0000 asparagus! # the new version is 1.0.1, so tag it: $ git tag upstream-vcs/1.0.1 1182419995c64bb11e53652769d3e0bc7215d242 # get the new upstream tarball $ uscan --destdir ../tarballs/ eet: Newer version (1.0.1) available on remote site: http://download.enlightenment.org/snapshots/LATEST/eet-1.0.1.tar.gz (local version is 1.0.0) eet: Successfully downloaded updated package eet-1.0.1.tar.gz and symlinked eet_1.0.1.orig.tar.gz to it # switch to the 'upstream' branch, import the tarball and commit $ git checkout upstream Switched to branch "upstream" $ for i in $(ls -A); do if [ "$i" != ".git" ]; then rm -rf $i; fi done $ tar -xf --strip 1 ../tarballs/eet_1.0.1.orig.tar.gz $ git add . $ git commit -a -m 'Import upstream release 1.0.1' Created commit a345ecc: Import upstream release 1.0.1 47 files changed, 3506 insertions(+), 563 deletions(-) rewrite INSTALL (64%) delete mode 100644 doc/latex/pages.tex create mode 100644 doc/man/man3/eet_data_dump.3 create mode 100644 doc/man/man3/eet_data_undump.3 create mode 100644 src/tests/Makefile.am create mode 100644 src/tests/Makefile.in create mode 100644 src/tests/TODO create mode 100644 src/tests/eet_data_suite.c create mode 100644 src/tests/eet_suite.c # merge the new tag on 'upstream-vcs' onto it $ git merge -s ours upstream-vcs/1.0.1 Merge made by ours. # tag the current revision of the 'upstream' branch $ git tag upstream/1.0.1 # use pristine-tar to store the tarball $ pristine-tar commit ../tarballs/eet_1.0.1.orig.tar.gz upstream/1.0.1 pristine-tar: committed eet_1.0.1.orig.tar.gz.delta to branch pristine-tar # finally switch to master and merge the new upstream version $ git checkout master Switched to branch "master" $ git merge upstream/1.0.1 Removed doc/latex/pages.tex Merge made by recursive. ChangeLog | 45 ++ INSTALL | 42 +- Makefile.am | 46 ++ Makefile.in | 79 +++- NEWS | 2 + README | 9 +- README.in | 5 +- aclocal.m4 | 215 ++++++--- configure | 797 +++++++++++++++++++++++++++---- configure.in | 75 +++- doc/html/Eet_8h.html | 143 ++++++- doc/html/eet_8c.html | 14 +- doc/html/files.html | 12 +- doc/html/globals.html | 34 +- doc/html/globals_defs.html | 20 +- doc/html/globals_func.html | 33 +- doc/html/index.html | 10 +- doc/html/pages.html | 8 +- doc/html/tabs.css | 2 +- doc/html/todo.html | 8 +- doc/latex/Eet_8h.tex | 234 ++++++---- doc/latex/doxygen.sty | 4 +- doc/latex/eet_8c.tex | 6 +- doc/latex/files.tex | 6 +- doc/latex/index.tex | 2 +- doc/latex/pages.tex | 5 - doc/latex/refman.tex | 16 +- doc/latex/todo.tex | 1 - doc/man/man3/Eet.h.3 | 78 +++- doc/man/man3/eet.c.3 | 8 +- doc/man/man3/eet_data_dump.3 | 1 + doc/man/man3/eet_data_undump.3 | 1 + doc/man/man3/todo.3 | 4 +- eet.spec | 2 +- ltmain.sh | 58 ++- src/Makefile.am | 2 +- src/Makefile.in | 13 +- src/bin/Makefile.in | 11 + src/lib/Makefile.am | 8 +- src/lib/Makefile.in | 23 +- src/lib/eet_data.c | 236 +++++----- src/lib/eet_lib.c | 30 +- src/tests/Makefile.am | 17 + src/tests/Makefile.in | 448 +++++++++++++++++ src/tests/TODO | 3 + src/tests/eet_data_suite.c | 163 +++++++ src/tests/eet_suite.c | 1044 ++++++++++++++++++++++++++++++++++++++++ 47 files changed, 3483 insertions(+), 540 deletions(-) delete mode 100644 doc/latex/pages.tex create mode 100644 doc/man/man3/eet_data_dump.3 create mode 100644 doc/man/man3/eet_data_undump.3 create mode 100644 src/tests/Makefile.am create mode 100644 src/tests/Makefile.in create mode 100644 src/tests/TODO create mode 100644 src/tests/eet_data_suite.c create mode 100644 src/tests/eet_suite.c # update the Debian changelog and commit $ dch -v 1.0.1-1 'New upstream release' $ git commit -a -m 'New upstream release' Created commit 92837e1: New upstream release 1 files changed, 6 insertions(+), 0 deletions(-) # verify that we picked the correct 'upstream-vcs' revision # there should only be differences in debian/ and because of autotools # this output looks ok, no source changes $ git diff upstream-vcs/1.0.1 upstream/1.0.1 --stat .cvsignore | 39 - Makefile.in | 746 + README | 45 + aclocal.m4 | 7723 ++++++++++ compile | 142 + config.guess | 1516 ++ config.h.in | 111 + config.sub | 1622 +++ configure |18411 ++++++++++++++++++++++++ debian/.cvsignore | 8 - debian/changelog.in | 5 - debian/compat | 1 - debian/control | 77 - debian/copyright | 41 - debian/dirs | 2 - debian/eet.1 | 50 - debian/libeet-bin.install | 1 - debian/libeet-dev.install | 4 - debian/libeet-doc.dirs | 1 - debian/libeet-doc.doc-base | 10 - debian/libeet0-dev.install | 5 - debian/libeet0.install | 1 - debian/libeet1.install | 1 - debian/rules | 22 - depcomp | 530 + doc/CVS/Entries | 8 + doc/CVS/Repository | 1 + doc/CVS/Root | 1 + doc/html/Eet_8h.html | 2303 +++ doc/html/_.gif | Bin 0 -> 266 bytes doc/html/b.png | Bin 0 -> 40325 bytes doc/html/doxygen.png | Bin 0 -> 1281 bytes doc/html/e.css | 161 + doc/html/eet.png | Bin 0 -> 74944 bytes doc/html/eet_8c.html | 61 + doc/html/eet_big.png | Bin 0 -> 937116 bytes doc/html/eet_mini.png | Bin 0 -> 753 bytes doc/html/eet_small.png | Bin 0 -> 3755 bytes doc/html/files.html | 57 + doc/html/globals.html | 181 + doc/html/globals_defs.html | 112 + doc/html/globals_func.html | 133 + doc/html/hilite.png | Bin 0 -> 6127 bytes doc/html/index.html | 137 + doc/html/n.gif | Bin 0 -> 1700 bytes doc/html/n.png | Bin 0 -> 2059 bytes doc/html/pages.html | 57 + doc/html/t.gif | Bin 0 -> 979 bytes doc/html/t.png | Bin 0 -> 317 bytes doc/html/tab_b.gif | Bin 0 -> 35 bytes doc/html/tab_l.gif | Bin 0 -> 706 bytes doc/html/tab_r.gif | Bin 0 -> 2585 bytes doc/html/tabs.css | 102 + doc/html/tl.gif | Bin 0 -> 74210 bytes doc/html/tl.png | Bin 0 -> 88380 bytes doc/html/todo.html | 63 + doc/img/CVS/Entries | 14 + doc/img/CVS/Repository | 1 + doc/img/CVS/Root | 1 + doc/latex/Eet_8h.tex | 1180 ++ doc/latex/FreeSans.ttf | Bin 0 -> 22932 bytes doc/latex/Makefile | 39 + doc/latex/doxygen.sty | 78 + doc/latex/eet_8c.tex | 12 + doc/latex/files.tex | 5 + doc/latex/index.tex | 100 + doc/latex/refman.tex | 58 + doc/latex/todo.tex | 12 + doc/man/man3/EET_DATA_DESCRIPTOR_ADD_BASIC.3 | 1 + doc/man/man3/EET_DATA_DESCRIPTOR_ADD_HASH.3 | 1 + doc/man/man3/EET_DATA_DESCRIPTOR_ADD_LIST.3 | 1 + doc/man/man3/EET_DATA_DESCRIPTOR_ADD_SUB.3 | 1 + doc/man/man3/EET_G_ARRAY.3 | 1 + doc/man/man3/EET_G_HASH.3 | 1 + doc/man/man3/EET_G_LAST.3 | 1 + doc/man/man3/EET_G_LIST.3 | 1 + doc/man/man3/EET_G_UNKNOWN.3 | 1 + doc/man/man3/EET_G_VAR_ARRAY.3 | 1 + doc/man/man3/EET_T_CHAR.3 | 1 + doc/man/man3/EET_T_DOUBLE.3 | 1 + doc/man/man3/EET_T_FLOAT.3 | 1 + doc/man/man3/EET_T_INLINED_STRING.3 | 1 + doc/man/man3/EET_T_INT.3 | 1 + doc/man/man3/EET_T_LAST.3 | 1 + doc/man/man3/EET_T_LONG_LONG.3 | 1 + doc/man/man3/EET_T_SHORT.3 | 1 + doc/man/man3/EET_T_STRING.3 | 1 + doc/man/man3/EET_T_UCHAR.3 | 1 + doc/man/man3/EET_T_UINT.3 | 1 + doc/man/man3/EET_T_ULONG_LONG.3 | 1 + doc/man/man3/EET_T_UNKNOW.3 | 1 + doc/man/man3/EET_T_USHORT.3 | 1 + doc/man/man3/Eet.h.3 | 1481 ++ doc/man/man3/eet.c.3 | 16 + doc/man/man3/eet_clearcache.3 | 1 + doc/man/man3/eet_close.3 | 1 + doc/man/man3/eet_data_descriptor_decode.3 | 1 + doc/man/man3/eet_data_descriptor_element_add.3 | 1 + doc/man/man3/eet_data_descriptor_encode.3 | 1 + doc/man/man3/eet_data_descriptor_free.3 | 1 + doc/man/man3/eet_data_descriptor_new.3 | 1 + doc/man/man3/eet_data_dump.3 | 1 + doc/man/man3/eet_data_image_decode.3 | 1 + doc/man/man3/eet_data_image_encode.3 | 1 + doc/man/man3/eet_data_image_header_decode.3 | 1 + doc/man/man3/eet_data_image_header_read.3 | 1 + doc/man/man3/eet_data_image_read.3 | 1 + doc/man/man3/eet_data_image_write.3 | 1 + doc/man/man3/eet_data_read.3 | 1 + doc/man/man3/eet_data_text_dump.3 | 1 + doc/man/man3/eet_data_text_undump.3 | 1 + doc/man/man3/eet_data_undump.3 | 1 + doc/man/man3/eet_data_write.3 | 1 + doc/man/man3/eet_delete.3 | 1 + doc/man/man3/eet_dictionary_get.3 | 1 + doc/man/man3/eet_dictionary_string_check.3 | 1 + doc/man/man3/eet_init.3 | 1 + doc/man/man3/eet_list.3 | 1 + doc/man/man3/eet_mode_get.3 | 1 + doc/man/man3/eet_num_entries.3 | 1 + doc/man/man3/eet_open.3 | 1 + doc/man/man3/eet_read.3 | 1 + doc/man/man3/eet_read_direct.3 | 1 + doc/man/man3/eet_shutdown.3 | 1 + doc/man/man3/eet_write.3 | 1 + doc/man/man3/todo.3 | 16 + eet.spec | 74 + install-sh | 323 + ltmain.sh | 6964 +++++++++ m4/doxygen.m4 | 73 - missing | 360 + src/.cvsignore | 5 - src/Makefile.in | 488 + src/bin/.cvsignore | 5 - src/bin/Makefile.in | 489 + src/lib/.cvsignore | 9 - src/lib/Makefile.in | 566 + src/tests/Makefile.in | 448 + src/tests/eet_suite.h | 21 - 139 files changed, 47003 insertions(+), 381 deletions(-)