diff options
| author | Roland Stigge <stigge@antcom.de> | 2016-01-14 22:14:05 +0100 |
|---|---|---|
| committer | Roland Stigge <stigge@antcom.de> | 2016-01-14 22:14:05 +0100 |
| commit | 2f6f39c21cbdc5459d4d41e6fcd2810c1515abf9 (patch) | |
| tree | a0b48689d4d7346ea5a5d9d1fbdd1b88b67edda0 | |
Import xcircuit_3.8.78.dfsg-1.debian.tar.xz
[dgit import tarball xcircuit 3.8.78.dfsg-1 xcircuit_3.8.78.dfsg-1.debian.tar.xz]
| -rw-r--r-- | README.sources | 11 | ||||
| -rw-r--r-- | changelog | 541 | ||||
| -rw-r--r-- | clean | 5 | ||||
| -rw-r--r-- | compat | 1 | ||||
| -rw-r--r-- | control | 23 | ||||
| -rw-r--r-- | copyright | 120 | ||||
| -rw-r--r-- | docs | 4 | ||||
| -rw-r--r-- | examples | 4 | ||||
| -rw-r--r-- | install | 2 | ||||
| -rw-r--r-- | menu | 12 | ||||
| -rw-r--r-- | patches/01_remove_asg.patch | 59 | ||||
| -rw-r--r-- | patches/03_fix_lib_files.patch | 183 | ||||
| -rw-r--r-- | patches/04_fix_manpage.patch | 179 | ||||
| -rw-r--r-- | patches/05_fix_string_format.patch | 61 | ||||
| -rw-r--r-- | patches/series | 4 | ||||
| -rw-r--r-- | postinst | 10 | ||||
| -rw-r--r-- | preinst | 13 | ||||
| -rwxr-xr-x | rules | 61 | ||||
| -rw-r--r-- | source/format | 1 | ||||
| -rw-r--r-- | watch | 3 | ||||
| -rw-r--r-- | xcircuit-icon.xpm | 48 |
21 files changed, 1345 insertions, 0 deletions
diff --git a/README.sources b/README.sources new file mode 100644 index 0000000..215ca8f --- /dev/null +++ b/README.sources @@ -0,0 +1,11 @@ +README.source for xcircuit +========================== + +Repackaging xcircuit +-------------------- + +To produce a DFSG-compliant source tarball, remove the contents of the asg/ +directory and repackage. + +-- +Roland Stigge <stigge@antcom.de>, Thu, 11 Aug 2011 21:44:22 +0200 diff --git a/changelog b/changelog new file mode 100644 index 0000000..aab00c0 --- /dev/null +++ b/changelog @@ -0,0 +1,541 @@ +xcircuit (3.8.78.dfsg-1) unstable; urgency=medium + + * New upstream release + * debian/control: + - Standards-Version: 3.9.6 + - Depends: wish (Closes: #770587) + + -- Roland Stigge <stigge@antcom.de> Thu, 14 Jan 2016 22:14:05 +0100 + +xcircuit (3.7.57.dfsg-1) unstable; urgency=medium + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Sun, 18 May 2014 19:56:04 +0200 + +xcircuit (3.7.56.dfsg-1) unstable; urgency=medium + + * New upstream release + - API adjustment (Closes: #741821) + - Dependencies fixed (Closes: #742495) + * Applied Tcl 8.6 fix by Sergei Golovan (Closes: #724826) + * Use chrpath to strip RPATH from /usr/lib/xcircuit/xcircexec + + -- Roland Stigge <stigge@antcom.de> Mon, 07 Apr 2014 11:46:15 +0200 + +xcircuit (3.7.55.dfsg-1) unstable; urgency=low + + * New upstream release + * debian/control: Standards-Version: 3.9.5 + + -- Roland Stigge <stigge@antcom.de> Sat, 14 Dec 2013 12:24:06 +0100 + +xcircuit (3.7.54.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Mon, 21 Oct 2013 11:20:36 +0200 + +xcircuit (3.7.52.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Thu, 17 Oct 2013 15:49:35 +0200 + +xcircuit (3.7.51.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Sun, 28 Jul 2013 16:12:10 +0200 + +xcircuit (3.7.50.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Fri, 14 Jun 2013 21:08:34 +0200 + +xcircuit (3.7.49.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Sat, 18 May 2013 16:24:01 +0200 + +xcircuit (3.7.48.dfsg-3) unstable; urgency=low + + * Added patch to fix foreground / background readability issue, thanks to + Tim Edwards (Closes: #) + + -- Roland Stigge <stigge@antcom.de> Thu, 16 May 2013 20:48:16 +0200 + +xcircuit (3.7.48.dfsg-2) unstable; urgency=low + + * debian/control: Standards-Version: 3.9.4 + + -- Roland Stigge <stigge@antcom.de> Wed, 15 May 2013 21:06:18 +0200 + +xcircuit (3.7.48.dfsg-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Fri, 25 Jan 2013 11:17:32 +0100 + +xcircuit (3.7.47.dfsg-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Sun, 06 Jan 2013 14:47:55 +0100 + +xcircuit (3.7.46.dfsg-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Mon, 31 Dec 2012 13:44:36 +0100 + +xcircuit (3.7.45.dfsg-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Sun, 23 Dec 2012 19:26:52 +0100 + +xcircuit (3.7.44.dfsg-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Wed, 03 Oct 2012 12:16:57 +0200 + +xcircuit (3.7.43.dfsg-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Tue, 25 Sep 2012 13:50:18 +0200 + +xcircuit (3.7.41.dfsg-1) experimental; urgency=low + + * New upstream release + * debian/control, debian/rules: Force tk8.5 and tcl8.5 since 8.6 leads to X + errors (BadValue) + + -- Roland Stigge <stigge@antcom.de> Fri, 17 Aug 2012 10:38:16 +0200 + +xcircuit (3.7.40.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Mon, 28 May 2012 12:03:03 +0200 + +xcircuit (3.7.39.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Fri, 06 Apr 2012 14:39:32 +0200 + +xcircuit (3.7.37.dfsg-1) unstable; urgency=low + + * New upstream release + * Dropped 02_fix_tcl_libs.patch (integrated upstream) + + -- Roland Stigge <stigge@antcom.de> Sun, 25 Mar 2012 12:47:54 +0200 + +xcircuit (3.7.35.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Fri, 23 Mar 2012 11:18:44 +0100 + +xcircuit (3.7.33.dfsg-1) unstable; urgency=low + + * New upstream release + * debian/compat: 9 + * Added patch to fix string format issues (05_fix_string_format.patch) + + -- Roland Stigge <stigge@antcom.de> Sat, 10 Mar 2012 21:17:32 +0100 + +xcircuit (3.7.32.dfsg-1) unstable; urgency=low + + * New upstream release + * debian/control: Standards-Version: 3.9.3 + * debian/rules: Added get-orig-source target + + -- Roland Stigge <stigge@antcom.de> Sat, 25 Feb 2012 21:54:52 +0100 + +xcircuit (3.7.30.dfsg-1) unstable; urgency=low + + * New upstream release + * Fixed manpage (04_fix_manpage.patch) + + -- Roland Stigge <stigge@antcom.de> Mon, 13 Feb 2012 21:04:00 +0100 + +xcircuit (3.7.26.dfsg-1) unstable; urgency=low + + * New upstream release (Closes: #636948) + * debian/control: Uploaders: Roland Stigge <stigge@antcom.de> + * debian/source/format: 3.0 (quilt) + * Added tutorial.tar.gz (Closes: #72945) + + -- Roland Stigge <stigge@antcom.de> Thu, 11 Aug 2011 22:27:10 +0200 + +xcircuit (3.6.135.dfsg-1) unstable; urgency=high + + * New upstream release. + - Dropped debian/patches/fix_tk_version.dpatch, since it's been applied + in the new upstream release. + * Modified debian/rules to fix FTBFS in when sudo is used instead of + fakeroot. (Closes: #481460) + * Updated Standards Version to 3.8.0. + - Removed "Conflicts: xbase (<< 3.3.2.3a-2)" from debian/control + * Fixed some lintian warnings. + + Added watch file. + + Removed deprecated build-deps (x-dev, xutils), added x11proto-core-dev + instead. + + Fixed debian/rules so that config.sub and config.guess differences + aren't shipped. + * Made debian/copyright a machine parsable file. + + -- Margarita Manterola <marga@debian.org> Sat, 28 Jun 2008 22:32:54 +0000 + +xcircuit (3.6.130.dfsg-1) unstable; urgency=low + + * New upstream release. + * Updated Standards Version. + + Updated menu entries. + * Added Homepage field + * Several changes to debian/rules + + Moved DH_COMPAT to debian/compat + + Fixed the clean target so that the package can be built twice in row + (Closes: #442767). + + Fixed the install target so that the appdefaults are correctly + installed, and menus work as expected (Closes: #102640). + + Fix the configure target so that it finds tcl correctly. This fixes + some of the reported segfaults (Closes: #418631, #441893). + * Added debian/patches/fix_lib_files.dpatch, to be able to + correctly install the files in /usr/share and /usr/lib. + * Added debian/patches/fix_tk_version.dpatch, to allow the use of + tcl/tk 8.5.2, which didn't work. + + -- Margarita Manterola <marga@debian.org> Sun, 27 Apr 2008 02:53:28 +0000 + +xcircuit (3.6.78.dfsg-1) unstable; urgency=low + + * New upstream release. + - Works correctly in amd64 (Closes: #229955). + - Drop python in favour of tcl support (Closes: #380989, #226233). + * New maintainer (Closes: #401609). + * Migrated from cdbs to debhelper. + * Repackaged original sources due to licensing problems of the asg module. + * Added extra menu entry for Apps/Technical (Closes: #128764) + + -- Margarita Manterola <marga@debian.org> Wed, 6 Dec 2006 11:11:48 -0300 + +xcircuit (3.6.24-1) unstable; urgency=low + + * QA Upload + * New Upstream Version (Closes: #266080, #262321) + * Update debian/copyright + * debian/{menu, install}: + + install pixmaps to /usr/share/pixmaps/xcircuit/ + * Conforms with new Standards version 3.7.2 + + -- Michael Ablassmeier <abi@debian.org> Mon, 22 May 2006 10:08:25 +0200 + +xcircuit (3.1.19-2) unstable; urgency=low + + * QA Group upload orphaning this package + * debian/changelog: removed obsolete crap from the bottom + * debian/menu: quoted the unquoted + * Updated config.{sub,guess} + + -- Andrew Pollock <apollock@debian.org> Sun, 9 Apr 2006 14:52:08 -0700 + +xcircuit (3.1.19-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove Build-Dependency on xlibs-dev (Closes: #346798). + * Credit and Big Thanks to Justin Pryzby <justinpryzby@users.sourceforge.net> + for the patch and testing. + + -- Amaya Rodrigo Sastre <amaya@debian.org> Sat, 21 Jan 2006 18:07:15 +0100 + +xcircuit (3.1.19-1) unstable; urgency=low + + * New upstream release. + + -- David Z Maze <dmaze@debian.org> Sun, 24 Aug 2003 09:08:10 -0400 + +xcircuit (3.1.18-1) unstable; urgency=low + + * New upstream release. + * Standards-Version 3.6.0 (no changes). + * Build vs. Python 2.3. + + -- David Z Maze <dmaze@debian.org> Sat, 9 Aug 2003 10:59:26 -0400 + +xcircuit (3.1.15-1) unstable; urgency=low + + * New upstream release. + * Migrate from CBS to cdbs. Thanks to Colin Walters for creating the + infrastructure, and for giving tips on setting up debian/rules. + + -- David Z Maze <dmaze@debian.org> Thu, 29 May 2003 14:44:08 -0400 + +xcircuit (3.1.14-1) unstable; urgency=low + + * New upstream release. + * Update to CBS 1.59. + * Standards-Version 3.5.10.0 (no changes). + + -- David Z Maze <dmaze@debian.org> Sun, 18 May 2003 21:00:19 -0400 + +xcircuit (3.1.12-1) unstable; urgency=low + + * New upstream release. + * Update to CBS 1.57. + * Should build from source (not tripping over internal gcc errors) + on hppa. (Closes: #189583) + + -- David Z Maze <dmaze@debian.org> Mon, 21 Apr 2003 15:26:08 -0400 + +xcircuit (3.1.10-1) unstable; urgency=low + + * New upstream release. + * Update to CBS 1.56. + * Standards-Version 3.5.9.0 (no changes). + + -- David Z Maze <dmaze@debian.org> Sun, 13 Apr 2003 13:57:35 -0400 + +xcircuit (3.0rev8-1) unstable; urgency=low + + * New upstream release. + * Update to CBS 1.50. + + -- David Z Maze <dmaze@debian.org> Sun, 19 Jan 2003 10:57:32 -0500 + +xcircuit (3.0rev7-1) unstable; urgency=low + + * New upstream release. + * Update to CBS 1.48. + + -- David Z Maze <dmaze@debian.org> Wed, 18 Dec 2002 23:58:36 -0500 + +xcircuit (3.0rev5-2) unstable; urgency=low + + * Use Colin's Build System. This includes finally switching the package + to using debhelper. + + -- David Z Maze <dmaze@debian.org> Sat, 7 Dec 2002 11:47:30 -0500 + +xcircuit (3.0rev5-1) unstable; urgency=low + + * New upstream release. + * Updated to standards-version 3.5.8.0 (no changes). + + -- David Z Maze <dmaze@debian.org> Fri, 6 Dec 2002 23:35:31 -0500 + +xcircuit (3.0rev4-1) unstable; urgency=low + + * New upstream release. This includes a fix to a critical bug (though + with a goto rather than a continue). (Closes: #166509) + * Switch to using the default version of Python, rather than forcing + python2.1. + * No longer manage a /usr/doc link. (These things are much easier when + you use debhelper. :-) + + -- David Z Maze <dmaze@debian.org> Sat, 23 Nov 2002 10:24:39 -0500 + +xcircuit (2.5.5rev0-1) unstable; urgency=low + + * New upstream release. + + -- David Z Maze <dmaze@debian.org> Wed, 29 May 2002 23:30:23 -0400 + +xcircuit (2.5.3rev0-1) unstable; urgency=low + + * New upstream release. + + -- David Z Maze <dmaze@debian.org> Sat, 5 Jan 2002 19:37:48 -0500 + +xcircuit (2.5.2rev1-1) unstable; urgency=low + + * New upstream release. + * Add a build dependency on m4; it's needed to generate the man page. + + -- David Z Maze <dmaze@debian.org> Sun, 30 Dec 2001 18:39:56 -0500 + +xcircuit (2.5.2rev0-1) unstable; urgency=low + + * New upstream release. + + -- David Z Maze <dmaze@debian.org> Mon, 24 Dec 2001 11:49:33 -0500 + +xcircuit (2.5.1rev1-1) unstable; urgency=low + + * New upstream release. License changed from Artistic to GPL. + + -- David Z Maze <dmaze@debian.org> Sat, 15 Dec 2001 10:11:38 -0500 + +xcircuit (2.4.0rev2-1) unstable; urgency=low + + * New upstream release. Includes correct location for tutorial in + xcircuit.1 (Closes: #114752). + * Added an icon to the menu item. + * Updated debian/rules to deal correctly with auto*. + * Use Python 2.1. + + -- David Z Maze <dmaze@debian.org> Thu, 22 Nov 2001 09:06:56 -0500 + +xcircuit (2.3.3-1) unstable; urgency=low + + * New upstream release. + * Updated to Standards-Version 3.5.5.0 (no changes). + + -- David Z Maze <dmaze@debian.org> Wed, 11 Jul 2001 17:18:54 -0400 + +xcircuit (2.3-1) unstable; urgency=low + + * New upstream release. + * Let ld bring in Python's dependencies automatically; don't explicitly + build-depend on e.g. libdb2-dev which isn't directly used by xcircuit. + + -- David Z Maze <dmaze@debian.org> Sat, 26 May 2001 08:48:03 -0400 + +xcircuit (2.2.2-3) unstable; urgency=low + + * Move the X resource file to /etc/X11/app-defaults. Hopefully this + addresses bug #94996. + * Updated to standards-version 3.5.3.0. + + -- David Z Maze <dmaze@debian.org> Mon, 23 Apr 2001 21:58:17 -0400 + +xcircuit (2.2.2-2) unstable; urgency=low + + * Added a build dependency on libdb2-dev. (Closes: #90259) Looking + at the things xcircuit links against, this should be the only missing + build dependency. + + * I don't think xcircuit falls into any of the categories for "extra" + packages in policy (sec. 2.2), so upgrade priority to "optional". + + -- David Z Maze <dmaze@debian.org> Mon, 19 Mar 2001 21:40:35 -0500 + +xcircuit (2.2.2-1) unstable; urgency=low + + * New upstream version. User-defined keybindings (introduced in + 2.2.1) can now include mouse buttons, and the help screen reflects + user setup. Improved Python interface. Fixed a PostScript bug. + + -- David Z Maze <dmaze@debian.org> Tue, 13 Mar 2001 23:51:47 -0500 + +xcircuit (2.2.1-2) unstable; urgency=low + + * Build-depend on python2-dev. (Closes: #85759) + + -- David Z Maze <dmaze@mit.edu> Mon, 12 Feb 2001 22:51:17 -0500 + +xcircuit (2.2.1-1) unstable; urgency=low + + * New upstream version. Major change: some internal use of Python as + a start on replacing the configuration language. + * Updated to Standards-Version 3.5.0.0. + * Move the library files to /usr/share/xcircuit, since they're + platform-independent and we don't worry about multiple versions. + * Move the X resources file to /etc/X11/Xresources, as per policy. + * Strip the xcircuit binary enough to appease lintian. + + -- David Z Maze <dmaze@mit.edu> Tue, 6 Feb 2001 22:45:07 -0500 + +xcircuit (2.2.0-1) unstable; urgency=low + + * New maintainer. (Closes: #80358) + * New upstream release. (Closes: #60608, #74043) + * Updated to Standards-Version 3.2.1.0. Moved stuff into /usr/share + as appropriate, and added correct language in postinst/prerm to + deal with /usr/doc link. Moved update-menus call to postrm. + * Move the binary from /usr/X11R6/bin to /usr/bin. + * Install app-defaults file correctly in /etc/X11/app-defaults. + (Closes: #80854) + * Copy all of the upstream README files to /usr/share/doc/xcircuit. + * Now Lintian-clean. Yay! (Closes: #73019) + * Permissions on everything look correct now. (Closes: #70822) + * Added "Vector" hint to menu entry. (Closes: #80056) + * Remove menu entry for xschema. (Closes: #79054) Also remove mention + of xschema from description. + + -- David Z Maze <dmaze@mit.edu> Tue, 16 Jan 2001 20:27:46 -0500 + +xcircuit (2.0b1-2) frozen unstable; urgency=low + + * Applied Ben Collins' patch for app defaults. closes: #59571 + + -- Dale Scheetz <dwarf@polaris.net> Sat, 4 Mar 2000 19:19:49 -0500 + +xcircuit (2.0b1-1) unstable; urgency=low + + * new upstream source + * Patched install process to put bins in X11R6/bin instead of + * bin. closes: #49915 + * Commented out default apps install in Imakefile, letting the + * rules file install it properly. closes: #50573 + + -- Dale Scheetz <dwarf@polaris.net> Sat, 1 Jan 2000 16:21:46 -0500 + +xcircuit (2.0a11-1) unstable; urgency=low + + * new upstream source: + * closes: #34966, #37019, #41834 + + -- Dale Scheetz <dwarf@polaris.net> Tue, 9 Nov 1999 18:33:45 -0500 + +xcircuit (2.0a6-3) frozen unstable; urgency=high + + * retarget package for frozen to propogate previous fix into stable + + -- Dale Scheetz <dwarf@polaris.net> Wed, 13 Jan 1999 19:35:29 -0500 + +xcircuit (2.0a6-2) unstable; urgency=low + + * recompiled with glibc 2.0.7u-7 to follow __register_frame_info fix + + -- Dale Scheetz <dwarf@polaris.net> Wed, 2 Dec 1998 16:21:43 -0500 + +xcircuit (2.0a6-1) unstable; urgency=low + + * new upstream source + * includes fix for "segfault when breaking a line": fixes 21727 + * added menu entry for Xschema for access to the new schematic code. + + -- Dale Scheetz <dwarf@polaris.net> Mon, 16 Nov 1998 10:36:44 -0500 + +xcircuit (1.7-5) unstable; urgency=low + + * recompiled against correct libc6 shlibs file for proper dependencies. + + -- Dale Scheetz <dwarf@polaris.net> Sat, 3 Oct 1998 16:05:28 -0400 + +xcircuit (1.7-4) unstable; urgency=low + + * applied Paul Slootman's patch repairing the return value of + * _XwMapFromHex to unsigned long, so it can cast to a pointer + * on the alpha. Also replaced references of <strings.h> with the + * more correct reference to <string.h>: fixes 22650 + * Removed XCircuit.ad from the Imakefile, leaving the installation + * of this file to the rules file: fixes 24856 + + -- Dale Scheetz <dwarf@polaris.net> Sun, 27 Sep 1998 14:45:46 -0400 + +xcircuit (1.7-3) frozen unstable; urgency=low + + * rules clean target now removes substvars* and files*: fixes 21216 + + -- Dale Scheetz <dwarf@polaris.net> Sat, 18 Apr 1998 22:03:50 -0400 + +xcircuit (1.7-2) frozen unstable; urgency=low + + * Added XCircuit.ad for proper color defaults: fixes 20142 and 20933 + * Fixed clean target in rules for clean build: fixes 20970 + + -- Dale Scheetz <dwarf@polaris.net> Sat, 11 Apr 1998 12:29:46 -0400 + +xcircuit (1.7-1) unstable; urgency=low + + * New package from upstream sources + + -- Dale Scheetz <dwarf@polaris.net> Sat, 7 Mar 1998 20:55:26 -0500 @@ -0,0 +1,5 @@ +config.guess +config.sub +config.log +lib/tcl/xcircuit.tcl + @@ -0,0 +1 @@ +9 @@ -0,0 +1,23 @@ +Source: xcircuit +Section: electronics +Priority: extra +Maintainer: Margarita Manterola <marga@debian.org> +Uploaders: Roland Stigge <stigge@antcom.de> +Build-Depends: libx11-dev, libxpm-dev, libxt-dev, x11proto-core-dev, m4, debhelper (>= 9), tcl-dev (>= 8.6.0+6), tk-dev (>= 8.6.0+6), autotools-dev, dpkg-dev (>= 1.16.0), chrpath +Standards-Version: 3.9.6 +Homepage: http://opencircuitdesign.com/xcircuit/ + +Package: xcircuit +Section: electronics +Priority: optional +Architecture: any +Depends: wish, ${shlibs:Depends}, ${misc:Depends} +Description: Draw circuit schematics or almost anything + xcircuit is a generic drawing program tailored for making circuit + diagrams. + . + The graphical interface attempts to maintain consistency between + X11 window rendering and the pure PostScript output. + . + xcircuit is mouse, menu and keyboard driven. The emphasis is on + single character macros. diff --git a/copyright b/copyright new file mode 100644 index 0000000..9a0a9c9 --- /dev/null +++ b/copyright @@ -0,0 +1,120 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Author: R. Timothy Edwards. +Packaged-By: Margarita Manterola <marga@debian.org> +Original-Source-Location: http://opencircuitdesign.com/xcircuit/ + +Files: * +Copyright: + Copyright 2002-2003, Tim Edwards, Johns Hopkins University. + Copyright 2004-2005, Tim Edwards, MultiGiG, Inc. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + On Debian Systems, a copy of this license agreement can be found in: + /usr/share/common-licenses/GPL + +Files: debian/* +Copyright: + Copyright 2006-2008, Margarita Manterola <marga@debian.org> + Copyright 2006, Michael Ablassmeier <abi@debian.org> + Copyright 2006, Andrew Pollock <apollock@debian.org> + Copyright 2006, Amaya Rodrigo Sastre <amaya@debian.org> and + Justin Pryzby <justinpryzby@users.sourceforge.net> + Copyright 2001-2003, David Z Maze <dmaze@debian.org> + Copyright 1998-2000, Dale Scheetz <dwarf@polaris.net> +License: GPL-2+ + Although most maintainers didn't specify it explicitly, it is assumed that + the work done for the package was licensed with the same license as the + rest of the code. + . + On Debian Systems, a copy of this license agreement can be found in: + /usr/share/common-licenses/GPL + +Files: flate.c, compression.c, compression.h +Copyright: Copyright 2003-2004, Sergei Gerasenko. +License: GPL-2 + They were taken from the SourceForge project "acroformtool", which is + licensed under the GNU General Public License. + +Files: netlist.c +Copyright: + Copyright 1998 Chow Seong Hwai, Leeds University, U.K. + Copyright 2004 Tim Edwards, Johns Hopkins University, MultiGiG, Inc., + and Open Circuit Design, Inc. + Copyright 2005 Tim Edwards, MultiGiG, Inc. +License: GPL-2+ + +Files: lib/tcl/mousehint.tcl +Copyright: Copyright 2006, James Vernon March +License: GPL-2+ + +Files: lib/tcl/panzoom.tcl +Copyright: Copyright 2003, Ed Casas +License: GPL-2+ + +Files: lib/tcl/tkcon.tcl +Copyright: Copyright 1995-2001, Jeffrey Hobbs +License: GPL-2+ + +Files: spiceparser/* +Copyright: Copyright 2003, Conrad Ziesler +License: GPL-2+ + +Files: spiceparser/xcircspice.c +Copyright: + Copyright 2003, Conrad Ziesler. + Copyright 2004-2008, Tim Edwards. +License: GPL-2+ + +Files: Xw/* +Copyright: + 1988 by Hewlett-Packard Company + 1988 by the Massachusetts Institute of Technology +License: other + Permission to use, copy, modify, and distribute this software + and its documentation for any purpose and without fee is hereby + granted, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the names of + Hewlett-Packard, Digital or M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without + written prior permission. + . + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + . + This is included as part "X widgets" project. + +Files: Xw/Display.c, Xw/MapEvents.c, Xw/SourceStr.c, Xw/sub.c, Xw/TextEdit.c +Copyright: + Copyright 1988 by Hewlett-Packard Company + Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, + Massachusetts, and the Massachusetts Institute of Technology, + Cambridge, Massachusetts +License: other + Permission to use, copy, modify, and distribute this software + and its documentation for any purpose and without fee is hereby + granted, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the names of + Hewlett-Packard, Digital or M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without + written prior permission. + . + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + . + This is included as part "X widgets" project. @@ -0,0 +1,4 @@ +README +README.ISOLatin2 +README.Tcl +README.notes diff --git a/examples b/examples new file mode 100644 index 0000000..ee75652 --- /dev/null +++ b/examples @@ -0,0 +1,4 @@ +examples/*.lgf +examples/*.lps +examples/*.ps +examples/*.py @@ -0,0 +1,2 @@ +debian/xcircuit-icon.xpm usr/share/pixmaps/xcircuit/ +tutorial usr/share/doc/xcircuit/ @@ -0,0 +1,12 @@ +?package(xcircuit):needs="X11" \ + section="Applications/Graphics" \ + title="Xcircuit" \ + command="/usr/bin/xcircuit" \ + hints="Vector" \ + icon="/usr/share/pixmaps/xcircuit/xcircuit-icon.xpm" +?package(xcircuit):needs="X11" \ + section="Applications/Science/Electronics" \ + title="Xcircuit" \ + command="/usr/bin/xcircuit" \ + hints="CAD,Electric" \ + icon="/usr/share/pixmaps/xcircuit/xcircuit-icon.xpm" diff --git a/patches/01_remove_asg.patch b/patches/01_remove_asg.patch new file mode 100644 index 0000000..a70ae53 --- /dev/null +++ b/patches/01_remove_asg.patch @@ -0,0 +1,59 @@ +Description: Remove ASG from build +Author: Margarita Manterola <marga@debian.org> + +--- xcircuit-3.8.78.dfsg.orig/Makefile.in ++++ xcircuit-3.8.78.dfsg/Makefile.in +@@ -849,7 +849,6 @@ install-tcl: xcircexec$(EXEEXT) lib/$(IN + + clean: + (cd ./Xw; $(RM) *.o *.a *.bak core) +- (cd ./asg; $(MAKE) clean) + (cd ./spiceparser; $(MAKE) clean) + $(RM) lib/$(INTERP_PATH)/$(WRAPPER_OBJ) lib/$(INTERP_PATH)/$(WRAPPER_SH) + $(RM) lib/$(INTERP_PATH)/$(WRAPPER_INIT) +@@ -859,7 +858,6 @@ clean: + + distclean: + (cd ./Xw; $(RM) *.o *.a *.bak Makefile core) +- (cd ./asg; $(MAKE) clean ; $(RM) Makefile) + (cd ./spiceparser; $(MAKE) clean ; $(RM) Makefile) + $(RM) xcircuit *.o *.bak core + $(RM) lib/$(INTERP_PATH)/$(WRAPPER_OBJ) lib/$(INTERP_PATH)/$(WRAPPER_SH) +@@ -879,7 +877,6 @@ dist: + + quiteclean: + (cd ./Xw; $(RM) *.o *.a *.bak Makefile.in Makefile core) +- (cd ./asg; $(MAKE) clean ; $(RM) Makefile.in Makefile) + (cd ./spiceparser; $(MAKE) clean ; $(RM) Makefile.in Makefile) + $(RM) xcircuit *.o *.bak core + $(RM) lib/$(INTERP_PATH)/$(WRAPPER_OBJ) lib/$(INTERP_PATH)/$(WRAPPER_SH) +--- xcircuit-3.8.78.dfsg.orig/configure ++++ xcircuit-3.8.78.dfsg/configure +@@ -7208,8 +7208,8 @@ if test "${enable_asg+set}" = set; then + + $as_echo "#define CONFIGURED 1" >>confdefs.h + +- SUBDIRS="asg spiceparser" +- SUBLIB="asg/libasg.a spiceparser/libspiceparser.a" ++ SUBDIRS="spiceparser" ++ SUBLIB="spiceparser/libspiceparser.a" + + fi + +@@ -7571,7 +7571,7 @@ fi + + + +-ac_config_files="$ac_config_files Makefile Xw/Makefile asg/Makefile spiceparser/Makefile" ++ac_config_files="$ac_config_files Makefile Xw/Makefile spiceparser/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -8321,7 +8321,6 @@ do + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "Xw/Makefile") CONFIG_FILES="$CONFIG_FILES Xw/Makefile" ;; +- "asg/Makefile") CONFIG_FILES="$CONFIG_FILES asg/Makefile" ;; + "spiceparser/Makefile") CONFIG_FILES="$CONFIG_FILES spiceparser/Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/patches/03_fix_lib_files.patch b/patches/03_fix_lib_files.patch new file mode 100644 index 0000000..191c4cc --- /dev/null +++ b/patches/03_fix_lib_files.patch @@ -0,0 +1,183 @@ +Description: Fix for FHS compliant file locations +Author: Margarita Manterola <marga@debian.org> + +--- xcircuit-3.8.78.dfsg.orig/Makefile.am ++++ xcircuit-3.8.78.dfsg/Makefile.am +@@ -65,6 +65,9 @@ tmpdir = /tmp + appdefaultsdir = $(libdir)/$(PACKAGE)-$(VERSION)/app-defaults + appmandir = $(libdir)/$(PACKAGE)-$(VERSION)/man + ++# Directory for binary library files ++exelibdir = $(libdir)/$(PACKAGE)-$(VERSION) ++ + PATHNAMES = -DPROG_VERSION=$(VERSION) \ + -DPROG_REVISION=$(REVISION) \ + -DCAD_DIR=\"$(libdir)\" \ +@@ -146,6 +149,7 @@ CONSOLE_SCRIPT = console.tcl + + lib/$(INTERP_PATH)/$(WRAPPER_SH): lib/$(INTERP_PATH)/$(WRAPPER_SH).in + sed -e '/XCLIBDIR/s#XCLIBDIR#$(librarydir)#' \ ++ -e '/XCEXELIBDIR/s#XCEXELIBDIR#$(exelibdir)#' \ + -e '/WRAPPER_INIT/s/WRAPPER_INIT/$(WRAPPER_INIT)/' \ + -e '/CONSOLE_SCRIPT/s/CONSOLE_SCRIPT/$(CONSOLE_SCRIPT)/' \ + -e '/CONSOLE/s/CONSOLE/$(CONSOLE)/' \ +@@ -157,7 +161,7 @@ lib/$(INTERP_PATH)/$(WRAPPER_SH): lib/$( + chmod 0755 $@ + + lib/$(INTERP_PATH)/$(WRAPPER_INIT): lib/$(INTERP_PATH)/$(WRAPPER_INIT).in +- sed -e '/LIBDIR/s#LIBDIR#$(librarydir)#' \ ++ sed -e '/LIBDIR/s#LIBDIR#$(exelibdir)#' \ + -e '/SCRIPTSDIR/s#SCRIPTSDIR#$(scriptsdir)#' \ + lib/$(INTERP_PATH)/$(WRAPPER_INIT).in > $@ + chmod 0755 $@ +@@ -211,19 +215,20 @@ install-tcl: xcircexec$(EXEEXT) lib/$(IN + @echo "Installing standard XCircuit library files" + $(MAKE) $(AM_MAKEFLAGS) install-data-local + @echo "Installing Tcl files" +- $(mkinstalldirs) $(DESTDIR)$(librarydir) ++ $(mkinstalldirs) $(DESTDIR)$(exelibdir) + $(mkinstalldirs) $(DESTDIR)$(scriptsdir) +- ( cd lib/$(INTERP_PATH) ; for i in $(WRAPPER_OBJ) *.tcl ; do \ ++ ( cd lib/$(INTERP_PATH) ; for i in *.tcl ; do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(scriptsdir); \ +- done ) +- $(INSTALL_DATA) xcircexec$(EXEEXT) $(DESTDIR)$(librarydir) ++ done; \ ++ $(INSTALL_DATA) $(WRAPPER_OBJ) $(DESTDIR)$(exelibdir) ) ++ $(INSTALL_DATA) xcircexec$(EXEEXT) $(DESTDIR)$(exelibdir) + chmod 0755 $(DESTDIR)$(librarydir)/$(CONSOLE) + chmod 0755 $(DESTDIR)$(librarydir)/$(CONSOLE_SCRIPT) +- chmod 0755 $(DESTDIR)$(librarydir)/$(WRAPPER_OBJ) +- chmod 0755 $(DESTDIR)$(librarydir)/xcircexec$(EXEEXT) ++ chmod 0755 $(DESTDIR)$(exelibdir)/$(WRAPPER_OBJ) ++ chmod 0755 $(DESTDIR)$(exelibdir)/xcircexec$(EXEEXT) + + if test "${SHDLIB_EXT}" != ".so"; then \ +- ( cd $(DESTDIR)$(librarydir); \ ++ ( cd $(DESTDIR)$(exelibdir); \ + $(RM) $(WRAPPER_SO) ; \ + ln -s $(WRAPPER_OBJ) $(WRAPPER_SO) ) ; \ + fi +--- xcircuit-3.8.78.dfsg.orig/Makefile.in ++++ xcircuit-3.8.78.dfsg/Makefile.in +@@ -264,9 +264,6 @@ ac_aux_dir = dist + # Temporary directory (if not overridden by environment variable TMPDIR) + tmpdir = /tmp + +-# Directories for app-defaults file and manual page +-appdefaultsdir = $(libdir)/$(PACKAGE)-$(VERSION)/app-defaults +-appmandir = $(libdir)/$(PACKAGE)-$(VERSION)/man + PATHNAMES = -DPROG_VERSION=$(VERSION) \ + -DPROG_REVISION=$(REVISION) \ + -DCAD_DIR=\"$(libdir)\" \ +@@ -297,6 +294,13 @@ M4_DEFS = @M4_DEFS@ @DEFS@ + man_MANS = lib/xcircuit.1 + INCLUDES = -IXw ${INC_SPECS} + ++# Directories for app-defaults file and manual page ++appdefaultsdir = $(libdir)/$(PACKAGE)-$(VERSION)/app-defaults ++appmandir = $(libdir)/$(PACKAGE)-$(VERSION)/man ++ ++# Directory for binary library files ++exelibdir = $(libdir)/$(PACKAGE)-$(VERSION) ++ + # Library directory and files + librarydir = $(libdir)/$(PACKAGE)-$(VERSION) + scriptsdir = $(libdir)/$(PACKAGE)-$(VERSION) +@@ -755,6 +759,7 @@ xtfuncs.c: menudep.h + + lib/$(INTERP_PATH)/$(WRAPPER_SH): lib/$(INTERP_PATH)/$(WRAPPER_SH).in + sed -e '/XCLIBDIR/s#XCLIBDIR#$(librarydir)#' \ ++ -e '/XCEXELIBDIR/s#XCEXELIBDIR#$(exelibdir)#' \ + -e '/WRAPPER_INIT/s/WRAPPER_INIT/$(WRAPPER_INIT)/' \ + -e '/CONSOLE_SCRIPT/s/CONSOLE_SCRIPT/$(CONSOLE_SCRIPT)/' \ + -e '/CONSOLE/s/CONSOLE/$(CONSOLE)/' \ +@@ -766,7 +771,7 @@ lib/$(INTERP_PATH)/$(WRAPPER_SH): lib/$( + chmod 0755 $@ + + lib/$(INTERP_PATH)/$(WRAPPER_INIT): lib/$(INTERP_PATH)/$(WRAPPER_INIT).in +- sed -e '/LIBDIR/s#LIBDIR#$(librarydir)#' \ ++ sed -e '/LIBDIR/s#LIBDIR#$(exelibdir)#' \ + -e '/SCRIPTSDIR/s#SCRIPTSDIR#$(scriptsdir)#' \ + lib/$(INTERP_PATH)/$(WRAPPER_INIT).in > $@ + chmod 0755 $@ +@@ -820,19 +825,20 @@ install-tcl: xcircexec$(EXEEXT) lib/$(IN + @echo "Installing standard XCircuit library files" + $(MAKE) $(AM_MAKEFLAGS) install-data-local + @echo "Installing Tcl files" +- $(mkinstalldirs) $(DESTDIR)$(librarydir) ++ $(mkinstalldirs) $(DESTDIR)$(exelibdir) + $(mkinstalldirs) $(DESTDIR)$(scriptsdir) +- ( cd lib/$(INTERP_PATH) ; for i in $(WRAPPER_OBJ) *.tcl ; do \ ++ ( cd lib/$(INTERP_PATH) ; for i in *.tcl ; do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(scriptsdir); \ +- done ) +- $(INSTALL_DATA) xcircexec$(EXEEXT) $(DESTDIR)$(librarydir) ++ done; \ ++ $(INSTALL_DATA) $(WRAPPER_OBJ) $(DESTDIR)$(exelibdir) ) ++ $(INSTALL_DATA) xcircexec$(EXEEXT) $(DESTDIR)$(exelibdir) + chmod 0755 $(DESTDIR)$(librarydir)/$(CONSOLE) + chmod 0755 $(DESTDIR)$(librarydir)/$(CONSOLE_SCRIPT) +- chmod 0755 $(DESTDIR)$(librarydir)/$(WRAPPER_OBJ) +- chmod 0755 $(DESTDIR)$(librarydir)/xcircexec$(EXEEXT) ++ chmod 0755 $(DESTDIR)$(exelibdir)/$(WRAPPER_OBJ) ++ chmod 0755 $(DESTDIR)$(exelibdir)/xcircexec$(EXEEXT) + + if test "${SHDLIB_EXT}" != ".so"; then \ +- ( cd $(DESTDIR)$(librarydir); \ ++ ( cd $(DESTDIR)$(exelibdir); \ + $(RM) $(WRAPPER_SO) ; \ + ln -s $(WRAPPER_OBJ) $(WRAPPER_SO) ) ; \ + fi +--- xcircuit-3.8.78.dfsg.orig/lib/tcl/xcircuit.sh.in ++++ xcircuit-3.8.78.dfsg/lib/tcl/xcircuit.sh.in +@@ -6,7 +6,9 @@ + # + + loclibdir=${XCIRCUIT_LIB_DIR:=XCLIBDIR} ++exelibdir=${XCIRCUIT_LIB_DIR:=XCEXELIBDIR} + export XCIRCUIT_LIB_DIR ++export XCIRCUIT_EXELIB_DIR + XCIRCUIT_WISH=WISH_EXE + export XCIRCUIT_WISH + +@@ -53,6 +55,6 @@ else + # *only* needed when running without the console; the console itself is + # capable of sourcing the startup script. + # +- exec ${loclibdir}/xcircexec -- $@ ++ exec ${exelibdir}/xcircexec -- $@ + + fi +--- xcircuit-3.8.78.dfsg.orig/lib/tcl/xcircuit.tcl.in ++++ xcircuit-3.8.78.dfsg/lib/tcl/xcircuit.tcl.in +@@ -12,6 +12,11 @@ if {$envlibdir == {}} { + } + unset envlibdir + ++set exelibdir [array get env "XCIRCUIT_EXELIB_DIR"] ++if {$exelibdir == {}} { ++ set exelibdir LIBDIR ++} ++ + set envsrcdir [array get env "XCIRCUIT_SRC_DIR"] + if {$envsrcdir != {}} { + set path [lindex $envsrcdir 1] +@@ -28,13 +33,14 @@ if {[string compare $tcl_platform(platfo + } + + set tcllibdir $path +-if {![file exists ${tcllibdir}/xcircuit$libext]} { ++ ++if {![file exists ${exelibdir}/xcircuit$libext]} { + set tcllibdir ${path}/tcl + } +-if {![file exists ${tcllibdir}/xcircuit$libext]} { ++if {![file exists ${exelibdir}/xcircuit$libext]} { + puts stderr "Error: Cannot find file xcircuit$libext" + } +-load ${tcllibdir}/xcircuit$libext ++load ${exelibdir}/xcircuit$libext + + package require Xcircuit + diff --git a/patches/04_fix_manpage.patch b/patches/04_fix_manpage.patch new file mode 100644 index 0000000..4ed05c4 --- /dev/null +++ b/patches/04_fix_manpage.patch @@ -0,0 +1,179 @@ +Description: Manpage fix + This patch fixes a format problem in a table in the manpage +Author: Roland Stigge <stigge@antcom.de> + +--- xcircuit-3.8.78.dfsg.orig/lib/xcircuit.1.in ++++ xcircuit-3.8.78.dfsg/lib/xcircuit.1.in +@@ -1042,89 +1042,89 @@ follows, with their default values given + .br + .sp + +- Function name Function performed Default key binding +- --------------------------------------------------------------------- +- "Page", change page, Number keys 1-9 and 0 +- "Justify", change text justification, Keypad keys 1-9 +- "Superscript", set text superscript, Keypad + +- "Subscript", set text subscript, Keypad - +- "Normalscript", cancel sub/superscript, Keypad Enter +- "Nextfont", change to next font, Alt-f +- "Boldfont", change to bold font, Alt-b +- "Italicfont", change to italic font, Alt-i +- "Normalfont", cancel italic/bold, Alt-n +- "Underline", generate underline, Alt-u +- "Overline", generate overline, Alt-o +- "ISO Encoding", change to ISO encoding, Alt-e +- "Return", embedded return character, Alt-Enter +- "Halfspace", embedded half-space, Alt-h +- "Quarterspace", embedded quarter-space, Alt-q +- "Special", special character, Alt-c +- "Parameter", embedded parameter, Alt-p +- "Edit Break", break at point, x +- "Edit Delete", delete point, d, Delete +- "Edit Insert", insert point, i, Insert +- "Edit Next", go to next point, e +- "Attach", attach line to object, A +- "Next Library", go to next library, l +- "Library Directory", library directory, L +- "Library Move", arrange library objects, M +- "Library Copy", get object in copy mode, c +- "Library Edit", edit library name, E +- "Library Delete", delete library object, D +- "Library Duplicate", duplicate object, C +- "Library Hide", hide library object, H +- "Page Directory ", page directory, P +- "Library Pop", return from library, < +- "Help", generate help screen, h, ? +- "Redraw", redraw the window, space +- "View", fit page to window, v +- "Zoom In", zoom in, Z +- "Zoom Out", zoom out, z +- "Pan", center pan, p +- "Double Snap", increase snap space, + +- "Halve Snap", decrease snap space, - +- "Pan Left", pan left one-half page, Left arrow +- "Pan Right", pan right one-half page, Right arrow +- "Pan Up", pan up one-half page, Up arrow +- "Pan Down", pan down one-half page, Down arrow +- "Write", popup output window, W +- "Rotate", Rotate, r,R,o,O +- "Flip X", Flip horizontal, f +- "Flip Y", Flip vertical, F +- "Snap", Snap to grid, S +- "Pop", Return from object edit, < +- "Push", Edit object, > +- "Delete", Delete element, d +- "Select", Select element, Select +- "Box", Create box, b +- "Arc", Create arc, a +- "Text", Create label, t +- "Exchange", Exchange vertical order, X +- "Copy", Copy element, c +- "Join", Join into path, j +- "Unjoin", Split path into elements, J +- "Spline", Create spline, s +- "Edit", Edit element, e +- "Undelete", Undelete last deleted, u +- "Select Save", Make object from selected, M,m +- "Unselect", Unselect element, x +- "Dashed", Set line style to dashed, | +- "Dotted", Set line style to dotted, : +- "Solid", Set line style to solid, _ +- "Prompt", Execute from command line, % +- "Dot", Place dot at location, . +- "Exit", Exit xcircuit Ctrl-Alt-q +- "Netlist", Generate a netlist, Alt-q +- "Swap", Swap schematic, symbol, / +- "Pin Label", Create pin label, T +- "Info Label", Create info label, I +- "Connectivity", Show wire connectivity, Alt-w +- "Sim", Generate sim netlist, Alt-s +- "SPICE", Generate SPICE netlist, Alt-S +- "PCB", Generate PCB netlist, Alt-p +- "SPICE Flat" Generate flattened SPICE, Alt-f +- ------------------------------------------------------------------ ++ Function name Function performed Default key binding ++ --------------------------------------------------------------------- ++ "Page", change page, Number keys 1-9 and 0 ++ "Justify", change text justification, Keypad keys 1-9 ++ "Superscript", set text superscript, Keypad + ++ "Subscript", set text subscript, Keypad - ++ "Normalscript", cancel sub/superscript, Keypad Enter ++ "Nextfont", change to next font, Alt-f ++ "Boldfont", change to bold font, Alt-b ++ "Italicfont", change to italic font, Alt-i ++ "Normalfont", cancel italic/bold, Alt-n ++ "Underline", generate underline, Alt-u ++ "Overline", generate overline, Alt-o ++ "ISO Encoding", change to ISO encoding, Alt-e ++ "Return", embedded return character, Alt-Enter ++ "Halfspace", embedded half-space, Alt-h ++ "Quarterspace", embedded quarter-space, Alt-q ++ "Special", special character, Alt-c ++ "Parameter", embedded parameter, Alt-p ++ "Edit Break", break at point, x ++ "Edit Delete", delete point, d, Delete ++ "Edit Insert", insert point, i, Insert ++ "Edit Next", go to next point, e ++ "Attach", attach line to object, A ++ "Next Library", go to next library, l ++ "Library Directory", library directory, L ++ "Library Move", arrange library objects, M ++ "Library Copy", get object in copy mode, c ++ "Library Edit", edit library name, E ++ "Library Delete", delete library object, D ++ "Library Duplicate", duplicate object, C ++ "Library Hide", hide library object, H ++ "Page Directory ", page directory, P ++ "Library Pop", return from library, < ++ "Help", generate help screen, h, ? ++ "Redraw", redraw the window, space ++ "View", fit page to window, v ++ "Zoom In", zoom in, Z ++ "Zoom Out", zoom out, z ++ "Pan", center pan, p ++ "Double Snap", increase snap space, + ++ "Halve Snap", decrease snap space, - ++ "Pan Left", pan left one-half page, Left arrow ++ "Pan Right", pan right one-half page, Right arrow ++ "Pan Up", pan up one-half page, Up arrow ++ "Pan Down", pan down one-half page, Down arrow ++ "Write", popup output window, W ++ "Rotate", Rotate, r,R,o,O ++ "Flip X", Flip horizontal, f ++ "Flip Y", Flip vertical, F ++ "Snap", Snap to grid, S ++ "Pop", Return from object edit, < ++ "Push", Edit object, > ++ "Delete", Delete element, d ++ "Select", Select element, Select ++ "Box", Create box, b ++ "Arc", Create arc, a ++ "Text", Create label, t ++ "Exchange", Exchange vertical order, X ++ "Copy", Copy element, c ++ "Join", Join into path, j ++ "Unjoin", Split path into elements, J ++ "Spline", Create spline, s ++ "Edit", Edit element, e ++ "Undelete", Undelete last deleted, u ++ "Select Save", Make object from selected, M,m ++ "Unselect", Unselect element, x ++ "Dashed", Set line style to dashed, | ++ "Dotted", Set line style to dotted, : ++ "Solid", Set line style to solid, _ ++ "Prompt", Execute from command line, % ++ "Dot", Place dot at location, . ++ "Exit", Exit xcircuit Ctrl-Alt-q ++ "Netlist", Generate a netlist, Alt-q ++ "Swap", Swap schematic, symbol, / ++ "Pin Label", Create pin label, T ++ "Info Label", Create info label, I ++ "Connectivity", Show wire connectivity, Alt-w ++ "Sim", Generate sim netlist, Alt-s ++ "SPICE", Generate SPICE netlist, Alt-S ++ "PCB", Generate PCB netlist, Alt-p ++ "SPICE Flat", Generate flattened SPICE, Alt-f ++ ------------------------------------------------------------------ + .br + .sp + 2-Button mouse users may find it useful to forego the Shift-Button1 diff --git a/patches/05_fix_string_format.patch b/patches/05_fix_string_format.patch new file mode 100644 index 0000000..d902ff7 --- /dev/null +++ b/patches/05_fix_string_format.patch @@ -0,0 +1,61 @@ +Description: Fix sprintf() format strings + In several snprintf() calls, no appropriate format arguments were given. This + patch adds them. +Author: Roland Stigge <stigge@antcom.de> + +--- xcircuit-3.8.78.dfsg.orig/svg.c ++++ xcircuit-3.8.78.dfsg/svg.c +@@ -1109,12 +1109,12 @@ int xctcl_svg(ClientData clientData, Tcl + + if (locobjc >= 2) { + /* If there is a non-option argument, use it for the output filename */ +- sprintf(filename, Tcl_GetString(objv[1])); ++ sprintf(filename, "%s", Tcl_GetString(objv[1])); + } + else if (xobjs.pagelist[areawin->page]->pageinst->thisobject->name == NULL) +- sprintf(filename, xobjs.pagelist[areawin->page]->filename); ++ sprintf(filename, "%s", xobjs.pagelist[areawin->page]->filename); + else +- sprintf(filename, xobjs.pagelist[areawin->page]->pageinst->thisobject->name); ++ sprintf(filename, "%s", xobjs.pagelist[areawin->page]->pageinst->thisobject->name); + + pptr = strrchr(filename, '.'); + if (pptr != NULL) +--- xcircuit-3.8.78.dfsg.orig/tclxcircuit.c ++++ xcircuit-3.8.78.dfsg/tclxcircuit.c +@@ -3857,7 +3857,7 @@ int xctcl_object(ClientData clientData, + case NameIdx: + if (nidx == 1 || areawin->selects == 0) { + if (objc == 3) { +- sprintf(thisinst->thisobject->name, Tcl_GetString(objv[nidx + 2])); ++ sprintf(thisinst->thisobject->name, "%s", Tcl_GetString(objv[nidx + 2])); + checkname(thisinst->thisobject); + } + Tcl_AppendElement(interp, thisinst->thisobject->name); +@@ -7267,7 +7267,7 @@ int xctcl_page(ClientData clientData, Tc + + case LoadIdx: + TechReplaceSave(); +- sprintf(_STR2, Tcl_GetString(objv[2 + nidx])); ++ sprintf(_STR2, "%s", Tcl_GetString(objv[2 + nidx])); + for (i = 3 + nidx; i < objc; i++) { + argv = Tcl_GetString(objv[i]); + if ((*argv == '-') && !strncmp(argv, "-repl", 5)) { +@@ -7353,7 +7353,7 @@ int xctcl_page(ClientData clientData, Tc + + switch (importtype) { + case XCircuitIdx: +- sprintf(_STR2, Tcl_GetString(objv[3 + nidx])); ++ sprintf(_STR2, "%s", Tcl_GetString(objv[3 + nidx])); + for (i = 4; i < objc; i++) { + strcat(_STR2, ","); + strcat(_STR2, Tcl_GetString(objv[i + nidx])); +@@ -7370,7 +7370,7 @@ int xctcl_page(ClientData clientData, Tc + Tcl_SetObjResult(interp, objPtr); + return XcTagCallback(interp, objc, objv); + } +- sprintf(_STR2, Tcl_GetString(objv[3 + nidx])); ++ sprintf(_STR2, "%s", Tcl_GetString(objv[3 + nidx])); + if (savepage != pageno) newpage(pageno); + loadbackground(); + if (savepage != pageno) newpage(savepage); diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..5a99fb0 --- /dev/null +++ b/patches/series @@ -0,0 +1,4 @@ +01_remove_asg.patch +03_fix_lib_files.patch +04_fix_manpage.patch +05_fix_string_format.patch diff --git a/postinst b/postinst new file mode 100644 index 0000000..685a941 --- /dev/null +++ b/postinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +if [ "$1" = "configure" ]; then + if dpkg --compare-versions "$2" lt-nl "2.2.2-3"; then + rm -f /etc/X11/Xresources/XCircuit + fi +fi @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +# Move the app-defaults conffile. +if [ "$1" = "install" -o "$1" = "upgrade" ]; then + if dpkg --compare-versions "$2" lt-nl "2.2.2-3"; then + if [ -f /etc/X11/Xresources/XCircuit ]; then + mv /etc/X11/Xresources/XCircuit /etc/X11/app-defaults/XCircuit + fi + fi +fi @@ -0,0 +1,61 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +%: + dh $@ + +override_dh_auto_configure: + cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.guess config.guess + # Some touch-fu + touch --time=mtime -r configure.in Makefile.am + touch --time=mtime -r configure.in Makefile.in + touch --time=mtime -r configure.in configure + touch --time=mtime -r configure.in aclocal.m4 + touch --time=mtime -r configure.in Xw/Makefile.am + touch --time=mtime -r Xw/Makefile.am Xw/Makefile.in + dh_auto_configure -- --x-includes=/usr --with-tcl=/usr/lib \ + --with-tcllibs=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-tklibs=/usr/lib/$(DEB_HOST_MULTIARCH) + +override_dh_auto_build: + dh_auto_build -- \ + librarydir=/usr/share/xcircuit \ + exelibdir=/usr/lib/xcircuit \ + scriptsdir=/usr/share/xcircuit + +override_dh_auto_install: + $(MAKE) install \ + librarydir=/usr/share/xcircuit \ + exelibdir=/usr/lib/xcircuit \ + scriptsdir=/usr/share/xcircuit \ + appdefaultsdir=/etc/X11/app-defaults \ + appmandir=/usr/share/man/man1/ \ + DESTDIR=$(CURDIR)/debian/xcircuit + chmod a-x $(CURDIR)/debian/xcircuit/usr/share/xcircuit/console.tcl + chrpath -d $(CURDIR)/debian/xcircuit/usr/lib/xcircuit/xcircexec + +override_dh_installchangelogs: + dh_installchangelogs CHANGES + +override_dh_compress: + dh_compress --exclude examples/ + +override_dh_auto_test: + +TMP=get-orig-source-tmp +get-orig-source: + rm -rf $(TMP) + mkdir $(TMP) + uscan --download --no-symlink --destdir $(TMP) + cd $(TMP) && tar xf xcircuit*.tgz && \ + rm xcircuit*.tgz && \ + rm -r */asg && \ + rm -f */spiceparser/example && \ + VERSION=`ls -d xcircuit*` && \ + tar cfj ../$$VERSION.dfsg.tar.bz2 $$VERSION + rm -rf $(TMP) diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) @@ -0,0 +1,3 @@ +version=3 +opts="dversionmangle=s/\.dfsg$//" \ +http://opencircuitdesign.com/xcircuit/archive/xcircuit-(3\.7\..*)\.tgz diff --git a/xcircuit-icon.xpm b/xcircuit-icon.xpm new file mode 100644 index 0000000..da9f034 --- /dev/null +++ b/xcircuit-icon.xpm @@ -0,0 +1,48 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"27 32 10 1", +" c #7f7f00", +". c #666667", +"X c gray50", +"o c red", +"O c yellow", +"+ c gray60", +"@ c #b2b2b2", +"# c gray80", +"$ c gray90", +"% c white", +/* pixels */ +"ooooooOooooo@oooooOoooooo+o", +"o$@#$##$O#$#@#@###$#@@%$@##", +"+###@@#$@$@##+#$+#$@+@#$O$$", +"o+O+O++@o++@O@++o+O@O+@@+o@", +"o @%$$$%%%%%%%%$%%%%%$%%%%%", +"oo@$@%$@%@.$%%%%%%%%%%%$#%$", +"++@$X@@#@X#+$#%$%#%%%%@@X%$", +"oo@%%.@%.%%%#+XX+++##@+#+%$", +"oo#%#X.$@+$#$++$X%@@@@+#+%$", +"+O@%X$#+$X.##.@%#.@+X#X#+#$", +"oX@$%%%%%%%%%%%%%%%%%%%%%%$", +"oo@%#X$%%%$%%%%$$%%%%$%%%%$", +"o++$#@+@%%%%%%%%%%%%%$%%%%$", +"oO@%#@%@+@%#%%%@$#%@%%%%%%$", +"oo+@X@$%%@.X++#.+.+X++.@++#", +"X@@#+#%%@@@+##X#.$.$#@X####", +"o @%##$+@$%%%%%%%%%%%$@%%%$", +"oo@$@.@$%%%$%%%%%%%%%#@%%%$", +"++@$$#%%%%$%%%%$%%%$$#+$$%$", +"oo@%%%#%$%$$%$%$$$%$++++@$$", +"oX@$%%%%%%%%%%%$%%%$@++@#%$", +"OX@$%$$%%%$%%%%%%%%$$$+$$%$", +"o+@$%%$%%%%%%%%%$%%%%#@%%%$", +"oo@$%%%%%%%%%%%$%%%%%$@%%%$", +"o++$$$$$%%#$%$%$$%$$@@X@@$$", +"oO@%%$%%$%$%%%%%$%%$@++@#%$", +"o+@$%%$%%%%$%%%$%%%%$@@$%$$", +"X @$%%%%%%%%%%%%%%%%%$@%%%%", +"o#o++@+++++@@#+++#@+@++@@@+", +"o@@+oX oXoo ooo+o oXoo o o", +"o#o@++@+O+o+@O+O@O@@O+++@O+", +"o# +@+O@@#+#$$##########$$#" +}; |