[med-svn] r7828 - trunk/packages/mobyle/mobyle/trunk/debian

[olivier sallou]

Author: osallou-guest
Date: 2011-09-16 15:58:13 +0000 (Fri, 16 Sep 2011)
New Revision: 7828

Added:
   trunk/packages/mobyle/mobyle/trunk/debian/README.source
Modified:
   trunk/packages/mobyle/mobyle/trunk/debian/control
   trunk/packages/mobyle/mobyle/trunk/debian/copyright
   trunk/packages/mobyle/mobyle/trunk/debian/get-orig-source
   trunk/packages/mobyle/mobyle/trunk/debian/rules
Log:
remove fonts

Added: trunk/packages/mobyle/mobyle/trunk/debian/README.source
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/mobyle/mobyle/trunk/debian/README.source	2011-09-16 15:58:13 UTC (rev 7828)
@@ -0,0 +1,4 @@
+Mobyle needs to be downloaded with get-orig-source.
+Some copyright files need to be removed from upstream source (no impact on software).
+Other files are removed at the same time because those are available in debian packages (javascript,fonts...)
+

Modified: trunk/packages/mobyle/mobyle/trunk/debian/control
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/control	2011-09-16 15:40:23 UTC (rev 7827)
+++ trunk/packages/mobyle/mobyle/trunk/debian/control	2011-09-16 15:58:13 UTC (rev 7828)
@@ -13,7 +13,7 @@
 Package: mobyle
 Architecture: all
 Depends: ${misc:Depends}, python (>= 2.5), apache2, python-simpletal (>=4.1), python-simplejson (>= 1.7.1), python-imaging (>= 1.1.5),
- python-lxml (>= 2.2.4), squizz, libjs-scriptaculous, libjs-jquery, libjs-prototype, mobyle-utils, jing
+ python-lxml (>= 2.2.4), squizz, libjs-scriptaculous, libjs-jquery, libjs-prototype, mobyle-utils, jing, ttf-bitstream-vera
 Suggests: python-openid (>= 2.2.4), python-dnspython (>= 1.5.0)
 Recommends: mobyle-programs (>= 1.0), mobyle-viewers, mobyle-workflows
 Description: Web portal  that provides web forms for command-line software.

Modified: trunk/packages/mobyle/mobyle/trunk/debian/copyright
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/copyright	2011-09-16 15:40:23 UTC (rev 7827)
+++ trunk/packages/mobyle/mobyle/trunk/debian/copyright	2011-09-16 15:58:13 UTC (rev 7828)
@@ -144,45 +144,6 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: Src/Mobyle/Captcha/data/fonts/vera/*
-Copyright: 2003 Bitstream, Inc
-License:
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute
- the Font Software, including without limitation the rights to use,
- copy, merge, publish, distribute, and/or sell copies of the Font
- Software, and to permit persons to whom the Font Software is furnished
- to do so, subject to the following conditions:
-  .
- The above copyright and trademark notices and this permission notice
- shall be included in all copies of one or more of the Font Software
- typefaces.
- .
- The Font Software may be modified, altered, or added to, and in
- particular the designs of glyphs or characters in the Fonts may be
- modified and additional glyphs or characters may be added to the
- Fonts, only if the fonts are renamed to names not containing either
- the words "Bitstream" or the word "Vera".
- .
- This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
- .
- The Font Software may be sold as part of a larger software package but
- no copy of one or more of the Font Software typefaces may be sold by
- itself.
- .
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
- BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
- OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
- SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
 Files: debian/*
 Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
 License: GPL-2+

Modified: trunk/packages/mobyle/mobyle/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/get-orig-source	2011-09-16 15:40:23 UTC (rev 7827)
+++ trunk/packages/mobyle/mobyle/trunk/debian/get-orig-source	2011-09-16 15:58:13 UTC (rev 7828)
@@ -27,6 +27,7 @@
 rm Src/Portal/htdocs/MobylePortal/js/builder.js
 rm Src/Portal/htdocs/MobylePortal/js/effects.js
 rm Src/Portal/htdocs/MobylePortal/js/prototype-1.7.js
+rm -rf Src/Mobyle/Captcha/data/fonts/vera
 cd ..
 
 BZIP2="--best" tar -cjf ${PKG}_${VERSION}~dfsg.orig.tar.bz2 ${PKG}-${VERSION}~dfsg.orig

Modified: trunk/packages/mobyle/mobyle/trunk/debian/rules
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/rules	2011-09-16 15:40:23 UTC (rev 7827)
+++ trunk/packages/mobyle/mobyle/trunk/debian/rules	2011-09-16 15:58:13 UTC (rev 7828)
@@ -24,6 +24,8 @@
 	find debian/mobyle  -name *.html | xargs chmod 644
 	find debian/mobyle  -name *.xml | xargs chmod 644
 	mv debian/mobyle/usr/share/mobyle/core/Tools/setsid debian/mobyle-utils/usr/bin/mobyle-setsid
+	mkdir -p debian/mobyle/usr/share/mobyle/core/Src/Mobyle/Captcha/data/fonts
+	ln -s /usr/share/fonts/truetype/ttf-bitstream-vera debian/mobyle/usr/share/mobyle/core/Src/Mobyle/Captcha/data/fonts/vera