diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 311 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 32 | ||||
-rw-r--r-- | debian/copyright | 51 | ||||
-rw-r--r-- | debian/oregano.1 | 43 | ||||
-rw-r--r-- | debian/oregano.README.Debian | 10 | ||||
-rw-r--r-- | debian/oregano.examples | 1 | ||||
-rw-r--r-- | debian/oregano.install | 1 | ||||
-rw-r--r-- | debian/oregano.manpages | 1 | ||||
-rw-r--r-- | debian/patches/0007-Update-russian-translation.patch | 55 | ||||
-rw-r--r-- | debian/patches/clang_FTBFS_Wreturn-type.patch | 57 | ||||
-rw-r--r-- | debian/patches/format-security.patch | 41 | ||||
-rw-r--r-- | debian/patches/line.drawing.patch | 28 | ||||
-rw-r--r-- | debian/patches/math-library.patch | 18 | ||||
-rw-r--r-- | debian/patches/missing.potfiles.patch | 32 | ||||
-rw-r--r-- | debian/patches/remove.unneded.docs.patch | 24 | ||||
-rw-r--r-- | debian/patches/series | 7 | ||||
-rwxr-xr-x | debian/rules | 12 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 3 |
20 files changed, 729 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..1d9e609 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,311 @@ +oregano (0.70-3) unstable; urgency=medium + + * Refresh patches. + * New patch: 0007-Update-russian-translation.patch (Closes: #804278) + * Bump Standards-Version to 3.9.6, no changes needed. + * Bump debhelper compat and build dep to 9. + * Update copyright information. + + -- Maximiliano Curia <maxy@debian.org> Sun, 08 Nov 2015 18:39:47 +0100 + +oregano (0.70-2) unstable; urgency=medium + + * Replace libpng12-dev with libpng-dev. (Closes: #662459) + * Update watch file. + * New patch: clang_FTBFS_Wreturn-type.patch (Closes: #743871) Thanks + to Nicolas Sévelin-Radiguet. + + -- Maximiliano Curia <maxy@debian.org> Fri, 25 Apr 2014 15:39:20 +0200 + +oregano (0.70-1.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Petter Reinholdtsen ] + * New patch math-library.patch to make sure to link with -lm and + fix build failure (Closes: #713450). + + -- gregor herrmann <gregoa@debian.org> Sat, 13 Jul 2013 15:54:33 +0200 + +oregano (0.70-1) unstable; urgency=low + + * New upstream release. + * New upstream, Marc Lorber + * debian/patches/format-security.patch: fixes format-security errors + * debian/patches/missing.potfiles.patch: add missing files to POTFILES.in + and POTFILES.skip + * debian/patches/remove.unneeded.docs.patch: avoid duplication of license + and the installation of the INSTALL file + + -- Maximiliano Curia <maxy@debian.org> Tue, 03 Jan 2012 20:00:53 -0300 + +oregano (0.69.1-3) unstable; urgency=low + + * Merge pending ubuntu patch. + * debian/patches/line.drawing.patch: When moving a wire so that it joins + with another delete the moved one, as well as extending the other. + * Remove obsolete dependency of libgnomeprint (Closes: #644563) + * Migrate to format 3.0 (quilt) + * Update Standards-Version to 3.9.2. + + -- Maximiliano Curia <maxy@debian.org> Mon, 28 Nov 2011 13:08:58 -0300 + +oregano (0.69.1-2) unstable; urgency=low + + * Disable omit-frame-pointer optimization to avoid segfault in amd64. + Further analysis pending. (Closes: #590688) + + -- Maximiliano Curia <maxy@debian.org> Sun, 15 Aug 2010 16:50:23 -0300 + +oregano (0.69.1-1) unstable; urgency=low + + * New upstream release. + - Migration to gtksourceview2.0 (Closes: #532939) + - Fix png export (Closes: #528911) + - Add black and white export support (Closes: #527448) + * Update old patches. + - Use shorter name as Name in desktop file (Closes: #509948) + * Update Standards-Version, no changes needed. + + -- Maximiliano Curia <maxy@debian.org> Wed, 22 Jul 2009 19:27:35 -0300 + +oregano (0.69.0-2) unstable; urgency=low + + * Fixed dpkg-shlibs warnings. + - Set LDFLAGS in rules file. + - Added patch to make scons receive LDFLAGS + (patches/scons.env.ldflags.dpatch) + * Fixed invalid characters in power.oreglib + - Added patch to fix the invalid characters. + (patches/power.lib.mess.dpatch) + * Moved Homepage pseudo field to real field. + * Updated Standards-Version, no changes needed. + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Tue, 19 Feb 2008 21:01:27 -0200 + +oregano (0.69.0-1) unstable; urgency=low + + * New upstream release. + - Added 1N4148.model (Closes: #432997) + * Removed upstream.sync patch. (patches/upstream.sync.dpatch) + * Removed headers.missing patch. (patches/headers.missing.dpatch) + * Updated desktop.update patch. (patches/desktop.update.dpatch) + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Thu, 16 Aug 2007 23:22:15 -0300 + +oregano (0.60.0-2) unstable; urgency=low + + * Fixes FTBFS, by adding gnome-print-paper header in the print.c source file + (patch headers-missing), thanks to Lucas Nussbaum and Luis Rodrigo + Gallardo Cruz (Closes: #422397) + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Sat, 16 Jun 2007 13:09:53 -0300 + +oregano (0.60.0-1) unstable; urgency=low + + * New upstream release. + * Fixes typo in the package description, thanks to Simon Waters for + the report (Closes: #390245) + * Updates desktop file, thanks to Jordi Mallach for the patch + (Closes: #393952) + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Thu, 19 Oct 2006 12:01:03 -0300 + +oregano (0.50.1-2) unstable; urgency=low + + * Fixes problem with encodings, thanks to Viktor Bindewald for the report + and testing. (Closes: #369602) + * Fixes a possible crash when editing part properties (upstream fix). + * Changes the installation path of the desktop file. + * Honors the CFLAGS value. + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Fri, 25 Aug 2006 00:28:24 -0300 + +oregano (0.50.1-1) unstable; urgency=low + + * New upstream release. + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Thu, 03 Aug 2006 19:35:28 -0300 + +oregano (0.40.5-2) unstable; urgency=low + + * Fixes translations of dialogs - thanks to Jordi Mallach <jordi@debian.org>. + * Updates catalan translation - thanks to Jordi Mallach <jordi@debian.org> + (Closes: #350293). + * Updates french translation - thanks to Jean-Luc Coulon + <jean-luc.coulon@wanadoo.fr> (Closes: #354596). + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Fri, 14 Apr 2006 14:02:59 -0300 + +oregano (0.40.5-1) unstable; urgency=low + + * Updates russian translation - thanks to Yuri Kozlov <yuray@id.ru> + (Closes: #326925). + * Updates brazilian portuguese translation - thanks to + "Felipe Augusto van de Wiel (faw)" <felipe@cathedrallabs.org> + (Closes: #348130). + * New upstream release. + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Mon, 23 Jan 2006 19:42:49 -0300 + +oregano (0.40.4-2) unstable; urgency=low + + * Building now against libcairo2-dev (Closes: #321058). + * Leaving names on oregano.1 without funny characters. + + -- David Moreno Garza <damog@debian.org> Mon, 5 Sep 2005 20:20:53 -0500 + +oregano (0.40.4-1) unstable; urgency=low + + * New upstream release (Closes: #293094). + * Adds --disable-update-mime to the configure parameters - thanks to Aaron + M. Ucko <ucko@debian.org> (Closes: #313132). + * Updates german translation - thanks to Jens Seidel + <jensseidel@users.sf.net> (Closes: #313950). + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Tue, 21 Jun 2005 11:25:09 -0300 + +oregano (0.40.0-5) unstable; urgency=high + + * Fixes segfaults on ia64 - thanks to David Mosberger-Tang <davidm@mostang.com> + (Closes: #310936). + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Sun, 29 May 2005 14:23:24 -0300 + +oregano (0.40.0-4) unstable; urgency=high + + * Fixes incompatibility bug with libcairo 0.4 (Closes: #309645). + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Thu, 26 May 2005 16:47:43 -0300 + +oregano (0.40.0-3) unstable; urgency=low + + * Patched file.c which now allows GTK 2.4 or newer (Closes: #300456). + * Updated catalan translation (Closes: #288388). + * Changed to a proper more "generic" section: electronics (Closes: #296673). + + -- David Moreno Garza <damog@damog.net> Fri, 25 Mar 2005 17:30:24 -0600 + +oregano (0.40.0-2) unstable; urgency=low + + * Adds postinst, postrm script that manage mime files cleanly - thanks + to the accurate Manuel Enrique observations (Closes: #286158). + * Minor change in the package description. + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Thu, 9 Dec 2004 00:20:56 -0300 + +oregano (0.40.0-1) unstable; urgency=low + + * New upstream release (Closes: #283237). + * Fixes documentation (README.Debian) as suggested by upstream + (its a great thing to have upstream using Debian). + * Adds perl (needed by the parser) and gnucap as Recommended. + * Renamed all oregano_parser instances to oregano_parser. + * Replaces debian/oregano.mime for the new upstream oregano.mime. + + -- David Moreno Garza <damog@damog.net> Mon, 6 Dec 2004 16:12:45 -0600 + +oregano (0.23-3) unstable; urgency=low + + * New maintainer: David Moreno Garza. + * Bringing updated config.{guess,sub} from autotools-dev (Closes: #274500). + * Updated Standards-Version. + * Corrected missing quotes on debian/menu. + * Corrected version depended on debhelper. + + -- David Moreno Garza <damog@damog.net> Thu, 11 Nov 2004 10:45:27 -0600 + +oregano (0.23-2) unstable; urgency=low + + * Included Toni Cunyat's newest Catalan translation (Closes: #131527) + * Changed upstream email address in copyright file - was already + changed in the README by upstream. + + -- Hugo van der Merwe <hvdm@debian.org> Fri, 1 Feb 2002 10:56:16 +0200 + +oregano (0.23-1) unstable; urgency=low + + * New upstream release (Closes: #128833) + * Added symlink for the samples in /usr/share/doc to ease their finding. + * Updated Standards-Version to 3.5.6 + * Provide menu hints - Thanks Yann Dirson (Closes: #128766) + + -- Hugo van der Merwe <hvdm@debian.org> Sat, 12 Jan 2002 10:52:52 +0200 + +oregano (0.22-4) unstable; urgency=low + + * Rebuild against X packages in sid (not 4.1.0) + + -- Hugo van der Merwe <hvdm@debian.org> Sat, 22 Jul 2001 12:10:36 +0200 + +oregano (0.22-3) unstable; urgency=low + + * Updated config.sub and config.guess to fix compiling on hppa + (Closes: #104827) + + -- Hugo van der Merwe <hvdm@debian.org> Wed, 18 Jul 2001 12:47:55 +0200 + +oregano (0.22-2) unstable; urgency=low + + * Rebuilt with newer libraries (Closes: #96533) + * Wrote simple man page for pspice2oregano + * Updated web site and email addresses in copyright and man page. + (Closes: #96630) + + -- Hugo van der Merwe <hvdm@debian.org> Tue, 15 May 2001 18:06:50 +0200 + +oregano (0.22-1) unstable; urgency=low + + * New upstream release + * Changed maintainer address to debian.org + * Updated Standards-Version to 3.5.2 + * Updated man page + + -- Hugo van der Merwe <hvdm@debian.org> Sat, 10 Mar 2001 23:29:12 +0200 + +oregano (0.21-2) unstable; urgency=low + + * Updated Standards-Version in debian/rules. + + -- Hugo van der Merwe <hugovdm@mail.com> Tue, 19 Dec 2000 10:26:42 +0200 + +oregano (0.21-1) unstable; urgency=low + + * New upstream release + * Added new dependencies to Build-Depends. + * Updated man page and debian/control - oregano can now print. + * Added debug support for DEB_BUILD_OPTIONS in debian/rules. + + -- Hugo van der Merwe <hugovdm@mail.com> Thu, 14 Dec 2000 11:20:00 +0200 + +oregano (0.20-2) unstable; urgency=low + + * Cosmetic change in menu entry. + * Couple of minor changes in debian/rules. + + -- Hugo van der Merwe <hugovdm@mail.com> Wed, 13 Dec 2000 08:49:08 +0200 + +oregano (0.20-1) unstable; urgency=low + + * New upstream release (Closes: #77874) + * Updated maintainer email address in debian/control. + + -- Hugo van der Merwe <hugovdm@mail.com> Wed, 13 Dec 2000 08:48:58 +0200 + +oregano (0.18-2) unstable; urgency=low + + * Corrected copyright info. + * Updated maintainer email address in changelog. + + -- Hugo van der Merwe <hugovdm@mail.com> Sat, 28 Oct 2000 17:05:13 +0200 + +oregano (0.18-1) unstable; urgency=low + + * First release. (Closes: #72012) + * Wrote man page. + + -- Hugo van der Merwe <hugo@mailroom.com> Mon, 16 Oct 2000 17:54:48 +0200 + +Local variables: +mode: debian-changelog +End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..afa5a40 --- /dev/null +++ b/debian/control @@ -0,0 +1,32 @@ +Source: oregano +Section: electronics +Priority: optional +Maintainer: Maximiliano Curia <maxy@debian.org> +Build-Depends: debhelper (>= 9), + dh-autoreconf, + intltool, + libcairo2-dev, + libfontconfig1-dev, + libfreetype6-dev (>= 2.1.0), + libglade2-dev, + libgnome2-dev, + libgnomecanvas2-dev, + libgnomeui-dev, + libgtk2.0-dev, + libgtksourceview2.0-dev, + libpng-dev, + libx11-dev, + libxml2-dev, + libxrender-dev (>= 0.6.0), + scrollkeeper +Standards-Version: 3.9.6 +Homepage: https://github.com/marc-lorber/oregano + +Package: oregano +Architecture: any +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} +Recommends: gnucap +Description: tool for schematical capture of electronic circuits + Oregano is a GNOME application for schematic capture and printing of + electronic circuits. It can simulate the circuits using Gnucap, + ng-spice or Berkeley spice. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8fa7943 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,51 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Upstream-Name: oregano + +Files: * +Copyright: 1989-2005, Free Software Foundation, Inc + 2003-2008, Ricardo Markiewicz + 1999-2001, Richard Hult +License: GPL-2+ + +Files: INSTALL + data/mime/Makefile.in + po/Makefile.in.in +Copyright: 2004-2008, Rodney Dawes <dobey.pwns@gmail.com> + 1995-1997, Ulrich Drepper <drepper@gnu.ai.mit.edu> +License: Permissive + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. This file is offered as-is, + without warranty of any kind. + +Files: help/* +Copyright: 1999-2002, Richard Hult + 2003-2004, LUGFi + 2009, Marc Lorber +License: GFDL-1.1 + +Files: debian/* +Copyright: 2000, Hugo van der Merwe <hugovdm@mail.com> + 2006-2015, Maximiliano Curia <maxy@debian.org> +License: 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; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + The complete text of the GNU General Public License version 2 + can be found in "/usr/share/common-licenses/GPL-2". + +License: GFDL-1.1 + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), 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. diff --git a/debian/oregano.1 b/debian/oregano.1 new file mode 100644 index 0000000..67c8eb9 --- /dev/null +++ b/debian/oregano.1 @@ -0,0 +1,43 @@ +.\" Copyrights 2000 by Hugo van der Merwe <hvdm@debian.org> +.\" This is free documentation, see the latest version of the GNU Free +.\" Documentation License for copying conditions. There is NO warranty. +.TH OREGANO 1 "September 12, 2004" "oregano" + +.SH NAME +oregano \- GNOME application for schematic capture of electrical circuits + +.SH SYNOPSIS +.B oregano + +.SH DESCRIPTION +This manual page briefly documents +.B oregano. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B oregano +is an application for schematic capture and printing of electrical circuits. +It can also be used for simulation if you have NG-Spice or Gnucap. + +.SH BUGS +This is under active development and things might not work as expected. +Regarding backwards compatibility, when opening oregano 0.23 files some wires +might be out of place, and the probes will not be present. +.PP +Undo, redo has not yet been implemented. + +.SH SEE ALSO +.B oregano +includes online help, found in the Help menu of the program. +Relevant documentation included with the source can also be found +in /usr/share/doc/oregano/ + +.SH AUTHOR + +.B oregano +was written by Richard Hult <rhult@codefactory.se>. And retaken by Ricardo +Markiewicz <rmarkie@fi.uba.ar> and Andres de Barbara <adebarbara@fi.uba.ar>. +.PP +This manual page was originally written by Hugo van der Merwe +<hvdm@debian.org> for the Debian GNU/Linux system. Later modified by +Maximiliano Curia <maxy@gnuservers.com.ar>. diff --git a/debian/oregano.README.Debian b/debian/oregano.README.Debian new file mode 100644 index 0000000..0927d3c --- /dev/null +++ b/debian/oregano.README.Debian @@ -0,0 +1,10 @@ +Oregano for Debian +------------------ + +Even though Oregano has been around for a number of years, it's still under +heavy development and things might not work as expected. + +Regarding backwards compatibility, when opening oregano 0.23 files some wires +might be out of place, and the probes will not be present. + + -- Maximiliano Curia <maxy@gnuservers.com.ar> Sun, 22 Jun 2005 21:19:11 -0300 diff --git a/debian/oregano.examples b/debian/oregano.examples new file mode 100644 index 0000000..1e660fd --- /dev/null +++ b/debian/oregano.examples @@ -0,0 +1 @@ +data/examples/* diff --git a/debian/oregano.install b/debian/oregano.install new file mode 100644 index 0000000..ec6e820 --- /dev/null +++ b/debian/oregano.install @@ -0,0 +1 @@ +data/mime/gnome-oregano.png /usr/share/pixmaps diff --git a/debian/oregano.manpages b/debian/oregano.manpages new file mode 100644 index 0000000..5c266c6 --- /dev/null +++ b/debian/oregano.manpages @@ -0,0 +1 @@ +debian/oregano.1 diff --git a/debian/patches/0007-Update-russian-translation.patch b/debian/patches/0007-Update-russian-translation.patch new file mode 100644 index 0000000..9f1542d --- /dev/null +++ b/debian/patches/0007-Update-russian-translation.patch @@ -0,0 +1,55 @@ +From: Maximiliano Curia <maxy@gnuservers.com.ar> +Date: Sat, 7 Nov 2015 16:36:27 +0100 +Subject: Update russian translation + +--- + po/ru.po | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/po/ru.po b/po/ru.po +index b5a8c1b..2cb584d 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -8,7 +8,7 @@ msgstr "" + "Project-Id-Version: ru\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-09-11 02:36-0300\n" +-"PO-Revision-Date: 2005-09-07 20:14+0400\n" ++"PO-Revision-Date: 2015-11-07 16:27+0100\n" + "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" + "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" + "MIME-Version: 1.0\n" +@@ -296,11 +296,11 @@ msgstr "Настройки моделирования" + + #: ../data/dialogs/sim-settings.glade2.h:16 + msgid "Source" +-msgstr "ц╘ц⌠ц■ц▐ц·ц▌ц┴ц▀" ++msgstr "Источник" + + #: ../data/dialogs/sim-settings.glade2.h:17 + msgid "Start" +-msgstr "ц╨ц│ц░ц∙ц⌠ц▀" ++msgstr "Начало" + + #: ../data/dialogs/sim-settings.glade2.h:18 + msgid "Step" +@@ -308,7 +308,7 @@ msgstr "Шаг" + + #: ../data/dialogs/sim-settings.glade2.h:19 + msgid "Stop" +-msgstr "ц╞ц⌠ц■ц│ц▌ц▐ц≈ц▀ц│" ++msgstr "Стоп" + + #: ../data/dialogs/sim-settings.glade2.h:20 + msgid "Type" +@@ -1041,9 +1041,8 @@ msgid "Unknown analysis" + msgstr "Неизвестный анализ" + + #: ../src/engines/gnucap.c:693 +-#, fuzzy + msgid "abort" +-msgstr "ц╨ц│ц░ц∙ц⌠ц▀" ++msgstr "" + + #: ../src/engines/engine.c:32 + msgid "Operating Point" diff --git a/debian/patches/clang_FTBFS_Wreturn-type.patch b/debian/patches/clang_FTBFS_Wreturn-type.patch new file mode 100644 index 0000000..b85dac8 --- /dev/null +++ b/debian/patches/clang_FTBFS_Wreturn-type.patch @@ -0,0 +1,57 @@ +From: Maximiliano Curia <maxy@debian.org> +Date: Sat, 7 Nov 2015 16:00:53 +0100 +Subject: clang_FTBFS_Wreturn-type + +--- + src/model/item-data.c | 4 ++-- + src/plot-add-function.c | 2 +- + src/splash.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/model/item-data.c b/src/model/item-data.c +index c8d71c7..973db0d 100644 +--- a/src/model/item-data.c ++++ b/src/model/item-data.c +@@ -514,8 +514,8 @@ item_data_has_properties (ItemData *data) + { + ItemDataClass *id_class; + +- g_return_if_fail (data != NULL); +- g_return_if_fail (IS_ITEM_DATA (data)); ++ g_return_val_if_fail (data != NULL, NULL); ++ g_return_val_if_fail (IS_ITEM_DATA (data), NULL); + + id_class = ITEM_DATA_CLASS (G_OBJECT_GET_CLASS (data)); + if (id_class->has_properties) { +diff --git a/src/plot-add-function.c b/src/plot-add-function.c +index 478595d..92d827f 100644 +--- a/src/plot-add-function.c ++++ b/src/plot-add-function.c +@@ -104,7 +104,7 @@ int plot_add_function_show (OreganoEngine *engine, SimulationData *current) + gtk_widget_destroy (GTK_WIDGET (warning)); + plot_add_function_show (engine, current); + gtk_widget_destroy (GTK_WIDGET (dialog)); +- return; ++ return 0; + } + } + if ((result == GTK_RESPONSE_OK) && +diff --git a/src/splash.c b/src/splash.c +index 65094f2..ff08de0 100644 +--- a/src/splash.c ++++ b/src/splash.c +@@ -58,12 +58,12 @@ oregano_splash_new () + OREGANO_GLADEDIR "/splash.glade", OREGANO_GLADEDIR "/splash.xpm"); + oregano_error_with_title (_("Could not create textbox properties dialog"), msg); + g_free (msg); +- return; ++ return NULL; + } + gui = glade_xml_new (OREGANO_GLADEDIR "/splash.glade", NULL, NULL); + if (!gui) { + oregano_error (_("Could not create textbox properties dialog")); +- return; ++ return NULL; + } + + sp = g_new0 (Splash, 1); diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch new file mode 100644 index 0000000..d6595b4 --- /dev/null +++ b/debian/patches/format-security.patch @@ -0,0 +1,41 @@ +From: Maximiliano Curia <maxy@debian.org> +Date: Sat, 7 Nov 2015 16:00:53 +0100 +Subject: format-security + +## Description: Avoid format-security errors +## Origin/Author: Maximiliano Curia <maxy@debian.org> +--- + src/dialogs.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dialogs.c b/src/dialogs.c +index 5facc0d..402e096 100644 +--- a/src/dialogs.c ++++ b/src/dialogs.c +@@ -61,7 +61,7 @@ oregano_error_with_title (gchar *title, gchar *desc) + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, +- span_msg->str); ++ "%s", span_msg->str); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + +@@ -100,7 +100,7 @@ oregano_warning_with_title (gchar *title, gchar *desc) + GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, +- span_msg->str); ++ "%s", span_msg->str); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + +@@ -120,7 +120,7 @@ oregano_question (gchar *msg) + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_OK, + GTK_BUTTONS_CANCEL, +- msg); ++ "%s", msg); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); + diff --git a/debian/patches/line.drawing.patch b/debian/patches/line.drawing.patch new file mode 100644 index 0000000..ae7fef1 --- /dev/null +++ b/debian/patches/line.drawing.patch @@ -0,0 +1,28 @@ +From: Maximiliano Curia <maxy@debian.org> +Date: Sat, 7 Nov 2015 16:00:53 +0100 +Subject: line.drawing + +## Description: When moving a wire so that it joins with another delete the moved one, as well as extending the other. +## Origin/Author: Fole +## Bug: https://bugs.edge.launchpad.net/ubuntu/+source/oregano/+bug/60777 +--- + src/sheet/sheet-item.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/sheet/sheet-item.c b/src/sheet/sheet-item.c +index 35120e3..e7aa1e1 100644 +--- a/src/sheet/sheet-item.c ++++ b/src/sheet/sheet-item.c +@@ -525,7 +525,11 @@ sheet_item_event (SheetItem *sheet_item, const GdkEvent *event, SchematicView *s + + item_data = SHEET_ITEM (list->data)->priv->data; + item_data_move (item_data, &delta); +- item_data_register (item_data); ++ if (item_data_register(item_data) == -1) { ++ /* Merged item needs to be deleted */ ++ g_object_unref (G_OBJECT (item_data)); ++ gtk_object_destroy(GTK_OBJECT(list->data)); ++ } + } + + break; diff --git a/debian/patches/math-library.patch b/debian/patches/math-library.patch new file mode 100644 index 0000000..c73d4bd --- /dev/null +++ b/debian/patches/math-library.patch @@ -0,0 +1,18 @@ +From: Maximiliano Curia <maxy@debian.org> +Date: Sat, 7 Nov 2015 16:00:53 +0100 +Subject: math-library + +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 2222e14..5da4202 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -99,4 +99,4 @@ oregano_SOURCES = \ + xml-helper.h + + oregano_LDADD = \ +- $(OREGANO_LIBS) ++ $(OREGANO_LIBS) -lm diff --git a/debian/patches/missing.potfiles.patch b/debian/patches/missing.potfiles.patch new file mode 100644 index 0000000..b7fc120 --- /dev/null +++ b/debian/patches/missing.potfiles.patch @@ -0,0 +1,32 @@ +From: Maximiliano Curia <maxy@debian.org> +Date: Sat, 7 Nov 2015 16:00:53 +0100 +Subject: missing.potfiles + +## Description: Adds missing files to POTFILES.in and POTFILES.skip +## Origin/Author: Maximiliano Curia <maxy@debian.org> +--- + po/POTFILES.in | 1 + + po/POTFILES.skip | 2 ++ + 2 files changed, 3 insertions(+) + create mode 100644 po/POTFILES.skip + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 7579bc0..ceaeebb 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -42,6 +42,7 @@ src/oregano-impl.c + src/oregano-config.c + src/engines/netlist.c + src/engines/gnucap.c ++src/engines/ngspice.c + src/engines/engine.c + src/netlist-editor.c + src/main.c +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +new file mode 100644 +index 0000000..255ed53 +--- /dev/null ++++ b/po/POTFILES.skip +@@ -0,0 +1,2 @@ ++data/netlist.lang ++data/oregano.desktop.in diff --git a/debian/patches/remove.unneded.docs.patch b/debian/patches/remove.unneded.docs.patch new file mode 100644 index 0000000..1a6f4bd --- /dev/null +++ b/debian/patches/remove.unneded.docs.patch @@ -0,0 +1,24 @@ +From: Maximiliano Curia <maxy@debian.org> +Date: Sat, 7 Nov 2015 16:00:53 +0100 +Subject: remove.unneded.docs + +## Description: Remove unneeded documentation files +## Origin/Author: Maximiliano Curia <maxy@debian.org> +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ab9a5a8..eab1eac 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,9 +5,7 @@ SUBDIRS = po src data help + oreganodocdir = $(datadir)/doc/oregano + oreganodoc_DATA = \ + README\ +- COPYING\ + AUTHORS\ +- INSTALL\ + NEWS\ + TODO + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..870cf6f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +line.drawing.patch +format-security.patch +missing.potfiles.patch +remove.unneded.docs.patch +math-library.patch +clang_FTBFS_Wreturn-type.patch +0007-Update-russian-translation.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..846a500 --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +#export DH_OPTIONS=-v + +LDFLAGS += -lcairo + +%: + dh $@ --with autoreconf + +override_dh_auto_configure: + dh_auto_configure -- --disable-update-mimedb diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..4efa942 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s|^.*/archive/v|oregano-| \ + https://github.com/marc-lorber/oregano/tags .*/archive/v(\d[\d\.]+).tar.gz |