# HG changeset patch # User Pierre-Yves David # Date 1290533694 -3600 # Node ID a89dc08e5970e60136a233ab990b701c93e4eca1 # Parent 90f2f20367bccb77b93b1b42dd59366170c8b76a# Parent 7419313363d4b40bae69432a6e223469d6225585 Merge back fix to 3.9.9 packaging diff -r 90f2f20367bc -r a89dc08e5970 .hgtags --- a/.hgtags Wed Nov 03 16:38:28 2010 +0100 +++ b/.hgtags Tue Nov 23 18:34:54 2010 +0100 @@ -157,3 +157,5 @@ e4dba8ae963701a36be94ae58c790bc97ba029bb cubicweb-debian-version-3.9.8-1 df0b2de62cec10c84a2fff5233db05852cbffe93 cubicweb-version-3.9.9 1ba51b00fc44faa0d6d57448000aaa1fd5c6ab57 cubicweb-debian-version-3.9.9-1 +b7db1f59355832a409d2032e19c84cfffdb3b265 cubicweb-debian-version-3.9.9-2 +09c98763ae9d43616d047c1b25d82b4e41a4362f cubicweb-debian-version-3.9.9-3 diff -r 90f2f20367bc -r a89dc08e5970 debian/changelog --- a/debian/changelog Wed Nov 03 16:38:28 2010 +0100 +++ b/debian/changelog Tue Nov 23 18:34:54 2010 +0100 @@ -1,3 +1,15 @@ +cubicweb (3.9.9-3) unstable; urgency=low + + * cubicweb-common must actually include shared/i18n folder + + -- Pierre-Yves David Tue, 23 Nov 2010 16:18:46 +0200 + +cubicweb (3.9.9-2) unstable; urgency=low + + * fix cubicweb-common content + + -- Pierre-Yves David Tue, 23 Nov 2010 14:00:46 +0200 + cubicweb (3.9.9-1) unstable; urgency=low * new upstream release diff -r 90f2f20367bc -r a89dc08e5970 debian/rules --- a/debian/rules Wed Nov 03 16:38:28 2010 +0100 +++ b/debian/rules Tue Nov 23 18:34:54 2010 +0100 @@ -41,7 +41,9 @@ dh_install -vi # cwctl in the cubicweb-ctl package rm -f debian/cubicweb-common/usr/share/pyshared/cubicweb/cwctl.py - + # wdoc in the cubicweb-web package + rm -rf debian/cubicweb-common/usr/share/cubicweb/cubes/shared/wdoc + rm -rf debian/cubicweb-common/usr/share/cubicweb/cubes/shared/data dh_lintian # Remove unittests directory (should be available in cubicweb-dev only) diff -r 90f2f20367bc -r a89dc08e5970 debian/source/format --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/source/format Tue Nov 23 18:34:54 2010 +0100 @@ -0,0 +1,1 @@ +1.0