From a60939af9e82fefd46398ffde0f7a11f3710d28d Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 12 Sep 2012 11:49:33 +0200 Subject: [PATCH] Remove dependency to DejaVu fonts as are already included in jasperreport-fonts Changes in commit 004dec3a429440374667defbe47f0be0ec6faa08 where not needed because of the new maven dependency with jasperreport-fonts already includes the DejaVu fonts. So we don't need to have any font installed in the system to generate properly the reports. That means that we will have one less dependency in the future versions. FEA: ItEr77S08ReportsFonts --- HACKING | 8 ++------ INSTALL | 4 ++-- README | 4 ---- debian/control | 3 +-- debian/control.lucid | 3 +-- debian/control.squeeze | 3 +-- libreplan.spec | 5 ----- 7 files changed, 7 insertions(+), 23 deletions(-) diff --git a/HACKING b/HACKING index 42bed1dd2..ccb66b6ce 100644 --- a/HACKING +++ b/HACKING @@ -39,10 +39,6 @@ Compilation requirements Used for i18n support in the project -* *DejaVu Fonts* - Vera font family - - Font family used in reports - * *CutyCapt* - Utility to capture WebKit's rendering of a web page Required for printing @@ -56,7 +52,7 @@ Debian/Ubuntu * Install requirements:: - # apt-get install git-core maven2 openjdk-6-jdk postgresql postgresql-client python-docutils make gettext ttf-dejavu cutycapt + # apt-get install git-core maven2 openjdk-6-jdk postgresql postgresql-client python-docutils make gettext cutycapt * Connect to database:: @@ -141,7 +137,7 @@ openSUSE * Install requirements:: - # zypper install git-core java-1_6_0-openjdk-devel postgresql-server postgresql docutils make gettext-tools dejavu + # zypper install git-core java-1_6_0-openjdk-devel postgresql-server postgresql docutils make gettext-tools * Install Maven:: diff --git a/INSTALL b/INSTALL index 42b160d62..b6e6d163d 100644 --- a/INSTALL +++ b/INSTALL @@ -119,7 +119,7 @@ Debian/Ubuntu * Install requirements:: - # apt-get install openjdk-6-jre postgresql postgresql-client tomcat6 libpg-java ttf-dejavu cutycapt xvfb + # apt-get install openjdk-6-jre postgresql postgresql-client tomcat6 libpg-java cutycapt xvfb * Connect to database:: @@ -213,7 +213,7 @@ openSUSE * Install requirements:: - # zypper install java-1_6_0-openjdk postgresql-server postgresql tomcat6 dejavu xorg-x11-server + # zypper install java-1_6_0-openjdk postgresql-server postgresql tomcat6 xorg-x11-server * JDBC Driver manual installation:: diff --git a/README b/README index fc0ed5c10..695679de0 100644 --- a/README +++ b/README @@ -105,10 +105,6 @@ Requirements To connect application with *PostgreSQL* database in *Tomcat* -* *DejaVu Fonts* - Vera font family - - Font family used in reports - * *CutyCapt* - Utility to capture WebKit's rendering of a web page Required for printing diff --git a/debian/control b/debian/control index 8bc301106..2e82f7f81 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ Homepage: http://www.libreplan.com/ Package: libreplan Architecture: any Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, - tomcat6, default-jre-headless | default-jre, libpg-java, ttf-dejavu, - ${misc:Depends} + tomcat6, default-jre-headless | default-jre, libpg-java, ${misc:Depends} Description: Web application for project planning, monitoring and control. LibrePlan is a collaborative tool to plan, monitor and control projects and has a rich web interface which provides a desktop alike user experience. All the diff --git a/debian/control.lucid b/debian/control.lucid index 12ffac458..08ad4c1c4 100644 --- a/debian/control.lucid +++ b/debian/control.lucid @@ -10,8 +10,7 @@ Homepage: http://www.libreplan.com/ Package: libreplan Architecture: any Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, - tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ttf-dejavu, - ${misc:Depends} + tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ${misc:Depends} Description: Web application for project planning, monitoring and control. LibrePlan is a collaborative tool to plan, monitor and control projects and has a rich web interface which provides a desktop alike user experience. All the diff --git a/debian/control.squeeze b/debian/control.squeeze index 12ffac458..08ad4c1c4 100644 --- a/debian/control.squeeze +++ b/debian/control.squeeze @@ -10,8 +10,7 @@ Homepage: http://www.libreplan.com/ Package: libreplan Architecture: any Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, - tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ttf-dejavu, - ${misc:Depends} + tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ${misc:Depends} Description: Web application for project planning, monitoring and control. LibrePlan is a collaborative tool to plan, monitor and control projects and has a rich web interface which provides a desktop alike user experience. All the diff --git a/libreplan.spec b/libreplan.spec index 8dbd6965c..d24cb124c 100644 --- a/libreplan.spec +++ b/libreplan.spec @@ -31,11 +31,6 @@ Requires: tomcat6 %else Requires: cutycapt %endif -%if 0%{?suse_version} -Requires: dejavu -%else -Requires: dejavu-fonts-common -%endif %if 0%{?suse_version} %define distro openSUSE