lp://staging/~anhydride-acide/bellepoule/2.6

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/bellepoule/2.0 at revision 326

betonniere: Approve on 2012-03-05

Diff: 14816 lines (+6005/-7131)

29 files modified

.bzrignore (+0/-4)
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/applied-patches (+1/-0)
.pc/debian-changes-2.6-0ubuntu1/Makefile (+54/-0)
BellePoule.cbp (+0/-181)
BellePoule.layout (+10/-0)
Exemples/engarde.cotcot (+169/-184)
Exemples/melun.cotcot (+5620/-5620)
Makefile (+14/-2)
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+15/-0)
debian/copyright (+42/-0)
debian/patches/debian-changes-2.6-0ubuntu1 (+38/-0)
debian/patches/series (+1/-0)
debian/rules (+13/-0)
debian/source/format (+1/-0)
linux/BellePoule.desktop (+0/-15)
setup/BellePoule.iss (+0/-248)
setup/COPYING.txt (+0/-674)
setup/path_dependent_files/BellePoule.bat (+0/-4)
setup/path_dependent_files/gdk-pixbuf.loaders (+0/-124)
setup/path_dependent_files/gtk.immodules (+0/-39)
setup/path_dependent_files/pango.modules (+0/-35)
sources/table_set.cpp (+1/-1)
sources/upload.cpp (+2/-0)
usr/share/applications/BellePoule.desktop (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

327. By Rowin <rowin@Zaphod> on 2012-03-04

- Remise en place du dossier setup/
- Remise en place de BellePoule.cbp

326. By Rowin <rowin@Zaphod> on 2012-03-04

- Finalisation du dossier usr/
- Modification de la règle install du Makefile, pour permettre la mise en paquet
- Rajout du dossier debian/, indispensable pour la génration du paquet

325. By Rowin <rowin@Zaphod> on 2012-03-04

Finalisation du projet pour la mise en paquet .deb

324. By betonniere <> on 2012-03-01

Table tree is expanded when new looser tables are available.

323. By betonniere <> <> on 2012-02-27

Table without attendee are filtered out.

322. By betonniere <> on 2012-02-24

Incomplete looser tables may be fenced now.

321. By betonniere on 2012-02-16

Take into account the new installation tree file in table_set.cpp.

320. By betonniere <> on 2012-02-14

New windows installation tree to avoid dll conflicts.

319. By betonniere <> <> on 2012-01-31

Some dll are now installed in the root of the installation directory to avoid conflict with similar dll installed by other software in the system directories.

318. By betonniere <> <> on 2012-01-17

New manual.