--- Begin Message ---
Hi,
I have uploaded a new release of xcircuit to the DELAYED queue (8 days).
The diff since the previous version is below (only the Debian folder).
Please see
https://www.debian.org/doc/manuals/developers-reference/ch05.en.html#ps-guidelines
for details regarding the Package Salvaging process.
Best regards
Ruben
diff --git a/debian/README.sources b/debian/README.source
similarity index 61%
rename from debian/README.sources
rename to debian/README.source
index 215ca8f..3bcd3e9 100644
--- a/debian/README.sources
+++ b/debian/README.source
@@ -9,3 +9,8 @@ directory and repackage.
--
Roland Stigge <[email protected]>, Thu, 11 Aug 2011 21:44:22 +0200
+
+
+Also a few auto-generated files have been deleted upon repackaging since they
+cause build trouble or lintian errors. See debian/copyright "Files-Excluded"
+for details.
diff --git a/debian/changelog b/debian/changelog
index aab00c0..5fe16ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+xcircuit (3.9.73+dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #909520)
+ * Salvage package by adopting into the Debian Electronics team
+ (Closes: #909678)
+ * debian/changelog: Remove some unneeded whitespaces reported by Lintian.
+ * debian/control:
+ - Change Maintainer / Uploaders
+ - debhelper >= 11
+ - Change formatting
+ - New standards version 4.2.1 - no changes
+ - Vcs URLs added
+ - Priority is optional
+ * debian/copyright:
+ - Set Format field to the officially valid field
+ - Change formatting to please lintian
+ - Added copyright information for a few more files
+ - List a few excluded files to be excluded when repackaging DFSG compliant
+ tarball
+ * debian/gbp.conf: To enforce pristine-tar
+ * debian/patches:
+ - Refreshed patches
+ - Spelling fixes
+ * debian/rules:
+ - Enable some hardening
+ - Drop get-orig-source target
+ - Remove unneeded commands in override_dh_auto_configure
+ - Set "--with autoreconf"
+ * debian/watch:
+ - Update to point to stable release series (Closes: #909515)
+
+ -- Ruben Undheim <[email protected]> Thu, 01 Nov 2018 23:32:47 +0100
+
xcircuit (3.8.78.dfsg-1) unstable; urgency=medium
* New upstream release
@@ -187,7 +220,7 @@ xcircuit (3.6.135.dfsg-1) unstable; urgency=high
+ 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
+ + Fixed debian/rules so that config.sub and config.guess differences
aren't shipped.
* Made debian/copyright a machine parsable file.
@@ -207,7 +240,7 @@ xcircuit (3.6.130.dfsg-1) unstable; urgency=low
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
+ * 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.
@@ -222,13 +255,13 @@ xcircuit (3.6.78.dfsg-1) unstable; urgency=low
* 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)
+ * Added extra menu entry for Apps/Technical (Closes: #128764)
-- Margarita Manterola <[email protected]> Wed, 6 Dec 2006 11:11:48 -0300
xcircuit (3.6.24-1) unstable; urgency=low
- * QA Upload
+ * QA Upload
* New Upstream Version (Closes: #266080, #262321)
* Update debian/copyright
* debian/{menu, install}:
@@ -349,7 +382,7 @@ xcircuit (2.5.5rev0-1) unstable; urgency=low
xcircuit (2.5.3rev0-1) unstable; urgency=low
- * New upstream release.
+ * New upstream release.
-- David Z Maze <[email protected]> Sat, 5 Jan 2002 19:37:48 -0500
@@ -479,7 +512,7 @@ xcircuit (2.0b1-1) unstable; urgency=low
xcircuit (2.0a11-1) unstable; urgency=low
- * new upstream source:
+ * new upstream source:
* closes: #34966, #37019, #41834
-- Dale Scheetz <[email protected]> Tue, 9 Nov 1999 18:33:45 -0500
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index ea3bf6b..cc77e42 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,23 @@
Source: xcircuit
Section: electronics
-Priority: extra
-Maintainer: Margarita Manterola <[email protected]>
-Uploaders: Roland Stigge <[email protected]>
-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
+Priority: optional
+Maintainer: Debian Electronics Team
<[email protected]>
+Uploaders: Ruben Undheim <[email protected]>
+Build-Depends: debhelper (>= 11),
+ libx11-dev,
+ libxpm-dev,
+ libxt-dev,
+ x11proto-core-dev,
+ tcl-dev (>= 8.6.0+6),
+ tk-dev (>= 8.6.0+6),
+ chrpath,
+ libcairo2-dev
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/electronics-team/xcircuit
+Vcs-Git: https://salsa.debian.org/electronics-team/xcircuit.git
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
diff --git a/debian/copyright b/debian/copyright
index 9a0a9c9..ad833dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,105 +1,110 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Author: R. Timothy Edwards.
Packaged-By: Margarita Manterola <[email protected]>
Original-Source-Location: http://opencircuitdesign.com/xcircuit/
+Files-Excluded: asg
+ Makefile
+ Makefile.in
+ Xw/Makefile
+ Xw/Makefile.in
+ spiceparser/Makefile
+ spiceparser/Makefile.in
+ config.status
+ spiceparser/example
Files: *
-Copyright:
- Copyright 2002-2003, Tim Edwards, Johns Hopkins University.
- Copyright 2004-2005, Tim Edwards, MultiGiG, Inc.
+Copyright: 1993-2016, Tim Edwards
+ 2002-2003, Tim Edwards, Johns Hopkins University
+ 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 <[email protected]>
- Copyright 2006, Michael Ablassmeier <[email protected]>
- Copyright 2006, Andrew Pollock <[email protected]>
- Copyright 2006, Amaya Rodrigo Sastre <[email protected]> and
- Justin Pryzby <[email protected]>
- Copyright 2001-2003, David Z Maze <[email protected]>
- Copyright 1998-2000, Dale Scheetz <[email protected]>
+Copyright: 2018, Ruben Undheim <[email protected]>
+ 2006-2008, Margarita Manterola <[email protected]>
+ 2006, Michael Ablassmeier <[email protected]>
+ 2006, Andrew Pollock <[email protected]>
+ 2006, Amaya Rodrigo Sastre <[email protected]> and Justin Pryzby
<[email protected]>
+ 2001-2003, David Z Maze <[email protected]>
+ 1998-2000, Dale Scheetz <[email protected]>
License: GPL-2+
+Comment:
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.
+Files: flate.c
+Copyright: 2003-2004, Sergei Gerasenko.
License: GPL-2
+Comment:
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.
+Copyright: 1998 Chow Seong Hwai, Leeds University, U.K.
+ 2004 Tim Edwards, Johns Hopkins University, MultiGiG, Inc., and
Open Circuit Design, Inc.
+ 2005 Tim Edwards, MultiGiG, Inc.
License: GPL-2+
Files: lib/tcl/mousehint.tcl
-Copyright: Copyright 2006, James Vernon March
+Copyright: 2006, James Vernon March
License: GPL-2+
Files: lib/tcl/panzoom.tcl
-Copyright: Copyright 2003, Ed Casas
+Copyright: 2003, Ed Casas
License: GPL-2+
Files: lib/tcl/tkcon.tcl
-Copyright: Copyright 1995-2001, Jeffrey Hobbs
+Copyright: 1995-2001, Jeffrey Hobbs
License: GPL-2+
Files: spiceparser/*
-Copyright: Copyright 2003, Conrad Ziesler
+Copyright: 2003, Conrad Ziesler
License: GPL-2+
Files: spiceparser/xcircspice.c
-Copyright:
- Copyright 2003, Conrad Ziesler.
- Copyright 2004-2008, Tim Edwards.
+Copyright: 2003, Conrad Ziesler.
+ 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.
+Copyright: 1988 Hewlett-Packard Company
+ 1988 Massachusetts Institute of Technology
+License: X_widgets
+
+Files: Xw/Display.c
+ Xw/MapEvents.c
+ Xw/SourceStr.c
+ Xw/sub.c
+ Xw/TextEdit.c
+Copyright: 1988 Hewlett-Packard Company
+ 1987,1988 Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts
+License: X_widgets
+
+Files: utf8encodings.c
+Copyright: 1991-1999 Unicode, Inc.
+License: Unicode
+
+
+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.
.
- 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.
+ On Debian Systems, a copy of this license agreement can be found in:
+ /usr/share/common-licenses/GPL-2
+
+
+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; version 2 of the License
.
- This is included as part "X widgets" project.
+ On Debian Systems, a copy of this license agreement can be found in:
+ /usr/share/common-licenses/GPL-2
+
-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
+License: X_widgets
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
@@ -118,3 +123,19 @@ License: other
SOFTWARE.
.
This is included as part "X widgets" project.
+
+
+License: Unicode
+ This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+ No claims are made as to fitness for any particular purpose. No
+ warranties of any kind are expressed or implied. The recipient
+ agrees to determine applicability of information provided. If this
+ file has been provided on optical media by Unicode, Inc., the sole
+ remedy for any claim will be exchange of defective media within 90
+ days of receipt.
+ .
+ Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form for
+ internal or external distribution as long as this notice remains
+ attached.
diff --git a/debian/docs b/debian/docs
index 0b5faeb..6ea794d 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,3 @@
README
-README.ISOLatin2
README.Tcl
README.notes
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/install b/debian/install
index 44f4da3..2ac1947 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1 @@
debian/xcircuit-icon.xpm usr/share/pixmaps/xcircuit/
-tutorial usr/share/doc/xcircuit/
diff --git a/debian/patches/0005-Remove-asg.patch
b/debian/patches/0005-Remove-asg.patch
new file mode 100644
index 0000000..c1b7c29
--- /dev/null
+++ b/debian/patches/0005-Remove-asg.patch
@@ -0,0 +1,50 @@
+From: Ruben Undheim <[email protected]>
+Date: Sat, 20 Oct 2018 18:00:30 +0200
+Subject: Remove asg
+
+---
+ Makefile.am | 3 ---
+ configure.in | 2 +-
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c82c065..3453db0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -263,7 +263,6 @@ install-tcl: xcircexec$(EXEEXT)
lib/$(INTERP_PATH)/$(WRAPPER_OBJ) lib/$(INTERP_P
+
+ 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)
+@@ -273,7 +272,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)
+@@ -293,7 +291,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)
+diff --git a/configure.in b/configure.in
+index a11d817..b9826c0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1136,7 +1136,7 @@ AC_SUBST(AUTOCONF)
+ AC_SUBST(AUTOMAKE)
+ AC_SUBST(AUTOHEADER)
+
+-AC_OUTPUT(Makefile Xw/Makefile asg/Makefile spiceparser/Makefile)
++AC_OUTPUT(Makefile Xw/Makefile spiceparser/Makefile)
+
+ echo ""
+ echo "Configuration results:"
diff --git a/debian/patches/0005-Spelling-fixes.patch
b/debian/patches/0005-Spelling-fixes.patch
new file mode 100644
index 0000000..224ca20
--- /dev/null
+++ b/debian/patches/0005-Spelling-fixes.patch
@@ -0,0 +1,141 @@
+From: Ruben Undheim <[email protected]>
+Date: Thu, 1 Nov 2018 22:24:54 +0100
+Subject: Spelling fixes
+
+---
+ README.Tcl | 2 +-
+ files.c | 2 +-
+ lib/xcircuit.1.in | 6 +++---
+ netlist.c | 2 +-
+ ngspice.c | 4 ++--
+ undo.c | 4 ++--
+ xcircuit.c | 2 +-
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/README.Tcl b/README.Tcl
+index 9a78bc7..1e4947b 100644
+--- a/README.Tcl
++++ b/README.Tcl
+@@ -14,7 +14,7 @@ A. Elements: Main command to create and manipulate objects.
"element" is
+ <handle> can also be the keyword "selected", in which case it
+ implies all selected elements. The <handle> is represented as a
+ new Tcl type called "handle", and has an "H" followed by an 8-digit
+- hexidecimal number. This distinguishes it from integers and
++ hexadecimal number. This distinguishes it from integers and
+ allows the command line to be parsed correctly. It also discourages
+ the practice of manipulating handles, as arithmetic cannot be
+ performed directly on handle types.
+diff --git a/files.c b/files.c
+index 5678ec7..415fddb 100644
+--- a/files.c
++++ b/files.c
+@@ -2682,7 +2682,7 @@ void readlabel(objectptr localdata, char *lineptr,
stringpart **strhead)
+ }
+ /* To-do: replace old-style backspace with tab stop */
+ else if (!strcmp(cmdptr, "bs")) {
+- Wprintf("Warning: Obsolete backspace command ommitted in text");
++ Wprintf("Warning: Obsolete backspace command omitted in text");
+ }
+ else if (!strcmp(cmdptr, "Kn")) { /* "Kern" command */
+ int kx, ky;
+diff --git a/lib/xcircuit.1.in b/lib/xcircuit.1.in
+index d579905..e194a0d 100644
+--- a/lib/xcircuit.1.in
++++ b/lib/xcircuit.1.in
+@@ -135,7 +135,7 @@ The snap-to grid is an all-important feature for circuit
drawing,
+ wherein it is critical that elements line up properly with one another.
+ In \fIxcircuit\fP, there is no way to get off the snap-to grid except by
+ turning the snap function off and physically pushing elements off
+-the grid. Generally, it is most convenient to leave the snap functon
++the grid. Generally, it is most convenient to leave the snap function
+ on and use key macros "+" and "-" to double/halve it as necessary.
+ In any case, objects can always be returned to the snap grid with
+ the "snap" function (key macro "S").
+@@ -265,7 +265,7 @@ Print a help page summary of commands
+ .B a
+ Arc. Center is fixed at the initial position of the cursor.
+ The mouse position changes the radius of the circle.
+-In snap-to mode the arc boundry will pass through the snap point
++In snap-to mode the arc boundary will pass through the snap point
+ closest to the cursor. Mouse button 1 cycles from controlling
+ the radius to controlling the starting point, the ending point,
+ and separately controlling the minor axis to create ellipse.
+@@ -632,7 +632,7 @@ necessary to implement them cause slow rendering on
+ a printer or PostScript previewer. Due to the
+ device-dependent nature of the routines, patterns
+ will look abnormally large on PostScript previewers.
+-This transparancy feature has been added with the
++This transparency feature has been added with the
+ expectation that most circuit schematics will not
+ rely heavily upon halftoning. Complicated color
+ patterns can be created using transparent colored,
+diff --git a/netlist.c b/netlist.c
+index e573959..e8c09e8 100644
+--- a/netlist.c
++++ b/netlist.c
+@@ -6063,7 +6063,7 @@ void freepcb(struct Ptab *ptable)
+ /*----------------------------------------------------------------------*/
+ /* Remove an element from the netlist. This is necessary when an */
+ /* element is deleted from the object, so that the netlist does not */
+-/* refer to a nonexistant element, or try to perform netlist function */
++/* refer to a nonexistent element, or try to perform netlist function */
+ /* on it. */
+ /* */
+ /* Return True or False depending on whether a pin was "orphaned" on */
+diff --git a/ngspice.c b/ngspice.c
+index 5efcf33..3c43ba0 100644
+--- a/ngspice.c
++++ b/ngspice.c
+@@ -503,7 +503,7 @@ int xctcl_spice(ClientData clientData, Tcl_Interp *interp,
+
+ case RunIdx:
+ if (spice_state != SPICE_READY) {
+- Tcl_SetResult(interp, "Spice process busy or nonexistant", NULL);
++ Tcl_SetResult(interp, "Spice process busy or nonexistent", NULL);
+ return TCL_ERROR;
+ }
+
+@@ -633,7 +633,7 @@ process_result:
+
+ case ResumeIdx:
+ if (spice_state != SPICE_READY) {
+- Tcl_SetResult(interp, "Spice process busy or nonexistant", NULL);
++ Tcl_SetResult(interp, "Spice process busy or nonexistent", NULL);
+ return TCL_ERROR;
+ }
+ resume_spice();
+diff --git a/undo.c b/undo.c
+index 67fa1da..4e34470 100644
+--- a/undo.c
++++ b/undo.c
+@@ -709,7 +709,7 @@ short undo_one_action()
+
+ /* Set window, if event occurred in a different window */
+ if (setwindow(thisrecord->window) == FALSE) {
+- Wprintf("Error: Undo event in nonexistant window! Flushing stack.\n");
++ Wprintf("Error: Undo event in nonexistent window! Flushing stack.\n");
+ flush_undo_stack();
+ return 0;
+ }
+@@ -1185,7 +1185,7 @@ short redo_one_action()
+
+ /* Set window, if event occurred in a different window */
+ if (setwindow(thisrecord->window) == FALSE) {
+- Wprintf("Error: Undo event in nonexistant window! Flushing stack.\n");
++ Wprintf("Error: Undo event in nonexistent window! Flushing stack.\n");
+ flush_undo_stack();
+ return 0;
+ }
+diff --git a/xcircuit.c b/xcircuit.c
+index c7cfe73..f59704b 100644
+--- a/xcircuit.c
++++ b/xcircuit.c
+@@ -1281,7 +1281,7 @@ nexthier:
+ if (interp != NULL) {
+ Tcl_ResetResult(interp);
+ Tcl_AppendToObj(Tcl_GetObjResult(interp),
+- "handle is identified by leading H and hexidecimal value only",
-1);
++ "handle is identified by leading H and hexadecimal value only",
-1);
+ }
+ free_stack(&newstack);
+ return TCL_ERROR;
diff --git a/debian/patches/01_remove_asg.patch
b/debian/patches/01_remove_asg.patch
deleted file mode 100644
index a70ae53..0000000
--- a/debian/patches/01_remove_asg.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Remove ASG from build
-Author: Margarita Manterola <[email protected]>
-
---- 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/debian/patches/03_fix_lib_files.patch
b/debian/patches/03_fix_lib_files.patch
index 191c4cc..1a688c5 100644
--- a/debian/patches/03_fix_lib_files.patch
+++ b/debian/patches/03_fix_lib_files.patch
@@ -1,9 +1,17 @@
Description: Fix for FHS compliant file locations
Author: Margarita Manterola <[email protected]>
---- xcircuit-3.8.78.dfsg.orig/Makefile.am
-+++ xcircuit-3.8.78.dfsg/Makefile.am
-@@ -65,6 +65,9 @@ tmpdir = /tmp
+---
+ Makefile.am | 21 +++++++++++++--------
+ lib/tcl/xcircuit.sh.in | 4 +++-
+ lib/tcl/xcircuit.tcl.in | 12 +++++++++---
+ 3 files changed, 25 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f29e863..c82c065 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,6 +34,9 @@ tmpdir = /tmp
appdefaultsdir = $(libdir)/$(PACKAGE)-$(VERSION)/app-defaults
appmandir = $(libdir)/$(PACKAGE)-$(VERSION)/man
@@ -13,7 +21,7 @@ Author: Margarita Manterola <[email protected]>
PATHNAMES = -DPROG_VERSION=$(VERSION) \
-DPROG_REVISION=$(REVISION) \
-DCAD_DIR=\"$(libdir)\" \
-@@ -146,6 +149,7 @@ CONSOLE_SCRIPT = console.tcl
+@@ -164,6 +167,7 @@ tcl:
lib/$(INTERP_PATH)/$(WRAPPER_SH): lib/$(INTERP_PATH)/$(WRAPPER_SH).in
sed -e '/XCLIBDIR/s#XCLIBDIR#$(librarydir)#' \
@@ -21,7 +29,7 @@ Author: Margarita Manterola <[email protected]>
-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/$(
+@@ -175,7 +179,7 @@ lib/$(INTERP_PATH)/$(WRAPPER_SH):
lib/$(INTERP_PATH)/$(WRAPPER_SH).in
chmod 0755 $@
lib/$(INTERP_PATH)/$(WRAPPER_INIT): lib/$(INTERP_PATH)/$(WRAPPER_INIT).in
@@ -30,7 +38,7 @@ Author: Margarita Manterola <[email protected]>
-e '/SCRIPTSDIR/s#SCRIPTSDIR#$(scriptsdir)#' \
lib/$(INTERP_PATH)/$(WRAPPER_INIT).in > $@
chmod 0755 $@
-@@ -211,19 +215,20 @@ install-tcl: xcircexec$(EXEEXT) lib/$(IN
+@@ -229,19 +233,20 @@ install-tcl: xcircexec$(EXEEXT)
lib/$(INTERP_PATH)/$(WRAPPER_OBJ) lib/$(INTERP_P
@echo "Installing standard XCircuit library files"
$(MAKE) $(AM_MAKEFLAGS) install-data-local
@echo "Installing Tcl files"
@@ -58,79 +66,10 @@ Author: Margarita Manterola <[email protected]>
$(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
+diff --git a/lib/tcl/xcircuit.sh.in b/lib/tcl/xcircuit.sh.in
+index d9800c2..d22bb6c 100755
+--- a/lib/tcl/xcircuit.sh.in
++++ b/lib/tcl/xcircuit.sh.in
@@ -6,7 +6,9 @@
#
@@ -149,8 +88,10 @@ Author: Margarita Manterola <[email protected]>
+ 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
+diff --git a/lib/tcl/xcircuit.tcl.in b/lib/tcl/xcircuit.tcl.in
+index 5eee0d6..db44646 100755
+--- a/lib/tcl/xcircuit.tcl.in
++++ b/lib/tcl/xcircuit.tcl.in
@@ -12,6 +12,11 @@ if {$envlibdir == {}} {
}
unset envlibdir
@@ -163,7 +104,7 @@ Author: Margarita Manterola <[email protected]>
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
+@@ -28,13 +33,14 @@ if {[string compare $tcl_platform(platform) "windows"] ==
0} {
}
set tcllibdir $path
diff --git a/debian/patches/04_fix_manpage.patch
b/debian/patches/04_fix_manpage.patch
index 4ed05c4..2845eab 100644
--- a/debian/patches/04_fix_manpage.patch
+++ b/debian/patches/04_fix_manpage.patch
@@ -2,9 +2,15 @@ Description: Manpage fix
This patch fixes a format problem in a table in the manpage
Author: Roland Stigge <[email protected]>
---- 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
+---
+ lib/xcircuit.1.in | 166 +++++++++++++++++++++++++++---------------------------
+ 1 file changed, 83 insertions(+), 83 deletions(-)
+
+diff --git a/lib/xcircuit.1.in b/lib/xcircuit.1.in
+index b59b986..d579905 100644
+--- a/lib/xcircuit.1.in
++++ b/lib/xcircuit.1.in
+@@ -1042,89 +1042,89 @@ follows, with their default values given:
.br
.sp
diff --git a/debian/patches/05_fix_string_format.patch
b/debian/patches/05_fix_string_format.patch
index d902ff7..c3bd053 100644
--- a/debian/patches/05_fix_string_format.patch
+++ b/debian/patches/05_fix_string_format.patch
@@ -3,9 +3,16 @@ Description: Fix sprintf() format strings
patch adds them.
Author: Roland Stigge <[email protected]>
---- 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
+---
+ svg.c | 6 +++---
+ tclxcircuit.c | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/svg.c b/svg.c
+index 3b155d1..5375cea 100644
+--- a/svg.c
++++ b/svg.c
+@@ -1133,12 +1133,12 @@ int xctcl_svg(ClientData clientData, Tcl_Interp
*interp,
if (locobjc >= 2) {
/* If there is a non-option argument, use it for the output filename */
@@ -21,9 +28,11 @@ Author: Roland Stigge <[email protected]>
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,
+diff --git a/tclxcircuit.c b/tclxcircuit.c
+index 6e49bba..62514d2 100644
+--- a/tclxcircuit.c
++++ b/tclxcircuit.c
+@@ -3876,7 +3876,7 @@ int xctcl_object(ClientData clientData, Tcl_Interp
*interp,
case NameIdx:
if (nidx == 1 || areawin->selects == 0) {
if (objc == 3) {
@@ -32,7 +41,7 @@ Author: Roland Stigge <[email protected]>
checkname(thisinst->thisobject);
}
Tcl_AppendElement(interp, thisinst->thisobject->name);
-@@ -7267,7 +7267,7 @@ int xctcl_page(ClientData clientData, Tc
+@@ -7356,7 +7356,7 @@ int xctcl_page(ClientData clientData, Tcl_Interp *interp,
case LoadIdx:
TechReplaceSave();
@@ -41,7 +50,7 @@ Author: Roland Stigge <[email protected]>
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
+@@ -7442,7 +7442,7 @@ int xctcl_page(ClientData clientData, Tcl_Interp *interp,
switch (importtype) {
case XCircuitIdx:
@@ -50,7 +59,7 @@ Author: Roland Stigge <[email protected]>
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
+@@ -7459,7 +7459,7 @@ int xctcl_page(ClientData clientData, Tcl_Interp *interp,
Tcl_SetObjResult(interp, objPtr);
return XcTagCallback(interp, objc, objv);
}
diff --git a/debian/patches/series b/debian/patches/series
index 5a99fb0..dd9f45f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-01_remove_asg.patch
03_fix_lib_files.patch
04_fix_manpage.patch
05_fix_string_format.patch
+0005-Remove-asg.patch
+0005-Spelling-fixes.patch
diff --git a/debian/rules b/debian/rules
index e69f51b..5ad03d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,21 +3,17 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
- dh $@
+ dh $@ --with autoreconf
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)
@@ -26,7 +22,7 @@ override_dh_auto_build:
dh_auto_build -- \
librarydir=/usr/share/xcircuit \
exelibdir=/usr/lib/xcircuit \
- scriptsdir=/usr/share/xcircuit
+ scriptsdir=/usr/share/xcircuit
override_dh_auto_install:
$(MAKE) install \
@@ -46,16 +42,3 @@ 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/debian/watch b/debian/watch
index 951583b..3b09a22 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=3
-opts="dversionmangle=s/\.dfsg$//" \
-http://opencircuitdesign.com/xcircuit/archive/xcircuit-(3\.7\..*)\.tgz
+opts=dversionmangle=s/([^\+]+)(?:\+dfsg.*)?/$1/,\
+oversionmangle=s/(.*)/$1+dfsg.1/ \
+http://opencircuitdesign.com/xcircuit/archive/xcircuit-(3\.9\.\d\S+)\.tgz
--- End Message ---
