Package: release.debian.org
Severity: normal
Tags: wheezy
The astronomical symbols font included with maitreya had copyright
problems and therefore was not DFSG-compliant and had to be replaced.
Also, the name of the font package had to be changed to follow fonts
policy.
This package version fixes these problems. So I would like to propose
it as an update to stable. (The version in testing/unstable is already fixed.)
--
Jaldhar H. Vyas <jald...@debian.org>
diff --git a/COPYING b/COPYING
index fcc2375..6f0bd44 100644
--- a/COPYING
+++ b/COPYING
@@ -4,6 +4,13 @@ The software is Open Source and free for private and commercial use.
Parts of this program contain code from Swiss Ephemeris project http://www.astro.com/swisseph/. which is licensed under the GNU GPL v. 2.0 or later. Swiss Ephemeris is authored by Dieter Koch and Alois Treindl and is copyright (C) 1997 - 2008 Astrodienst AG, Switzerland.
+Symbol Font
+-----------
+
+Astrological symbols based on the Starfisher font and generated by Kenneth Hirst for Maitreya software.
+The font is licensed under the SIL Open Font License.
+
+
Parts of this program contain code from the wxpdfdoc project. http://wxcode.sourceforge.net/components/wxpdfdoc/ and are (C) Ulrich Telle <ulrich.telle@NOSPAM!@gmx.de>. wxpdfdoc is licensed under the wxWindows license, available at http://www.wxwidgets.org/about/licence3.txt. This license is also the license of the GUI toolkit wxWidgets used in the program.
Details of the GNU v2 license are
diff --git a/Makefile.win b/Makefile.win
index abd090a..444163c 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -42,7 +42,7 @@ release: all
$(CP) $(XML_DIR)/yogas/*.dtd $(RELEASE_DIR)/xml/yogas
$(RMR) $(RELEASE_DIR)/fonts
$(MKDIR) $(RELEASE_DIR)/fonts
- $(CPR) $(SRC_DIR)/fonts/MaitreyaSymbols6.ttf $(RELEASE_DIR)/fonts
+ $(CPR) $(SRC_DIR)/fonts/MaitreyaSymbols.TTF $(RELEASE_DIR)/fonts
$(CP) $(SRC_DIR)/icons/maitreya.ico $(RELEASE_DIR)
$(CP) po/maitreya6.pot $(RELEASE_DIR)
for LANG in de es fr hu it pl ro ru te; \
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 1ef58aa..337365e 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
# see git-dpm(1) from git-dpm package
-bbfd7ddafd07171244cd8f07ab3164c95bba31c9
-bbfd7ddafd07171244cd8f07ab3164c95bba31c9
-1e198539d1a51eade952f74f26832c7b9145e3be
-1e198539d1a51eade952f74f26832c7b9145e3be
-maitreya_6.0.5.orig.tar.bz2
-9b8d09632db3c3d00341025bd5019f7aaa7c3a74
-2027269
+dbd43e9ea8f33e1351d26bd812cfa4737c1dd0fd
+dbd43e9ea8f33e1351d26bd812cfa4737c1dd0fd
+c2fe232a2acac7fc987d3929d69cd2c21679643f
+c2fe232a2acac7fc987d3929d69cd2c21679643f
+maitreya_6.0.5+dfsg.orig.tar.bz2
+6515e4677c84f606db7ebc09301e0b4da97ab73d
+2100127
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..4684974
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,22 @@
+How I create this tarball.
+
+I unpacked maitreya-6.0.5.tar.bz2 and maitreya-6.0.6.tar.bz2
+
+renamed the directory maitreya-6.0.5 to maitreya-6.0.5+dfsg
+
+deleted src/fonts/MaitreyaSymbols6.ttf
+
+copied src/fonts/MaitreyaSymbols.TTF
+
+
+did a kdiff3 merge of 2 directories
+always chose 6.0.5 branch except when the font name
+was in question, when I chose the 6.0.6 branch.
+
+This had the effect of changing MaitreyaSymbols6.ttf
+to MaitreyaSymbols.TTF
+
+rebuilt tarball from maitreya-6.0.5+dfs
+
+
+Obviouusly an get-orig-source target is impossible.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index e28aba0..90cc758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maitreya (6.0.5+dfsg-1) stable; urgency=medium
+
+ * New upstream 6.0.5+dfsg fixes font copyright problem
+ * recomends fonts-maitreya rather than font-maitreya
+
+ -- Paul Elliott <pelli...@blackpatchpanel.com> Thu, 08 May 2014 02:10:59 -0500
+
maitreya (6.0.5-2) unstable; urgency=low
* upgrade to Standards-Version: 2.9.3
diff --git a/debian/control b/debian/control
index 1b6ec03..713ad1a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.9.3
Package: maitreya
Architecture: any
-Recommends: swe-standard-data, swe-basic-data, font-maitreya
+Recommends: swe-standard-data, swe-basic-data, fonts-maitreya
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Software for Vedic and western astrology
Free software for western and Vedic astrology (Jyotish). Supports
diff --git a/debian/copyright b/debian/copyright
index 5258515..c41c0f3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,3 +87,10 @@ I, Paul Elliott, have corrected the address of the FSF:
If you do not wish that, you must delete the exception notice from such
code and/or adjust the licensing conditions notice accordingly.
+Symbol Font
+-----------
+
+Astrological symbols based on the Starfisher font and generated
+by Kenneth Hirst for Maitreya software.
+The font is licensed under the SIL Open Font License.
+
diff --git a/debian/patches/0001-replace-builtin-static-swe-with-external-shared-swe.patch b/debian/patches/0001-replace-builtin-static-swe-with-external-shared-swe.patch
index fd90ee6..501c194 100644
--- a/debian/patches/0001-replace-builtin-static-swe-with-external-shared-swe.patch
+++ b/debian/patches/0001-replace-builtin-static-swe-with-external-shared-swe.patch
@@ -1,4 +1,4 @@
-From 2a94aac83ab7c9e216650a2e7f19467a804ba8ec Mon Sep 17 00:00:00 2001
+From cc3652e6c6b2615073dfbff7627730989d5c4d38 Mon Sep 17 00:00:00 2001
From: Paul Elliott <pelli...@blackpatchpanel.com>
Date: Sat, 18 Feb 2012 12:00:03 -0600
Subject: replace builtin static swe with external shared swe
@@ -20,12 +20,12 @@ Subject: replace builtin static swe with external shared swe
possible."
Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3483971&group_id=96371&atid=614571
---
- configure.in | 1 -
- src/Makefile.am | 2 +-
- src/base/Makefile.am | 2 +-
- src/base/Makefile.in | 2 +-
- src/gui/Makefile.am | 4 ++--
- src/jyotish/Makefile.am | 4 ++--
+ configure.in | 1 -
+ src/Makefile.am | 2 +-
+ src/base/Makefile.am | 2 +-
+ src/base/Makefile.in | 2 +-
+ src/gui/Makefile.am | 4 ++--
+ src/jyotish/Makefile.am | 4 ++--
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
diff --git a/debian/patches/0002-remove-builtin-swe-files.patch b/debian/patches/0002-remove-builtin-swe-files.patch
index adfae40..22c6606 100644
--- a/debian/patches/0002-remove-builtin-swe-files.patch
+++ b/debian/patches/0002-remove-builtin-swe-files.patch
@@ -1,4 +1,4 @@
-From a93431cc645849fb17dd9384e149f3e1c68877cd Mon Sep 17 00:00:00 2001
+From e3369c0fd2575e947375b04290d8bd3f115031b8 Mon Sep 17 00:00:00 2001
From: Paul Elliott <pelli...@blackpatchpanel.com>
Date: Sat, 18 Feb 2012 12:00:04 -0600
Subject: remove builtin swe files
@@ -8,35 +8,35 @@ Subject: remove builtin swe files
Forwarded: yes
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635672
---
- src/swe/Makefile.am | 15 -
- src/swe/Makefile.in | 496 ---
- src/swe/Makefile.win | 62 -
- src/swe/swe.vcproj | 238 --
- src/swe/swecl.c | 4448 ---------------------
- src/swe/swedate.c | 541 ---
- src/swe/swedate.h | 82 -
- src/swe/swedll.h | 509 ---
- src/swe/swehel.c | 3152 ---------------
- src/swe/swehouse.c | 1652 --------
- src/swe/swehouse.h | 85 -
- src/swe/swejpl.c | 937 -----
- src/swe/swejpl.h | 105 -
- src/swe/swemini.c | 131 -
- src/swe/swemmoon.c | 1809 ---------
- src/swe/swemplan.c | 959 -----
- src/swe/swemptab.c |10642 -------------------------------------------------
- src/swe/swenut2000a.h | 2820 -------------
- src/swe/sweodef.h | 335 --
- src/swe/swepcalc.c | 696 ----
- src/swe/swepcalc.h | 457 ---
- src/swe/swepdate.c | 242 --
- src/swe/sweph.c | 6220 -----------------------------
- src/swe/sweph.h | 551 ---
- src/swe/swephexp.h | 724 ----
- src/swe/swephlib.c | 2463 ------------
- src/swe/swephlib.h | 172 -
- src/swe/swetest.c | 2601 ------------
- 28 files changed, 0 insertions(+), 43144 deletions(-)
+ src/swe/Makefile.am | 15 -
+ src/swe/Makefile.in | 496 ---
+ src/swe/Makefile.win | 62 -
+ src/swe/swe.vcproj | 238 --
+ src/swe/swecl.c | 4448 --------------------
+ src/swe/swedate.c | 541 ---
+ src/swe/swedate.h | 82 -
+ src/swe/swedll.h | 509 ---
+ src/swe/swehel.c | 3152 --------------
+ src/swe/swehouse.c | 1652 --------
+ src/swe/swehouse.h | 85 -
+ src/swe/swejpl.c | 937 -----
+ src/swe/swejpl.h | 105 -
+ src/swe/swemini.c | 131 -
+ src/swe/swemmoon.c | 1809 --------
+ src/swe/swemplan.c | 959 -----
+ src/swe/swemptab.c | 10642 ------------------------------------------------
+ src/swe/swenut2000a.h | 2820 -------------
+ src/swe/sweodef.h | 335 --
+ src/swe/swepcalc.c | 696 ----
+ src/swe/swepcalc.h | 457 ---
+ src/swe/swepdate.c | 242 --
+ src/swe/sweph.c | 6220 ----------------------------
+ src/swe/sweph.h | 551 ---
+ src/swe/swephexp.h | 724 ----
+ src/swe/swephlib.c | 2463 -----------
+ src/swe/swephlib.h | 172 -
+ src/swe/swetest.c | 2601 ------------
+ 28 files changed, 43144 deletions(-)
delete mode 100644 src/swe/Makefile.am
delete mode 100644 src/swe/Makefile.in
delete mode 100644 src/swe/Makefile.win
diff --git a/debian/patches/0003-Remove-public-interface-to-pcalc-swepcalc.h.patch b/debian/patches/0003-Remove-public-interface-to-pcalc-swepcalc.h.patch
index 57915f3..eb63c9e 100644
--- a/debian/patches/0003-Remove-public-interface-to-pcalc-swepcalc.h.patch
+++ b/debian/patches/0003-Remove-public-interface-to-pcalc-swepcalc.h.patch
@@ -1,4 +1,4 @@
-From e7b04aeca645153cf6df370310a864f3d23f69e7 Mon Sep 17 00:00:00 2001
+From 6e44b0c13565892db08c964862361fe11d41563b Mon Sep 17 00:00:00 2001
From: Paul Elliott <pelli...@blackpatchpanel.com>
Date: Sat, 18 Feb 2012 12:00:05 -0600
Subject: Remove public interface to pcalc ("swepcalc.h")
@@ -16,8 +16,8 @@ Subject: Remove public interface to pcalc ("swepcalc.h")
making it go away.
Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3483978&group_id=96371&atid=614571
---
- src/base/Calculator.cpp | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ src/base/Calculator.cpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
diff --git a/src/base/Calculator.cpp b/src/base/Calculator.cpp
index b5afaab..98f79ec 100644
diff --git a/debian/patches/0004-In-the-Maitreya6.desktop-file-remove.patch b/debian/patches/0004-In-the-Maitreya6.desktop-file-remove.patch
index 94c66a5..678dcec 100644
--- a/debian/patches/0004-In-the-Maitreya6.desktop-file-remove.patch
+++ b/debian/patches/0004-In-the-Maitreya6.desktop-file-remove.patch
@@ -1,4 +1,4 @@
-From bbfd7ddafd07171244cd8f07ab3164c95bba31c9 Mon Sep 17 00:00:00 2001
+From dbd43e9ea8f33e1351d26bd812cfa4737c1dd0fd Mon Sep 17 00:00:00 2001
From: Paul Elliott <pelli...@blackpatchpanel.com>
Date: Sat, 18 Feb 2012 12:00:06 -0600
Subject: In the Maitreya6.desktop file remove
@@ -7,8 +7,8 @@ Subject: In the Maitreya6.desktop file remove
desktop-entry-contains-encoding-key
Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3483980&group_id=96371&atid=614571
---
- maitreya6.desktop | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ maitreya6.desktop | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/maitreya6.desktop b/maitreya6.desktop
index c26a835..c684ac0 100644
diff --git a/maitreya.spec b/maitreya.spec
index 113f061..1971063 100644
--- a/maitreya.spec
+++ b/maitreya.spec
@@ -113,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{font_dir}
%endif
%dir %{font_dir}/%{name}
-%{font_dir}/%{name}/MaitreyaSymbols6.ttf
+%{font_dir}/%{name}/MaitreyaSymbols.TTF
%{_datadir}/%{dir_name}
%{_datadir}/pixmaps/maitreya.xpm
diff --git a/src/base/FontConfig.cpp b/src/base/FontConfig.cpp
index 2398d55..ce92333 100644
--- a/src/base/FontConfig.cpp
+++ b/src/base/FontConfig.cpp
@@ -149,6 +149,7 @@ void FontConfig::initFontDescription( const int &i, const wxString &cf )
fd[i].underline = ( s.CmpNoCase( wxT( "true" )) == 0 );
fd[i].facename = t.GetNextToken();
+ if ( i == FONT_SYMBOL ) fd[i].facename = SYMBOL_FONT_NAME;
}
/**************************************************************
diff --git a/src/base/constants.h b/src/base/constants.h
index 1083236..557ed95 100644
--- a/src/base/constants.h
+++ b/src/base/constants.h
@@ -96,7 +96,7 @@ WX_DECLARE_HASH_MAP( int, wxString, wxIntegerHash, wxIntegerEqual, IntStringHash
// print custom footer in PDF
#define DEFAULT_CUSTOM_FOOTER wxT( "Printed by Maitreya $version on $date" )
-#define SYMBOL_FONT_NAME wxT( "MaitreyaSymbols6" )
+#define SYMBOL_FONT_NAME wxT( "MaitreyaSymbols" )
#define LOGO_FILE wxT( "logo.jpg" )
// Various file and directory names
@@ -312,7 +312,7 @@ enum {
TEXT_MODE_MAIN_VIEW
};
-#define DEFAULT_SYMBOL_FONT_NAME wxT( "MaitreyaSymbols6" )
+#define DEFAULT_SYMBOL_FONT_NAME wxT( "MaitreyaSymbols" )
// Notebook styles
enum { NB_STYLE_NOTEBOOK = 0, NB_STYLE_LISTBOOK, NB_STYLE_CHOICEBOOK, NB_STYLE_TOOLBOOK, NB_STYLE_TREEBOOK };
diff --git a/src/fonts/MaitreyaSymbols.TTF b/src/fonts/MaitreyaSymbols.TTF
new file mode 100644
index 0000000..d07f2b0
Binary files /dev/null and b/src/fonts/MaitreyaSymbols.TTF differ
diff --git a/src/fonts/MaitreyaSymbols6.ttf b/src/fonts/MaitreyaSymbols6.ttf
deleted file mode 100644
index fcb2165..0000000
Binary files a/src/fonts/MaitreyaSymbols6.ttf and /dev/null differ
diff --git a/src/fonts/Makefile.am b/src/fonts/Makefile.am
index 5e36401..f8f88bd 100644
--- a/src/fonts/Makefile.am
+++ b/src/fonts/Makefile.am
@@ -2,10 +2,10 @@ pkgdatadir = ${datarootdir}/maitreya6/fonts
EXTRA_DIST =
-dist_pkgdata_DATA = MaitreyaSymbols6.ttf
+dist_pkgdata_DATA = MaitreyaSymbols.TTF
fontdir = /usr/share/fonts/truetype/maitreya
-font_DATA = MaitreyaSymbols6.ttf
+font_DATA = MaitreyaSymbols.TTF
clean:
rm -f *~ *.bak
diff --git a/src/fonts/Makefile.in b/src/fonts/Makefile.in
index 2a8e21c..166de3e 100644
--- a/src/fonts/Makefile.in
+++ b/src/fonts/Makefile.in
@@ -209,9 +209,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST =
-dist_pkgdata_DATA = MaitreyaSymbols6.ttf
+dist_pkgdata_DATA = MaitreyaSymbols.TTF
fontdir = /usr/share/fonts/truetype/maitreya
-font_DATA = MaitreyaSymbols6.ttf
+font_DATA = MaitreyaSymbols.TTF
all: all-am
.SUFFIXES:
