[libticalcs] 01/01: Include the work done by Albert Huang <alberth.debian at gmail.com>.
Andreas B. Mundt
andi at alioth.debian.org
Thu Aug 8 15:46:57 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 8ea013ed9bbdc6ba670f44733ebb521f446ce6cd
Author: Andreas B. Mundt <andi at debian.org>
Date: Wed Aug 7 20:17:02 2013 +0200
Include the work done by Albert Huang <alberth.debian at gmail.com>.
Fetched from: <URL:https://code.google.com/p/tilp-debian/>.
---
debian/changelog | 11 +++
debian/control | 37 +++++++-
debian/copyright | 23 ++++-
debian/patches/series | 1 +
debian/patches/ticalcs2-external-rom-dumpers.patch | 96 ++++++++++++++++++++
debian/rules | 11 ++-
debian/watch | 3 +
7 files changed, 173 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bc93d3e..d5cb164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
libticalcs (1.1.8+dfsg-1) UNRELEASED; urgency=low
+ * Team maintained in Debian-Science now. (Closes: #678871)
* New upstream release.
+ * Add patch that supports external ROM dumpers which have been removed
+ for DFSG compliance.
+ * Remove binaries from source tarball.
+ * Created a debug package to provide debugging symbols.
+ * Added support for multiarch.
+ * Added debian/watch to enable upstream update tracking.
+ * Bumped versions of libti* dependencies for compatibility and stability.
+ * Updated to packaging format 3.0, bumped debian/compat to 9 and updated
+ debhelper version to 9.
+ * Bumped Standards-Version to 3.9.4.
-- Andreas B. Mundt <andi at debian.org> Mon, 10 Jun 2013 15:54:42 +0200
diff --git a/debian/control b/debian/control
index 2f61884..e2cb610 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,17 @@ Source: libticalcs
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Andreas B. Mundt <andi at debian.org>
-Build-Depends: debhelper (>= 9.0.0), libglib2.0-dev, libticables-dev (>= 1.2.0), libtifiles-dev (>= 1.1.0), libticonv-dev (>= 1.1.0), tfdocgen, gettext, autotools-dev, libarchive-dev
+Build-Depends: autopoint,
+ debhelper (>= 9.0.0),
+ dh-autoreconf,
+ gettext,
+ libarchive-dev,
+ libglib2.0-dev,
+ libticables-dev (>= 1.3.4),
+ libticonv-dev (>= 1.1.4),
+ libtifiles-dev (>= 1.1.6),
+ pkg-config,
+ tfdocgen
Standards-Version: 3.9.4
Section: libs
Homepage: http://lpg.ticalc.org/prj_tilp/
@@ -12,7 +22,13 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/libticalcs.git
Package: libticalcs-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libticalcs2-11 (= ${binary:Version})
+Depends: libglib2.0-dev,
+ libticables-dev,
+ libticalcs2-11 (= ${binary:Version}),
+ libticonv-dev,
+ libtifiles-dev,
+ pkg-config,
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: Texas Instruments calculator communication library [development files]
The libticalcs is a library providing support for communication with Texas
@@ -27,8 +43,9 @@ Description: Texas Instruments calculator communication library [development fil
Package: libticalcs2-11
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libticalcs2-7
Description: Texas Instruments calculator communication library
The libticalcs is a library providing support for communication with Texas
Instruments calculators. It implements the TI protocol for each type of
@@ -37,3 +54,17 @@ Description: Texas Instruments calculator communication library
All graphing calculators from Texas Instruments are supported.
.
This package provides the shared library.
+
+Package: libticalcs2-11-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libticalcs2-11 (= ${binary:Version}), ${misc:Depends}
+Description: Texas Instruments calculator communication library [debugging symbols]
+ The libticalcs is a library providing support for communication with Texas
+ Instruments calculators. It implements the TI protocol for each type of
+ calculator, independently of the link cable used to establish the link.
+ .
+ All graphing calculators from Texas Instruments are supported.
+ .
+ This package provides the debugging symbols for the library.
diff --git a/debian/copyright b/debian/copyright
index 97ed06d..b7ecb7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,7 @@
-This package was created by Romain LIEVIN <roms at tilp.info> on
-Sun, 14 Jul 2002 11:58:51 +0200.
+This package was created by Romain LIEVIN <roms at tilp.info> in 2002.
+It was taken over by Krzysztof Burghardt <krzysztof at burghardt.pl>
+around 2007. Since 2012 Albert Huang <alberth.debian at gmail.com>
+worked on the package. It is now team-maintained in Debian-Science.
It was downloaded from <http://lpg.ticalc.org/prj_tilp/>
@@ -13,6 +15,14 @@ Upstream Authors:
Tyler Cassidy <tyler at tylerc.org>
Sylvain Garsault
+Additional contributions by Jon Sturm <jonimoose at gmail.com>,
+Benjamin Moody <benjamin.moody at gmail.com>, and
+Lionel Debroux <lionel_debroux at yahoo.fr>, and countless others that
+have not been named here, but whose contributions are valuable and are
+very much appreciated.
+
+The current upstream maintainer is Lionel Debroux <lionel_debroux at yahoo.fr>.
+
Copyright:
Copyright © 1999-2008 Romain Liévin
@@ -96,6 +106,9 @@ Public License can be found in `/usr/share/common-licenses/GPL-2'.
On Debian systems, the complete text of the GNU Library General
Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-The Debian packaging is © 2002-2009, Romain Liévin <roms at tilp.info>
-and © 2009, Krzysztof Burghardt <krzysztof at burghardt.pl> and
-is licensed under the GPL, see above.
+The Debian packaging is:
+© 2002-2009 Romain Liévin <roms at tilp.info>,
+© 2009 Krzysztof Burghardt <krzysztof at burghardt.pl>,
+© 2012 Albert Huang <alberth.debian at gmail.com>,
+© 2013 Andreas B. Mundt <andi at debian.org>.
+It is licensed under the GPL (see above).
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..01e779b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ticalcs2-external-rom-dumpers.patch
diff --git a/debian/patches/ticalcs2-external-rom-dumpers.patch b/debian/patches/ticalcs2-external-rom-dumpers.patch
new file mode 100644
index 0000000..2b47296
--- /dev/null
+++ b/debian/patches/ticalcs2-external-rom-dumpers.patch
@@ -0,0 +1,96 @@
+Description: modify libticalcs2 for external binary rom dumpers
+ 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.
+Author: Benjamin Moody <benjamin.moody at gmail.com>
+Forwarded: no
+Last-Update: 2013-08-08
+
+--- a/src/error.c
++++ b/src/error.c
+@@ -243,6 +243,14 @@
+ *message = g_strdup(error_msg);
+ break;
+
++ case ERR_ROMDUMP_UNINSTALLED:
++ 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."));
++ *message = g_strdup(error_msg);
++ break;
++
+ case ERR_CALC_ERROR1: // must be synchronized with cmd89.c (static uint8_t dbus_errors[])
+ strcpy(error_msg, _("Msg: hand-held returned an error."));
+ strcat(error_msg, "\n");
+--- a/src/calc_84p.c
++++ b/src/calc_84p.c
+@@ -654,7 +654,7 @@
+
+ static int dump_rom_1 (CalcHandle* handle)
+ {
+- TRYF(rd_send(handle, "romdump.8Xp", romDumpSize84p, romDump84p));
++ TRYF(rd_send(handle, "romdump-usb.8Xp", romDumpSize84p, romDump84p));
+
+ return 0;
+ }
+--- a/src/calc_89t.c
++++ b/src/calc_89t.c
+@@ -566,7 +566,7 @@
+ dusb_cp_del(param);
+
+ // Send dumping program
+- TRYF(rd_send(handle, "romdump.89z", romDumpSize89t, romDump89t));
++ TRYF(rd_send(handle, "romdump-usb.89z", romDumpSize89t, romDump89t));
+ PAUSE(1000);
+
+ return 0;
+--- a/src/error.h
++++ b/src/error.h
+@@ -65,6 +65,8 @@
+ ERR_INVALID_HANDLE, // Invalid handle
+ ERR_INVALID_PARAMETER,
+
++ ERR_ROMDUMP_UNINSTALLED,
++
+ // --- 300 to 349 are reserved for hand-held status (DUSB)
+
+ ERR_CALC_ERROR2 = 300, // Hand-held returned an error code
+--- a/src/romdump.c
++++ b/src/romdump.c
+@@ -377,6 +377,7 @@
+
+ int rd_send(CalcHandle *h, const char *prgname, uint16_t size, uint8_t *data)
+ {
++#if 0
+ char *template, *tempfname;
+ int fd, ret;
+
+@@ -406,4 +407,26 @@
+ g_free(tempfname);
+
+ return ret;
++#else
++ char *filename;
++ int ret;
++
++ // Transfer program to calc
++ h->busy = 0;
++ filename = g_build_filename("/usr/share/libticalcs2", prgname, NULL);
++
++ if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
++ {
++ g_free(filename);
++ return ERR_ROMDUMP_UNINSTALLED;
++ }
++
++ ret = ticalcs_calc_send_var2(h, MODE_NORMAL, filename);
++ g_free(filename);
++
++ (void) size;
++ (void) data;
++
++ return ret;
++#endif
+ }
diff --git a/debian/rules b/debian/rules
index 312e24d..682a4d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,13 @@
#export DH_VERBOSE=1
%:
- dh $@ --with autotools-dev
+
+ dh $@
+
+override_dh_strip:
+ dh_strip --dbg-package=libticalcs2-11-dbg
+
+override_dh_clean:
+ dh_clean --exclude=build/mingw/ticalcs2.rc~
+
+.PHONY: override_dh_strip
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..2c2ed72
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+dfsg$// \
+http://sf.net/tilp/libticalcs2-(.+)\.tar\.bz2
--
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