[libticalcs] 02/02: Fix DFSG cleaning of the upstream sources and clarify reasons.

Andreas B. Mundt andi at alioth.debian.org
Wed Aug 21 07:12:29 UTC 2013


This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository libticalcs.

commit 6c54fddeb5cf97ecf970052430fe3231cdaf8722
Author: Andreas B. Mundt <andi at debian.org>
Date:   Wed Aug 21 00:13:12 2013 +0200

    Fix DFSG cleaning of the upstream sources and clarify reasons.
---
 debian/README.source                               |    9 ++++++---
 debian/changelog                                   |    8 ++++++++
 debian/patches/ticalcs2-external-rom-dumpers.patch |   12 ++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 9812e8f..799a4e2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,9 +1,12 @@
 libticalcs2 for Debian
 ----------------------
 
-Firmware files (ROM Dumpers) have been removed from the upstream
-sources with the command:
+ROM dumpers, i.e. precompiled firmware has been removed from the
+upstream sources in all the 'src/rom[0-9]*.h' files.
 
-         find . -name "*.inc" -o -name "*.asm" -o -name "*.z80" | xargs rm
+The Z80 ROM dumpers (ti73 - ti86) are built using spasm, which is not
+packaged for Debian.
+The 68k ROM dumpers (ti89 - v200) are built using tigcc/gcc4ti, which
+is also free software, but not packaged for Debian either.
 
  -- Andreas B. Mundt <andi at debian.org>  Mon, 10 Jun 2013 15:54:42 +0200
diff --git a/debian/changelog b/debian/changelog
index f2e8edf..57a3523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libticalcs (1.1.8+dfsg1-2) UNRELEASED; urgency=low
+
+  * Remove unnecessary dependency on 'autopoint', use autoreconf.
+  * Fix DFSG cleaning of the upstream sources and clarify reasons.
+  * Modify error message implemented by patch accordingly.
+
+ -- Andreas B. Mundt <andi at debian.org>  Tue, 20 Aug 2013 23:24:58 +0200
+
 libticalcs (1.1.8+dfsg-1) unstable; urgency=low
 
   * Team maintained in Debian-Science now (closes: #678871).
diff --git a/debian/patches/ticalcs2-external-rom-dumpers.patch b/debian/patches/ticalcs2-external-rom-dumpers.patch
index 2b47296..ae3ac19 100644
--- a/debian/patches/ticalcs2-external-rom-dumpers.patch
+++ b/debian/patches/ticalcs2-external-rom-dumpers.patch
@@ -1,11 +1,15 @@
 Description: modify libticalcs2 for external binary rom dumpers
- Modifies libticalcs2 to support external binary ROM dumpers that are not
+ As the following has not been implemented yet, the error message is
+ modified to tell the user that ROM dumping is currently not possible.
+ (Modifies libticalcs2 to support external binary ROM dumpers that are not
  allowed in Debian repositories due to the DFSG. This patch enables checking
  for those external ROMs. If they are not found, the error will notify the
- user to download them from upstream's website.
+ user to download them from upstream's website.)
+ 
 Author: Benjamin Moody <benjamin.moody at gmail.com>
 Forwarded: no
-Last-Update: 2013-08-08
+Reviewed-by: Andreas B. Mundt <andi at debian.org>
+Last-Update: 2013-08-21
 
 --- a/src/error.c
 +++ b/src/error.c
@@ -17,7 +21,7 @@ Last-Update: 2013-08-08
 +		strcpy(error_msg, _("ROM dumping program not found."));
 +		strcat(error_msg, "\n");
 +		strcat(error_msg,
-+		_("Cause: ROM dumpers are not included in this package because the programs needed to build them are not yet included in Debian/Ubuntu. You need to install the libticalcs2-rom-dumpers package (found on the TiLP website, http://lpg.ticalc.org/prj_tilp/) if you want to dump calculator ROMs."));
++		_("Cause: ROM dumps are not possible with this program because the tools needed to build the ROM dumpers are not included in Debian."));
 +		*message = g_strdup(error_msg);
 +		break;
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libticalcs.git



More information about the debian-science-commits mailing list