--- ktechlab-0.3.orig/config.h.in +++ ktechlab-0.3/config.h.in @@ -123,22 +123,22 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of a `char *', as computed by sizeof. */ +/* The size of `char *', as computed by sizeof. */ #undef SIZEOF_CHAR_P -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* Define to 1 if you have the ANSI C header files. */ --- ktechlab-0.3.orig/debian/patches/00list +++ ktechlab-0.3/debian/patches/00list @@ -0,0 +1,3 @@ +10-arch-build +20-g++-4.1 +30-g++-4.2 --- ktechlab-0.3.orig/debian/patches/20-g++-4.1.dpatch +++ ktechlab-0.3/debian/patches/20-g++-4.1.dpatch @@ -0,0 +1,36 @@ +#!/bin/sh -e +## 20-g++-4.1.dpatch by Steffen Joeris +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Let ktechlab build with g++-4.1 + +if [ $# -lt 1 ]; then +echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" +exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- pic14.h.orig 2006-03-13 00:54:09.000000000 +0100 ++++ ktechlab-0.3/microbe/pic14.h 2006-03-13 00:54:56.000000000 +0100 +@@ -96,7 +96,7 @@ + Delay_50S = 4, + }; + +- PIC14::PIC14( Microbe * master, Type type ); ++ PIC14( Microbe * master, Type type ); + ~PIC14(); + + /** --- ktechlab-0.3.orig/debian/patches/30-g++-4.2.dpatch +++ ktechlab-0.3/debian/patches/30-g++-4.2.dpatch @@ -0,0 +1,63 @@ +#!/bin/sh -e +## 30-g++4.2.dpatch by Steffen Joeris +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS with gcc4.2 + +if [ $# -lt 1 ]; then +echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" +exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- itemdocument.h.orig 2007-01-08 23:19:02.000000000 +0100 ++++ ktechlab-0.3/src/itemdocument.h 2007-01-08 23:19:19.000000000 +0100 +@@ -112,7 +112,7 @@ + * (such as PIC/START) have restrictions, and can only have one instance of + * themselves on the canvas, and adds the operation to the undo list + */ +- virtual Item* addItem( const QString &id, const QPoint &p, bool newItem ) = 0l; ++ virtual Item* addItem( const QString &id, const QPoint &p, bool newItem ) = 0; + /** + * @returns A pointer to the canvas + */ +@@ -215,7 +215,7 @@ + * Set the given QCanvasItem (which will attempt to be casted to known + * items to be deleted. + */ +- virtual void appendDeleteList( QCanvasItem * ) = 0l; ++ virtual void appendDeleteList( QCanvasItem * ) = 0; + /** + * Save the current state of the document to the undo/redo history. + * @param actionTicket if this is non-negative, and the last state save +@@ -319,7 +319,7 @@ + * Enables / disables / selects various actions depending on + * what is selected or not. + */ +- virtual void slotInitItemActions( Item *item = 0l ); ++ virtual void slotInitItemActions( Item *item = 0 ); + /** + * Process queued events (see ItemDocument::ItemDocumentEvent). + */ +@@ -333,7 +333,7 @@ + /** + * Emitted when a Item is unselected + */ +- void itemUnselected( Item *item = 0l ); ++ void itemUnselected( Item *item = 0 ); + + protected: + /** --- ktechlab-0.3.orig/debian/patches/10-arch-build.dpatch +++ ktechlab-0.3/debian/patches/10-arch-build.dpatch @@ -0,0 +1,35 @@ +#!/bin/sh -e +## 10-arch-build.dpatch by Steffen Joeris +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Here we make ktechlab available for more archs then i386 and amd64 + +if [ $# -lt 1 ]; then +echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" +exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ktechlab-0.3/src/electronics/port.cpp.orig 2006-01-26 00:15:12.000000000 +0100 ++++ ktechlab-0.3/src/electronics/port.cpp 2006-01-26 00:15:19.000000000 +0100 +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + + //BEGIN class Port --- ktechlab-0.3.orig/debian/changelog +++ ktechlab-0.3/debian/changelog @@ -0,0 +1,55 @@ +ktechlab (0.3-7) unstable; urgency=low + + * Upload to unstable + + -- Steffen Joeris Tue, 08 May 2007 18:02:15 +1000 + +ktechlab (0.3-6) experimental; urgency=low + + * Expand 30-g++-4.2.dpatch to cover another compiler problem, + thanks to Martin Michlmayer (Closes: #394173) + * Change my maintainer address + + -- Steffen Joeris Tue, 9 Jan 2007 09:48:19 +0100 + +ktechlab (0.3-5) unstable; urgency=low + + * Add gpsim-dev to build-depends to get pic support working + (Closes: #357691) + * Add libgtk2.0-dev and libreadline5-dev to build-depends + * Upload sponsored by Petter Reinholdtsen. + + -- Steffen Joeris Fri, 29 Sep 2006 17:25:55 +1000 + +ktechlab (0.3-4) unstable; urgency=low + + * Now recommends gputils for other features + * Add 30-g++.dpatch to prevent FTBFS with g++-4.2 (Closes: #362208) + * Upload sponsored by Petter Reinholdtsen. + + -- Steffen Joeris Sat, 24 Jun 2006 14:03:05 +0200 + +ktechlab (0.3-3) unstable; urgency=low + + * Include patch to let ktechlab build with g++-4.1 + Thanks to Martin Michlmayr (Closes: #356611) + * Upload sponsored by Petter Reinholdtsen. + + -- Steffen Joeris Mon, 13 Mar 2006 00:57:32 +0100 + +ktechlab (0.3-2) unstable; urgency=low + + * remove include sys/io.h to let the package build + on other archs then i386 and amd64 (Closes: #349854) + * add dpatch to build-depends + * upload sponsored by Petter Reinholdtsen. + + -- Steffen Joeris Thu, 26 Jan 2006 00:21:36 +0100 + +ktechlab (0.3-1) unstable; urgency=low + + * Initial release (Closes: #308551) + * Upload sponsored by Petter Reinholdtsen. + + -- Steffen Joeris Thu, 12 Jan 2006 00:47:52 +0100 + --- ktechlab-0.3.orig/debian/compat +++ ktechlab-0.3/debian/compat @@ -0,0 +1 @@ +4 --- ktechlab-0.3.orig/debian/control +++ ktechlab-0.3/debian/control @@ -0,0 +1,17 @@ +Source: ktechlab +Section: kde +Priority: optional +Maintainer: Steffen Joeris +Build-Depends: debhelper (>= 4.0.0), autotools-dev, imagemagick, kdelibs4-dev, dpatch, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline5-dev +Standards-Version: 3.7.2 + +Package: ktechlab +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: gputils +Description: circuit simulator for microcontrollers and electronics + KTechlab is a circuit simulator with a nice, clickable and discoverable + interface. It supports many discrete components, logic circuits as well + as PIC programming in its own Basic dialect and some form of assembler. + . + Homepage: http://ktechlab.org/ --- ktechlab-0.3.orig/debian/debiandirs +++ ktechlab-0.3/debian/debiandirs @@ -0,0 +1,32 @@ +export kde_confdir=/etc/kde3 +export kde_prefix=/usr +export kde_bindir=/usr/bin +export kde_includedir=/usr/include/kde +export kde_libdir=/usr/lib +export kde_cgidir=/usr/lib/cgi-bin +export kde_moduledir=/usr/lib/kde3 +export kde_appsdir=/usr/share/applnk +export kde_datadir=/usr/share/apps +export kde_htmldir=/usr/share/doc/kde/HTML +export kde_icondir=/usr/share/icons +export kde_locale=/usr/share/locale +export kde_mimedir=/usr/share/mimelnk +export kde_servicesdir=/usr/share/services +export kde_servicetypesdir=/usr/share/servicetypes +export kde_sounddir=/usr/share/sounds +export kde_templatesdir=/usr/share/templates +export kde_wallpaperdir=/usr/share/wallpapers +export mandir=/usr/share/man +export infodir=/usr/share/info +export sysconfdir=/etc +export QTDIR=/usr/share/qt3 +export IDL=/usr/bin/cuteidl +export DCOPIDL=/usr/bin/dcopidl +export DCOPIDL2CPP=/usr/bin/dcopidl2cpp +export KDB2HTML=/usr/bin/kdb2html +export MCOPIDL=/usr/bin/mcopidl +export ARTSCCONFIG=/usr/bin/artsc-config +export INSTALL_DATA=install -p -c -m 644 +configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --sysconfdir=$(sysconfdir) --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama +configkdevelop=--disable-debug --disable-rpath --enable-docbase --enable-kdoc2 --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html --with-xinerama +configkdepim=--disable-debug --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama --- ktechlab-0.3.orig/debian/rules +++ ktechlab-0.3/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +-include debian/debiandirs + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +debian/debiandirs: admin/debianrules + perl -w admin/debianrules echodirs > debian/debiandirs + +debian/ktechlab.xpm: icons/hi32-app-ktechlab.png + convert $< $@ + +config.status: configure + dh_testdir + dpatch apply-all +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) + +build: build-stamp debian/ktechlab.xpm + +build-stamp: config.status + dh_testdir + + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + dpatch deapply-all + rm -rf debian/patched + -$(MAKE) distclean + rm -f config.log debian/ktechlab.xpm config.sub config.guess + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab + install -D -m 644 debian/ktechlab.xpm debian/ktechlab/usr/share/pixmaps/ktechlab.xpm + + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- ktechlab-0.3.orig/debian/manpages +++ ktechlab-0.3/debian/manpages @@ -0,0 +1,2 @@ +debian/ktechlab.1 +debian/microbe.1 --- ktechlab-0.3.orig/debian/copyright +++ ktechlab-0.3/debian/copyright @@ -0,0 +1,49 @@ +This package was debianized by Steffen Joeris on +Thu, 12 Jan 2006 00:47:52 +0100. + +It was downloaded from http://ktechlab.org/download/ + +Copyright Holder: David Saxton + Daniel Clarke + (Main Developers) + +Additional Copyright Holders: + Copyright (C) 1997 Martin Jones (mjones@kde.org) +Files: src/gui/colorcombo.h + + Copyright (C) 2005 by Fredy Yanardi +Files: src/electronics/components/magnitudecomparator.h + src/electronics/components/magnitudecomparator.cpp + + Copyright (C) 2005 by John Myers +Files: src/electronics/components/rotoswitch.h + src/electronics/components/rotoswitch.cpp + + Copyright (C) 2005 Christoph Cullmann +Files: src/katemdi.h + src/katemdi.cpp + + Copyright (C) 2002, 2003 Joseph Wenninger +Files: src/katemdi.h + src/katemdi.cpp + + Copyright (C) 2002 Simon Hausmann +Files: src/katemdi.cpp + + Copyright Anders Lund +Files: src/view.cpp + + +License: + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License, version 2 +or higher as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANDABILITY of FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- ktechlab-0.3.orig/debian/menu +++ ktechlab-0.3/debian/menu @@ -0,0 +1,6 @@ +?package(ktechlab):needs="X11" \ + section="Apps/Programming" \ + hints="KDE" \ + title="KTechLab" \ + command="/usr/bin/ktechlab" \ + icon="/usr/share/pixmaps/ktechlab.xpm" --- ktechlab-0.3.orig/debian/docs +++ ktechlab-0.3/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- ktechlab-0.3.orig/debian/ktechlab.1 +++ ktechlab-0.3/debian/ktechlab.1 @@ -0,0 +1,151 @@ +.\" This file was generated by kdemangen.pl +.TH KTECHLAB 1 "Jan 2006" "K Desktop Environment" "An IDE for microcontrollers and electronics" +.SH NAME +ktechlab +\- An IDE for microcontrollers and electronics +.SH SYNOPSIS +ktechlab [Qt\-options] [KDE\-options] [URL] +.SH DESCRIPTION +An IDE for microcontrollers and electronics +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B URL +Document to open. +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS KDE options: +.TP +.B \-\-caption +Use 'caption' as name in the titlebar +.TP +.B \-\-icon +Use 'icon' as the application icon +.TP +.B \-\-miniicon +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config +Use alternative configuration file +.TP +.B \-\-dcopserver +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style