--- klogic-1.5.orig/klogic/dlgPattern.cpp +++ klogic-1.5/klogic/dlgPattern.cpp @@ -323,7 +323,10 @@ int hier_cnt = 0; int hier; int hier_found; - int minx[maxhier], miny[maxhier], maxx[maxhier], maxy[maxhier]; + int* minx = new int[maxhier]; + int* miny = new int[maxhier]; + int* maxx = new int[maxhier]; + int* maxy = new int[maxhier]; int xrad, yrad; p.begin(this); @@ -424,4 +427,9 @@ } } p.end(); + + delete[] minx; + delete[] miny; + delete[] maxx; + delete[] maxy; } --- klogic-1.5.orig/klogic/tool.cpp +++ klogic-1.5/klogic/tool.cpp @@ -31,7 +31,7 @@ // static QString Tool::bitString(char byte, int len) -{ char ret[len + 1]; +{ char* ret = new char[len + 1]; for(int i = 0; i < len; i++) { if (byte & Tool::pow2(i)) { @@ -41,6 +41,9 @@ } } ret[len] = 0; - return QString(ret); + + QString result = QString(ret); + delete[] ret; + return result; } --- klogic-1.5.orig/klogic/deviceMatrix.h +++ klogic-1.5/klogic/deviceMatrix.h @@ -229,7 +229,7 @@ // resize input id array; create temp array if (m_matrix_input_size != deviceSize - 1) { if (m_matrix_input_size) { - int tmp_arry[m_matrix_input_size]; + tmp_arry = new int[m_matrix_input_size]; for (int i = 0; i < m_matrix_input_size; i++) tmp_arry[i] = m_matrix_input[i]; tmp_size = m_matrix_input_size; @@ -256,6 +256,9 @@ // (re)create equations for the (new) input connectors setEquation(); parseEquation(); + + if (tmp_size) + delete [] tmp_arry; } char *matrixMem; --- klogic-1.5.orig/klogic/symbolOpStack.cpp +++ klogic-1.5/klogic/symbolOpStack.cpp @@ -371,7 +371,7 @@ // insecure method: could cause glitches in cause of different delays of the gates // remove all groups contained in n other groups // beginning with the smallest groups - int all_grp[pattern_cnt * group_cnt]; + int* all_grp = new int[pattern_cnt * group_cnt]; int all_grp_cnt = 0; for (i = 1; i < input_cnt; i++) { current_group_size = Tool::pow2(i); @@ -412,6 +412,7 @@ } else j++; } } + delete[] all_grp; } // ****** at least add single groups, hopefully some lost bits ****** --- klogic-1.5.orig/klogic/mainw.cpp +++ klogic-1.5/klogic/mainw.cpp @@ -84,7 +84,7 @@ /* methods of class MainWidget */ /***************************************************/ MainWidget::MainWidget(KApplication *_app, const char *file) - :KMainWindow(NULL) + :KMainWindow((QWidget*)NULL) { app = _app; setPATH(app); --- klogic-1.5.orig/klogic/klogic.desktop +++ klogic-1.5/klogic/klogic.desktop @@ -3,7 +3,7 @@ Type=Application Exec=klogic -caption "%c" %i %m Icon=klogic.png -MiniIcon=klogic.png +MiniIcon=klogic.xpm DocPath=klogic/index.html Comment= Comment[de]= --- klogic-1.5.orig/debian/changelog +++ klogic-1.5/debian/changelog @@ -0,0 +1,65 @@ +klogic (1.5-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Avoid build problem on 64-bit archs. (Closes: #246447) + + -- Petter Reinholdtsen Sat, 5 Jun 2004 20:13:46 +0200 + +klogic (1.5-5) unstable; urgency=low + + * Added build-dep on kdelibs-bin for meinproc. + * Use supplied klogic.desktop file for KDE to ensure docs are found. + (closes: #213027) + * Changed klogic.desktop to use klogic.xpm not klogic.png (which + does not exist). + * Bumped standards-version to 3.6.1.0 + + -- Chris Boyle Sun, 21 Mar 2004 17:03:53 +0000 + +klogic (1.5-4) unstable; urgency=low + + * Fix FTBFS with paranoid options, thanks Ronald Stigge + (closes: #221059) + + -- Chris Boyle Sun, 14 Dec 2003 17:48:42 +0000 + +klogic (1.5-3) unstable; urgency=low + + * Set kderemove="", to *really* make a menu item. Shame on me for not + checking properly. (closes: #199482) (still open due to next item) + * Frobbed pbuilder so it doesn't mangle my Maintainer field and make + everything think this is an NMU! + * Removed examples/Makefile, which was being added by the debian diff. + How did *that* get there... + + -- Chris Boyle Wed, 9 Jul 2003 08:05:27 +0100 + +klogic (1.5-2) unstable; urgency=low + + * Set kderemove=0 in debian/menu, since on closer inspection, upstream + has chosen not to install the .desktop file in the source (perhaps + since there isn't klogic.png or something). (closes: #199482) + + -- Chris Boyle Mon, 7 Jul 2003 23:21:49 +0100 + +klogic (1.5-1) unstable; urgency=low + + * New maintainer. (closes: #178907) + - The "yay at last all my (1st year) exams are over!" release. + * New upstream version. + * New policy version. (3.5.10, was 3.5.2) + * Added support for DEB_BUILD_OPTIONS. + * Changed section from utils to electronics. + * Changed menu section from Apps/Tools to Apps/Science. + * Building with pbuilder. This is good, I shouldn't get any missing + build-deps at all. :-) + * Added Build-Depends: kdelibs4-dev (>= 4:3.1.2-2), docbook-to-man + + -- Chris Boyle Sun, 15 Jun 2003 20:23:35 +0100 + +klogic (1.3-1) unstable; urgency=low + + * Initial Release. + + -- Matthias Kaehlcke Thu, 18 Oct 2001 18:26:37 +0200 + --- klogic-1.5.orig/debian/dirs +++ klogic-1.5/debian/dirs @@ -0,0 +1,2 @@ +usr/bin + --- klogic-1.5.orig/debian/rules +++ klogic-1.5/debian/rules @@ -0,0 +1,100 @@ +#!/usr/bin/make -f +# Based on sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + COMPILER_FLAGS += CFLAGS="-O0 -g -Wall" +else + COMPILER_FLAGS += CFLAGS="-O2 -g -Wall" +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # configure the package + $(COMPILER_FLAGS) \ + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # compile the package + $(MAKE) + /usr/bin/docbook-to-man debian/klogic.sgml > klogic.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # clean up after the build process. + -$(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # install the package into debian/klogic. + $(MAKE) install prefix=$(CURDIR)/debian/klogic/usr + mkdir -p debian/klogic/usr/share/applnk/Edutainment/Science + cp klogic/klogic.desktop debian/klogic/usr/share/applnk/Edutainment/Science/ + mkdir -p debian/klogic/usr/share/icons/locolor/32x32 + cp pics/klogic.xpm debian/klogic/usr/share/icons/locolor/32x32 + +# Build architecture-independent files +binary-indep: build install +# nothing to do + +# Build architecture-dependent files +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron + dh_installman klogic.1 +# dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + mkdir $(CURDIR)/debian/klogic/usr/share/doc/kde + mv $(CURDIR)/debian/klogic/usr/share/doc/HTML $(CURDIR)/debian/klogic/usr/share/doc/kde + rm $(CURDIR)/debian/klogic/usr/share/doc/kde/HTML/en/klogic/common + rm $(CURDIR)/debian/klogic/usr/share/doc/klogic/changelog + dh_link +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + dh_strip +endif + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- klogic-1.5.orig/debian/menu +++ klogic-1.5/debian/menu @@ -0,0 +1,8 @@ +?package(klogic):\ + needs=x11\ + section=Apps/Science\ + hints="KDE"\ + title="KLogic"\ + icon="/usr/share/icons/klogic/klogic.xpm"\ + kderemove="1"\ + command="/usr/bin/klogic" --- klogic-1.5.orig/debian/klogic.sgml +++ klogic-1.5/debian/klogic.sgml @@ -0,0 +1,185 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + --> + + + Matthias"> + Kaehlcke"> + + October 18, 2001"> + + 1"> + matthias.kaehlcke@gmx.net"> + + KLOGIC"> + + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2001 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + building and simulating digital circuits + + + + &dhpackage; + + + + + + + + DESCRIPTION + + &dhpackage; is an application for building and simulating digital circuits easily. It provides an easy way for building circuits containing standard components like AND, OR, XOR and flipflops like RS and JK. To build more complex and reuseable circuits, you can create sub circuits. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + + + OPTIONS + + These programs follow the usual GNU command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + Show help about options + + + + + + + Show Qt specific options + + + + + + + Show KDE specific options + + + + + + + Show all options + + + + + + + Show author information + + + + + + + + Show version of program + + + + + + + Show license information + + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under the + terms of the GNU Free Documentation License, + Version 1.1 or any later version published by the Free Software + Foundation; with no Invariant Sections, no Front-Cover Texts and + no Back-Cover Texts. + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- klogic-1.5.orig/debian/copyright +++ klogic-1.5/debian/copyright @@ -0,0 +1,15 @@ +This package was debianized by Matthias Kaehlcke on +Thu, 18 Oct 2001 18:26:37 +0200. +It is now maintained by Chris Boyle . + +It was downloaded from http://www.a-rostin.de/klogic/ + +Upstream Author: Andreas Rostin andreas@a-rostin.de + +Copyright: This software is copyright (c) 2001 by Andreas Rostin + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + --- klogic-1.5.orig/debian/control +++ klogic-1.5/debian/control @@ -0,0 +1,23 @@ +Source: klogic +Section: electronics +Priority: optional +Maintainer: Chris Boyle +Build-Depends: debhelper (>> 3.0.0), kdelibs4-dev (>= 4:3.1.2-2), kdelibs-bin (>= 4:3.1.2-2), docbook-to-man +Standards-Version: 3.6.1.0 + +Package: klogic +Architecture: any +Depends: ${shlibs:Depends} +Description: digital circuit editor and simulator for KDE + KLogic is an application for building and simulating digital circuits + easily. + . + It provides an easy way to build circuits containing standard + components like AND, OR, XOR and flipflops like RS and JK. To build + more complex and reuseable circuits, you can create sub-circuits. + . + The simulation runs permanently by default while building your + circuits. For extended testing you can use a single stepping simulation + to recognise peaks. You can display the signal flow of the components + of a circuit as a graph. Each device of your circuit has a tuneable + delay. With the burst option the delay of all devices can be disabled. --- klogic-1.5.orig/debian/klogic.links +++ klogic-1.5/debian/klogic.links @@ -0,0 +1 @@ +/usr/share/doc/kde/HTML/en/common /usr/share/doc/kde/HTML/en/klogic/common --- klogic-1.5.orig/debian/docs +++ klogic-1.5/debian/docs @@ -0,0 +1 @@ +AUTHORS