debian/0000755000000000000000000000000012263565770007203 5ustar debian/dia.postrm0000644000000000000000000000003312261434272011170 0ustar #!/bin/sh -e #DEBHELPER# debian/copyright0000644000000000000000000000337312261434273011133 0ustar This Debian package was initially debianized by Fredrik Hallenberg on Wed, 2 Sep 1998 23:21:21 +0200. It is copyright by the following Debian maintainers: Copyright (C) 2004,2005,2006,2007,2008,2009,2010,2011 Roland Stigge Copyright (C) 2003 Akira TAGOH Copyright (C) 1998-2003 Fredrik Hallenberg It was downloaded from http://www.gnome.org/projects/dia/ This software was initially written by Alexander Larsson Copyright (C) 1998-2000 Alexander Larsson Copyright (C) 1999-2001 James Henstridge Copyright (C) 1984-2002 Free Software Foundation, Inc. Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald Copyright (C) 1997 Juliusz Chroboczek Copyright (C) 1999 Tim Janik Copyright (C) 1999-2002 Lars R. Clausen Copyright (C) 1999-2000 Helix Code, Inc. Copyright (C) 2000-2002 Hans Breuer Copyright (C) 2000-2002 Cyrille Chepelov Copyright (C) 2000-2002 Steffen Macke Copyright (C) 2000 Henk Jan Priester Copyright (C) 2000 Jacek Pliszka Copyright (C) 2000 Stefan Seefeld Copyright (C) 2001 Chris Sperandio Copyright (C) 2001 Hubert Figuiere Copyright (C) 2001 Jose A Ortega Ruiz Copyright (C) 2002 Alejandro Sierra Copyright (C) 2002 M.C. Nelson Copyright (C) 2003 Vadim Berezniker Dia is distributed under the GPL version 2. On Debian GNU/Linux systems, the complete text of the GNU General Public License Version 2 can be found in /usr/share/common-licenses/GPL-2'. The documentation as found in /usr/share/doc/dia-common/html/en/index.html is distributed under the GFDL Version 1.1 or later (without invariant elements). On Debian GNU/Linux systems, the complete text of the GNU GFDL Version 1.2 can be found in /usr/share/common-licenses/GFDL-1.2'. debian/dia.install0000644000000000000000000000004512261434272011315 0ustar debian/dia-normal-integrated usr/bin debian/dia.menu0000644000000000000000000000076612261434273010626 0ustar ?package(dia): \ needs="X11" \ section="Applications/Science/Engineering" \ hints="Vector" \ command="/usr/bin/dia" \ icon="/usr/share/pixmaps/dia_menu.xpm" \ title="Dia" \ longtitle="Dia diagram drawer" \ description="Dia can be used to draw different kind of diagrams. \ There is support for UML static structure diagrams \ (class diagrams), Entity-Relationship diagrams and \ Network diagrams. Diagrams can be exported to postscript \ and other formats." debian/source.lintian-overrides0000644000000000000000000000016012261434272014046 0ustar # using experimental dh level 9 in debhelper 8.x dia source: package-needs-versioned-debhelper-build-depends 9 debian/changelog0000644000000000000000000007720112263565765011070 0ustar dia (0.97.2-15ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: - Use dh-autoreconf to update config.guess|sub -- Bhavani Shankar Fri, 10 Jan 2014 00:04:29 +0530 dia (0.97.2-15) unstable; urgency=medium * Fix build with changed freetype headers (Closes: #733360) * Standards-Version: 3.9.5 -- Roland Stigge Thu, 02 Jan 2014 21:00:42 +0100 dia (0.97.2-14ubuntu2) trusty; urgency=low * Use new FreeType header location, resolving FTBFS. -- Daniel T Chen Mon, 30 Dec 2013 15:22:21 -0500 dia (0.97.2-14ubuntu1) trusty; urgency=low * Merge from debian, remaining changes: - Use dh-autoreconf to update config.guess|sub -- Dmitrijs Ledkovs Fri, 01 Nov 2013 22:26:54 +0000 dia (0.97.2-14) unstable; urgency=low * debian/rules: Added -i to autoreconf to fix FTBFS (Closes: #723796) -- Roland Stigge Wed, 16 Oct 2013 21:58:56 +0200 dia (0.97.2-13ubuntu1) saucy; urgency=low * Use dh-autoreconf to update config.guess|sub -- Dmitrijs Ledkovs Mon, 14 Oct 2013 01:22:41 +0100 dia (0.97.2-13) unstable; urgency=low * Fix translation bug in fr.po (Closes: #709891) * Add Recommends: dia-shapes to dia and dia-gnome (Closes: #710869) -- Roland Stigge Mon, 03 Jun 2013 22:43:18 +0200 dia (0.97.2-12) unstable; urgency=low * Menu file starts central /usr/bin/dia (as chosen by alternatives) (Closes: #689293) -- Roland Stigge Thu, 16 May 2013 21:18:30 +0200 dia (0.97.2-11) unstable; urgency=low * Uploading to unstable (Closes: #708352) -- Roland Stigge Wed, 15 May 2013 20:58:19 +0200 dia (0.97.2-10) experimental; urgency=low * Fix FTBFS with multiarch python, thanks to Ahmed Elmahmoudy (Closes: #704990) -- Roland Stigge Mon, 08 Apr 2013 20:37:12 +0200 dia (0.97.2-9) experimental; urgency=low * Fix crash due to new glib, patch from upstream git (Closes: #704646) * debian/control: Standards-Version: 3.9.4 -- Roland Stigge Thu, 04 Apr 2013 11:39:32 +0200 dia (0.97.2-8) unstable; urgency=low * Fixed pre/post rm/inst regarding update-alternatives (Closes: #668446) -- Roland Stigge Fri, 13 Apr 2012 23:47:21 +0200 dia (0.97.2-7) unstable; urgency=low * Added patch to fix FTBFS with new glib 2.32 in shape_typeinfo.c (Closes: #665521) -- Roland Stigge Sat, 24 Mar 2012 22:12:03 +0100 dia (0.97.2-6) unstable; urgency=low * debian/control: - Standards-Version: 3.9.3 - Build-Depends: debhelper (>= 9), to reflect debian/compat, since debhelper 9 is released now -- Roland Stigge Thu, 15 Mar 2012 21:43:15 +0100 dia (0.97.2-5) unstable; urgency=low * Fix architecture-dependent only builds (Closes: #655121) -- Roland Stigge Mon, 09 Jan 2012 21:48:42 +0100 dia (0.97.2-4) unstable; urgency=low * Use dh_python2 instead of dh_pysupport (Closes: #654611) - debian/compat: 9 (eliminate automatic usage of dh_pysupport) * Documented integrated version of Dia by default in Debian * Removing /etc from dia-common, left by dh_installxmlcatalogs, see #611418 * Removed additional shapes and sheets from dia-shapes for upcoming separate dia-shapes package (was present only in 0.97.2-3) -- Roland Stigge Fri, 06 Jan 2012 15:46:38 +0100 dia (0.97.2-3) unstable; urgency=low * Documented pstricks-tex and pgf-tex formats in man page (Closes: #527607) * Added GenericName to desktop file (Closes: #641709) * Remove backup files after successful file saving to prevent directory cluttering with old files (Closes: #173650) * Added shapes from http://dia-installer.de/shapes (diashapes) (Closes: #594475) * Installing DTDs and registering in XML catalog (Closes: #183728) * Adding "--integrated" version via wrapper scripts and alternatives for dia-normal and dia-gnome (Closes: #653682) * Adding patch to redirect diagnostics and errors to stderr to keep stdout free for piping output (Closes: #328904) (e.g. "dia -t png -e /dev/stdout ...") -- Roland Stigge Sat, 31 Dec 2011 14:11:57 +0100 dia (0.97.2-2) unstable; urgency=low * debian/rules: New dh style rules * debian/watch: Adjustment to new extensions (including .xz) * Removed gconf dependency (Closes: #479138) * Added patch for freedesktop.org thumbnailer for future upstream integration, thanks to Martin Stigge (Closes: #653469) -- Roland Stigge Sat, 24 Dec 2011 23:06:31 +0100 dia (0.97.2-1) unstable; urgency=low * New upstream release * Removed patches (fixed upstream): - fix-localmodlibs.patch - fig-linewidth-threshold.patch - libpng15.patch -- Roland Stigge Fri, 23 Dec 2011 19:53:09 +0100 dia (0.97.1-10) unstable; urgency=low * Added patch to support libpng 1.5 (fix FTBFS w/ new libpng), thanks Nobuhiro Iwamatsu (Closes: #649553) -- Roland Stigge Sun, 27 Nov 2011 20:10:25 +0100 dia (0.97.1-9) unstable; urgency=low * Remove ltmain.sh on debian/rules clean (Closes: #625661) * Standards-Version: 3.9.2 -- Roland Stigge Thu, 05 May 2011 09:56:14 +0200 dia (0.97.1-8) unstable; urgency=low * Removed *.la files from dia-libs (Closes: #621183) -- Roland Stigge Thu, 07 Apr 2011 20:44:19 +0200 dia (0.97.1-7) unstable; urgency=low * Added patch from Heine Larsen to fix linewidth threshold for fig export (Closes: #590857) * debian/control: Standards-Version: 3.9.1 -- Roland Stigge Sat, 31 Jul 2010 19:22:35 +0200 dia (0.97.1-6) unstable; urgency=low * Fixed FTBFS by adding Build-Depends: docbook-xml (Closes: #587128) -- Roland Stigge Wed, 23 Jun 2010 22:56:59 +0200 dia (0.97.1-5) unstable; urgency=low * Added icon images to HTML manual from docbook-xsl * Removed unnecessary absolute symlinks from HTML documentation -- Roland Stigge Tue, 22 Jun 2010 07:13:25 +0200 dia (0.97.1-4) unstable; urgency=low * Moved to new source format 3.0 (quilt) * Fixed Polish translation, thanks to Marcin 'iwi' Iwinski (Closes: #529895) * Added doc/custom-shapes to dia-common docs (Closes: #556868) * Build-Depends on GNU autotools and build generated files at build time (Closes: #558546) * Include dia's native built HTML documentation (make install-html) (Closes: #576585) * Enabled cairo plug-in -- Roland Stigge Sun, 20 Jun 2010 19:03:14 +0200 dia (0.97.1-3) unstable; urgency=low * Remove LOCALMODLIBS from Python config (Closes: #569695, #571271) -- Roland Stigge Sat, 08 May 2010 18:52:15 +0200 dia (0.97.1-2) unstable; urgency=low * Use generated man page now (instead of old one) (Closes: #572235) -- Roland Stigge Sat, 06 Mar 2010 20:00:35 +0100 dia (0.97.1-1) unstable; urgency=low * New upstream release * debian/control: Standards-Version: 3.8.4 * debian/rules: removed dh_desktop * debian/compat: 7 -- Roland Stigge Sat, 30 Jan 2010 16:38:34 +0100 dia (0.97-2) unstable; urgency=low * debian/copyright: Corrected Copyright and GFDL notice (Closes: #520579) -- Roland Stigge Sat, 20 Jun 2009 16:27:06 +0200 dia (0.97-1) unstable; urgency=low * New upstream release (Closes: #532495) * debian/control: - Added Build-Depends: intltool - Standards-Version: 3.8.2 * Fix doc/en/dia.xml and doc/pl/dia.xml validation errors thanks to Mehdi Dogguy (Closes: #516237) -- Roland Stigge Fri, 19 Jun 2009 10:17:24 +0200 dia (0.96.1-7.1) unstable; urgency=low * Non-maintainer upload. * Applying patch by James Vega to solve module import problem (Closes: #504251) -- Alexander Reichle-Schmehl Sat, 15 Nov 2008 22:11:35 +0100 dia (0.96.1-7) unstable; urgency=low * debian/control: Standards-Version: 3.8.0 * Recompile for python 2.5 (Closes: #485574) * debian/dia-common.doc-base: Section: Graphics -- Roland Stigge Tue, 10 Jun 2008 11:32:13 +0200 dia (0.96.1-6) unstable; urgency=low * debian/control: - Removed libunicode-dev from Build-Depends (Closes: #455487) - Standards-Version: 3.7.2 -> 3.7.3 - Removed dpatch from Build-Depends - Added Homepage field * debian/watch: New contents for version=3 file (Closes: #449646) -- Roland Stigge Wed, 19 Dec 2007 12:25:39 +0100 dia (0.96.1-5) unstable; urgency=low * debian/dia.menu: Improved section and longtitle (Closes: #445162) * plug-ins/python/gtkcons.py: Improve deprecated PyGtk calls (Closes: #443126) -- Roland Stigge Wed, 03 Oct 2007 20:05:02 +0200 dia (0.96.1-4) unstable; urgency=low * Adjusted menu and desktop files according to the new standards -- Roland Stigge Wed, 15 Aug 2007 15:03:38 +0200 dia (0.96.1-3) unstable; urgency=low * debian/dia-gnome.postinst: Rise update-alternatives priority to 50 to reflect greater importance of dia's GNOME version if it is installed * dia.desktop.in.in: Execute dia instead of dia-gnome for XFCE etc. without dia-gnome * Moved dia.desktop to package dia-common to provide it also to package dia (Closes: #405542) * Renamed dia.desktop to dia-common.desktop to prevent conflicts on upgrades from <= sarge * Re-ran autoconf to reflect removal of --std=c89 from configure.in (Closes: #421644) * Removed empty /usr/share/doc/dia from dia-common (Closes: #418475) * Included dia-thumbnail.schemas (Closes: #413996) -- Roland Stigge Sat, 05 May 2007 19:44:10 +0200 dia (0.96.1-2) unstable; urgency=low * debian/dia.1: Documented option change --export-to-format to --filter (Closes: #408705) -- Roland Stigge Sun, 29 Apr 2007 17:48:28 +0200 dia (0.96.1-1) unstable; urgency=low * New upstream release * Acknowledge NMU (Closes: #379151, #380772) * Removed /usr/var/scrollkeeper hierarchy (FHS) -- Roland Stigge Sun, 29 Apr 2007 15:25:52 +0200 dia (0.95.0-4.1) unstable; urgency=low * Non-maintainer upload. * Update dia to the last python policy (Closes: 380772). * Make package binNMUable. -- Pierre Habouzit Mon, 4 Sep 2006 17:50:56 +0200 dia (0.95.0-4) unstable; urgency=low * Applied upstream format string fixes: CVE-2006-2453 and CVE-2006-2480 (Closes: #368202) -- Roland Stigge Sun, 4 Jun 2006 15:29:05 +0200 dia (0.95.0-3) unstable; urgency=low * Applied upstream patch to fix crash on ungrouping (Closes: #366156) * debian/control: Standards-Version: 3.7.2 -- Roland Stigge Mon, 15 May 2006 19:41:38 -0500 dia (0.95.0-2) unstable; urgency=low * configure.in: Removed --std=c89, re-ran autoconf (Closes: #364544) -- Roland Stigge Mon, 24 Apr 2006 23:21:22 +0200 dia (0.95.0-1) unstable; urgency=low * New upstream release - Fixes object deletion (Closes: #297971) - Fixes UML class sizing (Closes: #348669) - Fixes crash on clicking on 4-way arrow (Closes: #353402) - Fixes Danish UML translation (abstract) (Closes: #348903) - Fixes Input Methods menu (Closes: #313468) - Fixes "fit to 1 page" (Closes: #160543) - Fixes underscore in pstricks export (Closes: #193224) - Fixes EPS export umlauts (Closes: #257145) - Fixes font properties in eps-builtin export (Closes: #298408) - Fixes anti-aliased hex grid (Closes: #319981) - Adjusts GNOME menu entry to HIG (Closes: #269932) - Added key combination for Modify (Closes: #294915) -- Roland Stigge Thu, 20 Apr 2006 09:40:57 +0200 dia (0.95-pre9-1) experimental; urgency=low * New upstream pre-release -- Roland Stigge Thu, 13 Apr 2006 12:52:08 +0200 dia (0.95-pre8-2) experimental; urgency=low * debian/control: Removed explicit dependencies to at-spi and libgail-gnome-module again -- Roland Stigge Tue, 11 Apr 2006 10:52:22 +0200 dia (0.95-pre8-1) experimental; urgency=low * New upstream pre-release * debian/control: Dependency additions to fix warnings on startup - Added at-spi to Depends of dia and dia-gnome - Added libgail-gnome-module to Depends of dia-gnome -- Roland Stigge Tue, 4 Apr 2006 10:25:37 +0200 dia (0.95-pre7-3) experimental; urgency=low * debian/rules: - Re-enabled Polish manual - /usr/var/scrollkeeper removed upstream, we don't need to care about it anymore -- Roland Stigge Sun, 2 Apr 2006 16:51:51 +0200 dia (0.95-pre7-2) experimental; urgency=low * debian/rules: Added configure-stamp (Closes: #348901) * debian/patches/07_fix-static-parse-path.dpatch: Really removed (unused) -- Roland Stigge Fri, 31 Mar 2006 15:25:29 +0200 dia (0.95-pre7-1) experimental; urgency=low * New upstream pre-release -- Roland Stigge Fri, 31 Mar 2006 10:19:02 +0200 dia (0.94.0+CVS20050917-4) experimental; urgency=low * debian/control: Removed unnecessary build dependency on xlibs-dev (Closes: #346661) -- Roland Stigge Wed, 11 Jan 2006 23:13:32 +0100 dia (0.94.0+CVS20050917-3) experimental; urgency=low * Sanitize the Python SVG file handling to avoid arbitary code execution. [CAN-2005-2966] (Closes: #330890) -- Roland Stigge Sun, 2 Oct 2005 19:45:28 +0200 dia (0.94.0+CVS20050917-2) experimental; urgency=low * debian/dia.1: Removed reference to epsi, replaced "-" by "\-" (Closes: #328902) -- Roland Stigge Sun, 18 Sep 2005 12:24:40 +0200 dia (0.94.0+CVS20050917-1) experimental; urgency=low * New upstream snapshot * Dia is now team maintained: debian/control: Maintainer: Debian Dia team Uploaders: Roland Stigge , Wolfgang Borgert * debian/copyright: Updated FSF address -- Roland Stigge Sat, 17 Sep 2005 17:07:47 +0200 dia (0.94.0+CVS20050731-1) experimental; urgency=low * New upstream snapshot * debian/control: Standards-Version: 3.6.2.0 -- Roland Stigge Sun, 31 Jul 2005 20:01:17 +0200 dia (0.94.0+CVS20050622-1) experimental; urgency=low * New upstream snapshot -- Roland Stigge Wed, 22 Jun 2005 22:50:02 +0200 dia (0.94.0+CVS20050619-1) experimental; urgency=low * Snapshot from CVS * Removed all patches from debian/patches -- Roland Stigge Sun, 19 Jun 2005 16:38:10 +0200 dia (0.94.0-11) unstable; urgency=low * po/de.po: Applied translation fixes patch by Jens Seidel (Closes: #313687) -- Roland Stigge Fri, 17 Jun 2005 19:25:03 +0200 dia (0.94.0-10) experimental; urgency=low * po/pl.po: Fixed Object menu translations, thanks to Marcin Owsiany (Closes: #311401) -- Roland Stigge Tue, 31 May 2005 21:43:23 +0200 dia (0.94.0-9) experimental; urgency=low * po/es.po: Fixed menu accelerators, thanks to Roberto C. Sanchez (Closes: #310980) -- Roland Stigge Sat, 28 May 2005 12:41:08 +0200 dia (0.94.0-8) experimental; urgency=low * debian/control: Added dpatch to Build-Depends * Included dpatch based on the one by komar@ukr.net fixing .png references in sheet files which are now .xpm references (Closes: #270547) * Included the following dpatches by Hervé Cauwelier : - fix-another-crash-with-line-wrapping-code (Closes: #306042) - fix-image-rendering-endianess (Closes: #306041) - stop-special-casing-the-first-display-of-a-diagram (Closes: #306040) - GCC 4 fixes: user-lib-prefix, fix-static-parse-path (Closes: #305521) - locale-usage (Closes: #306036) -- Roland Stigge Thu, 26 May 2005 10:21:18 +0200 dia (0.94.0-7) unstable; urgency=low * plug-ins/pixbuf/pixbuf.c: Removed pixbuf initialization code to switch off filter that renders bad PNG (Closes: #275960, #297737) * debian/: Added MIME handler with dh_installmime for dia and dia-gnome thanks to Loïc Minier (Closes: #288636) * Applied patch to fix filling color of some shapes, thanks to Benoît Sibaud (Closes: #297783) * Applied patch to fix the "Five Point Star" naming, thanks to Benoît Sibaud (Closes: #297784) -- Roland Stigge Wed, 2 Mar 2005 23:34:21 +0100 dia (0.94.0-6) unstable; urgency=low * debian/control: Versioned Build-Depends: debhelper (>= 4.2.21) * objects/UML/class.c: Incorporated upstream fix to load UML class properties (Closes: #296401) * app/app_procs.c: Applied upstream patch to prevent access to .dia in non-interactive mode (Closes: #249468) -- Roland Stigge Fri, 25 Feb 2005 23:20:13 +0100 dia (0.94.0-5) unstable; urgency=low * Build-Depends fixes, thanks to Daniele Cruciani and Loïc Minier - Removed libgdk-pixbuf-dev - Replaced libpng3-dev with libpng12-dev - Removed libcairo1-dev (Closes: #295991) * app/grid.c: Applied upstream patch to fix grid display (Closes: #284329) * lib/font.c: Applied upstream patch to disable font caching (Closes: #273625) -- Roland Stigge Sun, 20 Feb 2005 22:41:23 +0100 dia (0.94.0-4) unstable; urgency=low * debian/control: Changed Depends: python2.3-dev to python-dev (Closes: #287193) -- Roland Stigge Sun, 26 Dec 2004 15:17:22 +0100 dia (0.94.0-3) unstable; urgency=low * Added dh_desktop call to debian/rules (Closes: #278723) -- Roland Stigge Sat, 30 Oct 2004 11:33:34 +0200 dia (0.94.0-2) unstable; urgency=low * plug-ins/dxf/dxf-export.c: Fixed all-text-centered-on-DXF-export, (missing break statements), thanks to Takeshi Hamasaki * debian/rules: disabled unstable cairo support (removed "--with-cairo") which is recommended by upstream (Closes: #269543, #269868) -- Roland Stigge Sat, 21 Aug 2004 10:40:08 +0200 dia (0.94.0-1) unstable; urgency=low * New upstream release -- Roland Stigge Thu, 19 Aug 2004 18:28:16 +0200 dia (0.94-pre6-3) experimental; urgency=low * Fixed broken contents of dia_menu.xpm, thanks to Dominik Vogt (Closes: #258936) -- Roland Stigge Fri, 13 Aug 2004 09:58:44 +0200 dia (0.94-pre6-2) experimental; urgency=low * sheets/Cybernetics.sheet.in: set encoding to "utf-8" (Closes: #265147) -- Roland Stigge Thu, 12 Aug 2004 13:41:42 +0200 dia (0.94-pre6-1) experimental; urgency=low * New upstream pre-release - Fixes segfaults on 2nd "Save as" and UML Class object menu -- Roland Stigge Sat, 7 Aug 2004 23:36:22 +0200 dia (0.94-pre5-1) experimental; urgency=low * New upstream pre-release -- Roland Stigge Mon, 2 Aug 2004 22:48:40 +0200 dia (0.94-pre4-1) experimental; urgency=low * New upstream pre-release -- Roland Stigge Sun, 1 Aug 2004 21:27:51 +0200 dia (0.94-pre3-2) experimental; urgency=low * Applied fix for EPS command line export segfault, thanks to Tom Parker (Closes: #258808, #262273) -- Roland Stigge Fri, 30 Jul 2004 17:34:38 +0200 dia (0.94-pre3-1) experimental; urgency=low * New upstream pre-release -- Roland Stigge Mon, 26 Jul 2004 18:18:39 +0200 dia (0.94-pre2-1) experimental; urgency=low * New upstream pre-release -- Roland Stigge Fri, 23 Jul 2004 21:39:50 +0200 dia (0.94-pre1-3) experimental; urgency=low * objects/standard/image.c: Applied patch to fix path resolution with embedded images (Closes: #162582) * app/disp_callbacks.c: Applied patch to fix XIM editor activation with Ctrl+Space, thanks to kou@cozmixng.org (Closes: #231124) -- Roland Stigge Thu, 15 Jul 2004 17:02:08 +0200 dia (0.94-pre1-2) experimental; urgency=low * Activated cairo (2D rendering), fixes warning window on startup * Removed "Thank you [...]" message on exit -- Roland Stigge Tue, 13 Jul 2004 10:58:12 +0200 dia (0.94-pre1-1) experimental; urgency=low * New upstream pre-release - Fixes segfaults on ia64 (Closes: #218255) - Fixes segfaults with old dia files (Closes: #255030) * Included 0.93 man page because new upstream one is completely broken -- Roland Stigge Sat, 10 Jul 2004 09:26:26 +0200 dia (0.93-4) unstable; urgency=low * Changed upstream homepage link in README to http://www.gnome.org/projects/dia/ (Closes: #254442) -- Roland Stigge Fri, 18 Jun 2004 09:47:29 +0200 dia (0.93-3) unstable; urgency=low * Upload to unstable * Bug fixes: - Help/Contents in GNOME version works now (Closes: #245884) - dia -e doesn't need an X session anymore (Closes: #72721, #167083, #181460, #211077) - Dotted line in Metapost output fixed (Closes: #169668) - Diagram window doesn't open anymore when in command line mode (Closes: #175413) - dia --export implies --nosplash now (Closes: #128397) - dia now supports --size options for bitmap exports (Closes: #151732) -- Roland Stigge Wed, 26 May 2004 14:24:37 -0300 dia (0.93-2) experimental; urgency=low * Documented the new --size option (by debacle@debian.org) in the man page -- Roland Stigge Tue, 11 May 2004 19:11:05 +0200 dia (0.93-1) experimental; urgency=low * New upstream release * Included missing documentation (doc/{en,pl}/*.xml) from CVS * debian/dia.postinst: Increased update-alternatives priority from 30 to 40 to differentiate unambiguously between the GNOME and normal version, favoring the normal version by default (the GNOME version is still available as dia-gnome and from the menus) -- Roland Stigge Wed, 5 May 2004 16:22:47 +0200 dia (0.92.2-5) unstable; urgency=low * Applied patch by Steve Langasek fixing segfaults on alpha (Closes: #236530) -- Roland Stigge Sun, 14 Mar 2004 19:07:49 +0100 dia (0.92.2-4) unstable; urgency=low * dia-common: Removed dependency on libxslt1 * Split dia-common into dia-common (containing /usr/share; Architecture: all) and dia-libs (containing /usr/lib/dia; Architecture: any) (Closes: #233341) -- Roland Stigge Wed, 18 Feb 2004 13:26:09 +0100 dia (0.92.2-3) unstable; urgency=low * Added doc-base entry for the HTML documentation (Closes: #170998) -- Roland Stigge Sun, 8 Feb 2004 18:55:50 +0100 dia (0.92.2-2) unstable; urgency=low * Debhelper compatibility level 4 * debian/rules: Worked around the dia "make distclean" behaviour removing files present in the orig.tar.gz -> by making a backup * Added README.Debian to explain upgrade problem when using .dia files created with Dia <= 0.90 (Closes: #188342) * Included correct HTML documentation (the preferred documentation form on Debian systems) and made it accessible from the menu "Help/Manual" (Closes: #183507, #213781, #221617) -- Roland Stigge Sat, 7 Feb 2004 14:12:54 +0100 dia (0.92.2-1) unstable; urgency=low * New upstream release - Fixes font bugs on export (Closes: #215246, #213394, #210327, #211098) -- Roland Stigge Fri, 6 Feb 2004 23:17:07 +0100 dia (0.92-2) unstable; urgency=low * New maintainer * Acknowledged NMU (Closes: #226564) * debian/copyright: Stated more precisely * debian/rules: - Install doc/en/* instead of doc/* by dh_installdocs - Included upstream ChangeLog by dh_installchangelogs -- Roland Stigge Thu, 5 Feb 2004 12:27:01 +0100 dia (0.92-1) unstable; urgency=low * New upstream release (Closes: #217139) - Fixes newlines missing from .dia file (Closes: #216795) * debian/control: Removed multiline Build-Depends line, edited dia-common Description -- Roland Stigge Tue, 3 Feb 2004 22:18:12 +0100 dia (0.91-10.1) unstable; urgency=high * NMU * [configure.in, configure] Fixed FTBFS by fixing testing of newer freetype as per CVS HEAD. * [app/app_procs.c] Include header declaring pango_ft2_get_context to fix crashes on 64-bit archs. (Closes: #226564) * [app/diapsft2renderer.c] #include to fix "implicit declaration" warning. -- J.H.M. Dassen (Ray) Sun, 11 Jan 2004 17:04:20 +0100 dia (0.91-10) unstable; urgency=low * New maintainer. * debian/control: bumped Standards-Version to 3.6.1.0. * dia.1: correct man page for both binaries. (closes: Bug#98065) -- Akira TAGOH Tue, 30 Sep 2003 14:43:07 +0900 dia (0.91-9) unstable; urgency=low * Patched from CVS to fix tiny font problems (closes: #210327) -- Fredrik Hallenberg Fri, 12 Sep 2003 22:30:22 +0200 dia (0.91-8) unstable; urgency=low * Fixed python build-dep -- Fredrik Hallenberg Mon, 25 Aug 2003 21:51:39 +0200 dia (0.91-7) unstable; urgency=low * Set GNOME desktop category (closes: #148816, #194598) * Clean gmo files (closes: #206262) -- Fredrik Hallenberg Sat, 23 Aug 2003 11:02:36 +0200 dia (0.91-6) unstable; urgency=low * Depend on python 2.3 (closes: #205690) -- Fredrik Hallenberg Sat, 16 Aug 2003 19:44:08 +0200 dia (0.91-5) unstable; urgency=low * Depend on python-gtk2 (closes: #201614) -- Fredrik Hallenberg Thu, 17 Jul 2003 12:31:25 +0200 dia (0.91-4) unstable; urgency=low * Updated .po-files from CVS (closes: #190845) and from patch in bug. * Added python-gtk depend (closes: #195697) -- Fredrik Hallenberg Sun, 1 Jun 2003 12:34:53 +0200 dia (0.91-3) unstable; urgency=low * Enable python plugin (closes: #185990) * Patched to include Cisco shapes (closes: #186842) * Depend on libxslt (closes: #193972) * Call 'sensible-browser' instead of netscape (closes: #193245) * Fixed man page typo (closes: #186225) -- Fredrik Hallenberg Sun, 23 Mar 2003 18:22:08 +0100 dia (0.91-2) unstable; urgency=low * Removed gnome deps from non-gnome package. * Don't try to open libxslt.so (closes: #185666) * Use 32x32 menu icon from Mikael Hedin (closes: #97062) -- Fredrik Hallenberg Thu, 20 Mar 2003 21:29:31 +0100 dia (0.91-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Mon, 17 Mar 2003 22:13:02 +0100 dia (0.90-2) unstable; urgency=low * Added build-dependency on libunicode-dev (closes: #148782) -- Fredrik Hallenberg Sun, 2 Jun 2002 12:21:37 +0200 dia (0.90-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Sat, 1 Jun 2002 21:20:00 +0200 dia (0.88.1-3) unstable; urgency=low * Updated man page with patch from era eriksson (closes: #128410) * Applied some stuff from CVS to fix segfault in tools menu (closes: #127981) * Disabled manual menu entry (closes: #107509) -- Fredrik Hallenberg Fri, 15 Mar 2002 18:29:24 +0100 dia (0.88.1-2) unstable; urgency=low * Handle update-alternatives failing (closes: #132741, #132953) * Bumped standards revision -- Fredrik Hallenberg Sat, 9 Feb 2002 12:14:13 +0100 dia (0.88.1-1) unstable; urgency=low * New upstream release (closes: #82885, #89065, #94895, #95936, #98935, #97676, #99046) -- Fredrik Hallenberg Sat, 2 Jun 2001 17:42:56 +0200 dia (0.86-7) unstable; urgency=low * Removed stupid bug in rules file that made build fail on some architectures (closes: #84907) * Added build depend on libpopt-dev (closes: #84908) -- Fredrik Hallenberg Mon, 5 Feb 2001 09:54:39 +0100 dia (0.86-6) unstable; urgency=low * Added libgdk-pixbuf-dev to build depends (closes: #84214) * Updated menu entries with "vector" hint (closes: #80015) -- Fredrik Hallenberg Wed, 20 Dec 2000 11:29:37 +0100 dia (0.86-5) unstable; urgency=low * Fixed alternatives (closes: #79093) -- Fredrik Hallenberg Fri, 8 Dec 2000 20:44:29 +0100 dia (0.86-4) unstable; urgency=low * New libxml2 broke saving (closes: #78066, #78189) * Update GNOME menu entry (closes: #77730) -- Fredrik Hallenberg Tue, 28 Nov 2000 10:31:36 +0100 dia (0.86-3) unstable; urgency=low * Don't depend on old xlibs -- Fredrik Hallenberg Sun, 19 Nov 2000 22:30:34 +0100 dia (0.86-2) unstable; urgency=low * Split package in dia-common, dia and dia-gnome. * Applied patch from CVS to fix problems with anti-aliasing (closes: #63530) * Applied patch from CVS to fix problems with bezier curves -- Fredrik Hallenberg Fri, 13 Oct 2000 22:36:08 +0200 dia (0.86-1) unstable; urgency=low * New upstream release (closes: #58012) -- Fredrik Hallenberg Mon, 7 Aug 2000 11:26:04 +0200 dia (0.85-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Wed, 31 May 2000 10:09:22 +0200 dia (0.84-2) unstable; urgency=low * Fixed man page so whatis parsing works (closes: #60559) * Include files in doc directory (closes: #60644) -- Fredrik Hallenberg Mon, 20 Mar 2000 19:48:30 +0100 dia (0.84-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Wed, 1 Mar 2000 20:16:35 +0100 dia (0.83-2) unstable; urgency=low * Recommend gsfonts-x11. -- Fredrik Hallenberg Fri, 7 Jan 2000 12:25:49 +0100 dia (0.83-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Sat, 25 Dec 1999 17:47:19 +0100 dia (0.82-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Wed, 15 Dec 1999 17:58:28 +0100 dia (0.81-2) unstable; urgency=low * Man page installed correctly. (closes: #49096) * Command line arguments parsed. (closes: #49097) -- Fredrik Hallenberg Sun, 7 Nov 1999 10:37:50 +0100 dia (0.81-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Sun, 31 Oct 1999 18:39:24 +0100 dia (0.80-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Sun, 17 Oct 1999 16:40:26 +0200 dia (0.40-3) unstable; urgency=low * Recompiled with new libxml (which is now optional, so the dia package doesn't violate policy anymore). * Added patch for alpha. (closes: 41273) -- Fredrik Hallenberg Sat, 21 Aug 1999 15:21:04 +0200 dia (0.40-2) unstable; urgency=low * Added man page. (closes: #39507) * Updated description. -- Fredrik Hallenberg Sun, 4 Jul 1999 10:29:43 +0200 dia (0.40-1) unstable; urgency=low * New upstream release -- Fredrik Hallenberg Mon, 29 Mar 1999 22:32:01 +0200 dia (0.30-3) unstable; urgency=low * Recompile with libxml 1.0 and gtk 1.2. * Added menu entry. -- Fredrik Hallenberg Wed, 17 Mar 1999 11:14:37 +0100 dia (0.30-2) unstable; urgency=low * Fixed problem with dh_compress in rules files (bug #33551) -- Fredrik Hallenberg Thu, 18 Feb 1999 12:41:45 +0100 dia (0.30-1) unstable; urgency=low * New upstream release (bug #32358) -- Fredrik Hallenberg Tue, 26 Jan 1999 20:27:05 +0100 dia (0.20-1) unstable; urgency=low * Initial Release. -- Fredrik Hallenberg Wed, 2 Sep 1998 23:21:21 +0200 debian/dia-gnome.install0000644000000000000000000000004412261434273012420 0ustar debian/dia-gnome-integrated usr/bin debian/dia-gnome-integrated0000644000000000000000000000014112261434273013075 0ustar #!/bin/sh # # Wrapped that calls dia in integrated GNOME version # dia-gnome --integrated "$@" debian/dia.mime0000644000000000000000000000015512261434273010601 0ustar application/x-dia-diagram; dia '%s'; description="DIA diagram"; test=test -n "$DISPLAY"; nametemplate=%s.dia debian/README.Debian0000644000000000000000000000303612261434272011234 0ustar Dia for Debian ============== This is the Debian packaged version of Dia in Debian. Please note the following: Debian defaults to integrated version ------------------------------------- Since 0.97, dia supports an integrated versions, including all diagrams and the main menu in a single X window. This is now the default in Debian when using the Debian alternatives mechanism in automatic mode. E.g.: $ update-alternatives --display dia dia - auto mode link currently points to /usr/bin/dia-gnome-integrated /usr/bin/dia-gnome - priority 50 /usr/bin/dia-gnome-integrated - priority 55 /usr/bin/dia-normal - priority 40 /usr/bin/dia-normal-integrated - priority 45 Current 'best' version is '/usr/bin/dia-gnome-integrated'. $ You can switch back to the non-integrated version by setting dia alternatives manually to the respective mode, e.g.: # update-alternatives --config dia or by directly calling "dia-normal" or "dia-gnome". Opening diagrams created wth older Dia versions ----------------------------------------------- Regarding problems on import of .dia files created with dia 0.90 (or earlier), this is a problem that probably won't be fixed, according to the authors of Dia on their webpages: http://www.gnome.org/projects/dia/news.html: "Warning: Since the font handling is changed, some elements in old diagrams may change size. Since the font size was somewhat arbitrary in older versions of Dia, there is little we can do to fix this." See also http://bugs.debian.org/292326 -- Roland Stigge, Fri, 06 Jan 2012 16:01:30 +0100 debian/dia-common.examples0000644000000000000000000000001612261434273012752 0ustar samples/*.dia debian/source/0000755000000000000000000000000012261434317010471 5ustar debian/source/include-binaries0000644000000000000000000003701312261434273013636 0ustar debian/diashapes/shapes/gradient/light_dark_horizontal_gradient.png debian/diashapes/shapes/gradient/light_dark_vertical_gradient.png debian/diashapes/shapes/gradient/gradient-sprite.png debian/diashapes/shapes/gradient/dark_light_vertical_gradient_box.png debian/diashapes/shapes/gradient/white_gray_horizontal.png debian/diashapes/shapes/gradient/light_dark_horizontal_gradient_box.png debian/diashapes/shapes/gradient/dark_light_horizontal_gradient.png debian/diashapes/shapes/gradient/dark_light_horizontal_gradient_box.png debian/diashapes/shapes/gradient/dark_light_vertical_gradient.png debian/diashapes/shapes/gradient/light_dark_vertical_gradient_box.png debian/diashapes/shapes/chemistry_lab/funnel.png debian/diashapes/shapes/chemistry_lab/gooseneck.png debian/diashapes/shapes/chemistry_lab/sep-funnel.png debian/diashapes/shapes/chemistry_lab/condenser-pale-blue.png debian/diashapes/shapes/chemistry_lab/condenser-green.png debian/diashapes/shapes/chemistry_lab/clamp.png debian/diashapes/shapes/chemistry_lab/ring-front.png debian/diashapes/shapes/chemistry_lab/stirbar.png debian/diashapes/shapes/chemistry_lab/erlenmeyer.png debian/diashapes/shapes/chemistry_lab/condenser.png debian/diashapes/shapes/chemistry_lab/stirplate.png debian/diashapes/shapes/chemistry_lab/clamp-extra-large.png debian/diashapes/shapes/chemistry_lab/condenser-black.png debian/diashapes/shapes/chemistry_lab/clamp-large.png debian/diashapes/shapes/chemistry_lab/burette.png debian/diashapes/shapes/chemistry_lab/lab-stand-front.png debian/diashapes/shapes/chemistry_lab/clamp-front.png debian/diashapes/shapes/chemistry_lab/lab-stand.png debian/diashapes/shapes/chemistry_lab/condenser-red.png debian/diashapes/shapes/chemistry_lab/sep-funnel-three-phases.png debian/diashapes/shapes/chemistry_lab/column-reflux.png debian/diashapes/shapes/chemistry_lab/condenser-liebig-vertical.png debian/diashapes/shapes/chemistry_lab/column-reflux-red.png debian/diashapes/shapes/chemistry_lab/30-degree-bend.png debian/diashapes/shapes/chemistry_lab/beaker.png debian/diashapes/shapes/chemistry_lab/buechner-funnel.png debian/diashapes/shapes/chemistry_lab/sep-funnel-two-phases.png debian/diashapes/shapes/chemistry_lab/ring.png debian/diashapes/shapes/chemistry_lab/condenser-blue.png debian/diashapes/shapes/chemistry_lab/stirplate-front.png debian/diashapes/shapes/chemistry_lab/condenser-orange.png debian/diashapes/shapes/chemistry_lab/column-reflux-red-blue.png debian/diashapes/shapes/Optics/dfb_laser_big.png debian/diashapes/shapes/Optics/circulator.png debian/diashapes/shapes/Optics/scope.png debian/diashapes/shapes/Optics/mod_vert.png debian/diashapes/shapes/Optics/phasemod.png debian/diashapes/shapes/Optics/fibre_vert.png debian/diashapes/shapes/Optics/coupler.png debian/diashapes/shapes/Optics/dfb_laser.png debian/diashapes/shapes/Optics/beam.png debian/diashapes/shapes/Optics/fibre.png debian/diashapes/shapes/Optics/square.png debian/diashapes/shapes/Optics/polarisation_control.png debian/diashapes/shapes/Optics/isolator.png debian/diashapes/shapes/Optics/detector_vert.png debian/diashapes/shapes/Optics/polarisation_control_vert.png debian/diashapes/shapes/Optics/lpg.png debian/diashapes/shapes/Optics/wave.png debian/diashapes/shapes/Optics/detector.png debian/diashapes/shapes/Optics/lpg_vert.png debian/diashapes/shapes/Optics/edfa_vert.png debian/diashapes/shapes/Optics/spectrum.png debian/diashapes/shapes/Optics/mod.png debian/diashapes/shapes/Optics/tuneable.png debian/diashapes/shapes/Optics/isolator_vert.png debian/diashapes/shapes/Optics/coupler_vert.png debian/diashapes/shapes/Optics/sine.png debian/diashapes/shapes/Optics/phasemod_vert.png debian/diashapes/shapes/Optics/dfb_laser_vert.png debian/diashapes/shapes/Optics/atten.png debian/diashapes/shapes/Optics/edfa.png debian/diashapes/shapes/LST/extruder.png debian/diashapes/shapes/LST/convert_subsystem.png debian/diashapes/shapes/LST/distributor_subsystem.png debian/diashapes/shapes/LST/producer.png debian/diashapes/shapes/LST/ingestor.png debian/diashapes/shapes/LST/internal_subsystem.png debian/diashapes/shapes/LST/timer.png debian/diashapes/shapes/LST/decode_subsystem.png debian/diashapes/shapes/LST/associator_subsystem.png debian/diashapes/shapes/LST/decider_subsystem.png debian/diashapes/shapes/LST/it_subsystem.png debian/diashapes/shapes/LST/supporter_subsystem.png debian/diashapes/shapes/LST/boundary.png debian/diashapes/shapes/LST/mestorage.png debian/diashapes/shapes/LST/ot_subsystem.png debian/diashapes/shapes/LST/memory_subsystem.png debian/diashapes/shapes/LST/converter.png debian/diashapes/shapes/LST/reproducer_subsystem.png debian/diashapes/shapes/LST/cn_subsystem.png debian/diashapes/shapes/LST/ingestor_subsystem.png debian/diashapes/shapes/LST/encoder.png debian/diashapes/shapes/LST/encode_subsystem.png debian/diashapes/shapes/LST/motor.png debian/diashapes/shapes/LST/decoder.png debian/diashapes/shapes/electronic/source.png debian/diashapes/shapes/electronic/vacuum_pentode.png debian/diashapes/shapes/electronic/source_voltage.png debian/diashapes/shapes/electronic/photo_emiting_part.png debian/diashapes/shapes/electronic/transistor_misfe_i_n.png debian/diashapes/shapes/electronic/button.png debian/diashapes/shapes/electronic/voltmeter.png debian/diashapes/shapes/electronic/contact.png debian/diashapes/shapes/electronic/transistor_bipolar_pnp_2.png debian/diashapes/shapes/electronic/inductor.png debian/diashapes/shapes/electronic/headphone.png debian/diashapes/shapes/electronic/port_in.png debian/diashapes/shapes/electronic/photo_sensitive_part.png debian/diashapes/shapes/electronic/transistor_bipolar_pnp_1.png debian/diashapes/shapes/electronic/transistor_jfe_p.png debian/diashapes/shapes/electronic/bell.png debian/diashapes/shapes/electronic/transistor_bipolar_npn_2.png debian/diashapes/shapes/electronic/diode_zenner.png debian/diashapes/shapes/electronic/diode_schottky.png debian/diashapes/shapes/electronic/diode_tunnel.png debian/diashapes/shapes/electronic/diode_inverse.png debian/diashapes/shapes/electronic/source_substitution.png debian/diashapes/shapes/electronic/tyristor_triode.png debian/diashapes/shapes/electronic/diac.png debian/diashapes/shapes/electronic/transistor_single_pn.png debian/diashapes/shapes/electronic/microphone.png debian/diashapes/shapes/electronic/transistor_bipolar_npn_1.png debian/diashapes/shapes/electronic/source_current.png debian/diashapes/shapes/electronic/transistor_misfe_i_p.png debian/diashapes/shapes/electronic/transistor_misfe_c_n.png debian/diashapes/shapes/electronic/variable_nonlinear_part.png debian/diashapes/shapes/electronic/potenciometer.png debian/diashapes/shapes/electronic/capacitor.png debian/diashapes/shapes/electronic/ground.png debian/diashapes/shapes/electronic/di_gate.png debian/diashapes/shapes/electronic/led_display.png debian/diashapes/shapes/electronic/source_voltage_alternating.png debian/diashapes/shapes/electronic/crystal.png debian/diashapes/shapes/electronic/antenna.png debian/diashapes/shapes/electronic/vacuum_triode.png debian/diashapes/shapes/electronic/ampermeter.png debian/diashapes/shapes/electronic/transistor_jfe_n.png debian/diashapes/shapes/electronic/engine.png debian/diashapes/shapes/electronic/transistor_misfe_c_p.png debian/diashapes/shapes/electronic/varicap.png debian/diashapes/shapes/electronic/triac.png debian/diashapes/shapes/electronic/capacitor_electrolytic.png debian/diashapes/shapes/electronic/vacuum_diode.png debian/diashapes/shapes/electronic/tyristor_diode.png debian/diashapes/shapes/electronic/port_inout.png debian/diashapes/shapes/electronic/source_voltage_direct.png debian/diashapes/shapes/electronic/variable_linear_part.png debian/diashapes/shapes/electronic/contact_pair.png debian/diashapes/shapes/electronic/port_out.png debian/diashapes/shapes/Circuit2/dled_de.png debian/diashapes/shapes/Circuit2/newvled.png debian/diashapes/shapes/Circuit2/dzener.png debian/diashapes/shapes/Circuit2/hvoltmeter.png debian/diashapes/shapes/Circuit2/ramp.png debian/diashapes/shapes/Circuit2/square.png debian/diashapes/shapes/Circuit2/opto.png debian/diashapes/shapes/Circuit2/dcapacitor.png debian/diashapes/shapes/Circuit2/dresistor_de.png debian/diashapes/shapes/Circuit2/newhled.png debian/diashapes/shapes/Circuit2/vpcapacitor.png debian/diashapes/shapes/Circuit2/hammeter.png debian/diashapes/shapes/Circuit2/dinductor.png debian/diashapes/shapes/Circuit2/vvoltmeter.png debian/diashapes/shapes/Circuit2/dinductor_de.png debian/diashapes/shapes/Circuit2/dpcapacitor.png debian/diashapes/shapes/Circuit2/dresistor.png debian/diashapes/shapes/Circuit2/relay.png debian/diashapes/shapes/Circuit2/vammeter.png debian/diashapes/shapes/Circuit2/hpcapacitor.png debian/diashapes/shapes/Circuit2/sine.png debian/diashapes/shapes/Circuit2/triangle.png debian/diashapes/shapes/Circuit2/ddiode.png debian/diashapes/shapes/Circuit2/triac.png debian/diashapes/shapes/renewable_energy/wind_vane.png debian/diashapes/shapes/renewable_energy/cup_anemometer.png debian/diashapes/shapes/renewable_energy/solar_module.png debian/diashapes/shapes/renewable_energy/meas_tower.png debian/diashapes/shapes/renewable_energy/temp_humi_sensor.png debian/diashapes/shapes/renewable_energy/data_logger.png debian/diashapes/shapes/renewable_energy/wind_turbine.png debian/diashapes/shapes/value_stream_mapping/happy_face.png debian/diashapes/shapes/Digital/inv_v.png debian/diashapes/shapes/Digital/nor_v.png debian/diashapes/shapes/Digital/nand_h.png debian/diashapes/shapes/Digital/xor_v.png debian/diashapes/shapes/Digital/inv_h.png debian/diashapes/shapes/Digital/buff_h.png debian/diashapes/shapes/Digital/xnor_h.png debian/diashapes/shapes/Digital/xor_h.png debian/diashapes/shapes/Digital/buff_v.png debian/diashapes/shapes/Digital/mux_h.png debian/diashapes/shapes/Digital/mux_v.png debian/diashapes/shapes/Digital/add_v.png debian/diashapes/shapes/Digital/add_h.png debian/diashapes/shapes/Digital/nand_v.png debian/diashapes/shapes/Digital/and_v.png debian/diashapes/shapes/Digital/nor_h.png debian/diashapes/shapes/Digital/and_h.png debian/diashapes/shapes/Digital/xnor_v.png debian/diashapes/shapes/Digital/or_v.png debian/diashapes/shapes/Digital/reg_h.png debian/diashapes/shapes/Digital/conn.png debian/diashapes/shapes/Digital/or_h.png debian/diashapes/shapes/Digital/reg_v.png debian/diashapes/shapes/edpc/or.png debian/diashapes/shapes/edpc/and.png debian/diashapes/shapes/edpc/xor.png debian/diashapes/shapes/edpc/function.png debian/diashapes/shapes/edpc/organisation_unit.png debian/diashapes/shapes/CH-1/junction.png debian/diashapes/shapes/CH-1/note.png debian/diashapes/shapes/CH-1/delay.png debian/diashapes/shapes/CH-1/outpart.png debian/diashapes/shapes/CH-1/condition.png debian/diashapes/shapes/CH-1/device.png debian/diashapes/shapes/CH-1/department.png debian/diashapes/shapes/CH-1/employee.png debian/diashapes/shapes/CH-1/storage.png debian/diashapes/shapes/CH-1/event.png debian/diashapes/shapes/CH-1/work.png debian/diashapes/shapes/central_data_processing/Switch_Rack_50P.png debian/diashapes/shapes/central_data_processing/Organizer_Rack_1U.png debian/diashapes/shapes/central_data_processing/Storage_Rack_3U.png debian/diashapes/shapes/central_data_processing/Server_Rack_4U_Very_Right_Capacity.png debian/diashapes/shapes/central_data_processing/Path_Painel_24P.png debian/diashapes/shapes/central_data_processing/Organizador_Rack_2U.png debian/diashapes/shapes/central_data_processing/Server_Rack_4U_Right_Capacity.png debian/diashapes/shapes/central_data_processing/Server_Rack_4U_Slow_Capacity.png debian/diashapes/shapes/central_data_processing/Server_Rack_2U.png debian/diashapes/shapes/central_data_processing/Voice_Painel_50P.png debian/diashapes/shapes/central_data_processing/Switch_Rack_16P.png debian/diashapes/shapes/central_data_processing/CPD_rack_5.png debian/diashapes/shapes/central_data_processing/Telephone_exchange.png debian/diashapes/shapes/central_data_processing/Server_Rack_1U.png debian/diashapes/shapes/central_data_processing/Server_Rack_2U_Very_Slow.png debian/diashapes/shapes/central_data_processing/Litter.png debian/diashapes/shapes/central_data_processing/Server_Rack_5U_Right_Density.png debian/diashapes/shapes/central_data_processing/Voice_Painel_20P.png debian/diashapes/shapes/central_data_processing/Switch_Rack_48P.png debian/diashapes/shapes/central_data_processing/CPD_rack_44.png debian/diashapes/shapes/central_data_processing/Storage_Rack_3U_SAN.png debian/diashapes/shapes/central_data_processing/Organizador_Rack_1U.png debian/diashapes/shapes/central_data_processing/Server_Rack_3U.png debian/diashapes/shapes/central_data_processing/Organizer_Rack_2U.png debian/diashapes/shapes/central_data_processing/Switch_Rack_24P.png debian/diashapes/shapes/central_data_processing/Server_Rack_5U.png debian/diashapes/shapes/central_data_processing/CPD_rack_36.png debian/diashapes/shapes/central_data_processing/Router.png debian/diashapes/shapes/central_data_processing/Server_Rack_2U_Slow.png debian/diashapes/shapes/central_data_processing/Server_Rack_3U_Slow_Density.png debian/diashapes/shapes/central_data_processing/CPD_rack_42.png debian/diashapes/shapes/central_data_processing/Server_Rack_4U.png debian/diashapes/shapes/central_data_processing/Modem.png debian/diashapes/shapes/central_data_processing/CPD_rack_15.png debian/diashapes/shapes/central_data_processing/CPD_rack_7.png debian/diashapes/shapes/central_data_processing/CPD_rack_32.png debian/diashapes/shapes/CMOS/vdd_h.png debian/diashapes/shapes/CMOS/nmos_h.png debian/diashapes/shapes/CMOS/vdd_v.png debian/diashapes/shapes/CMOS/pmos_h.png debian/diashapes/shapes/CMOS/gnd_v.png debian/diashapes/shapes/CMOS/nmos_v.png debian/diashapes/shapes/CMOS/gnd_h.png debian/diashapes/shapes/CMOS/pmos_v.png debian/diashapes/shapes/Racks/equipment_10u.png debian/diashapes/shapes/Racks/equipment_11u.png debian/diashapes/shapes/Racks/rack_42u.png debian/diashapes/shapes/Racks/power_strip_schuko.png debian/diashapes/shapes/Racks/rack_38u.png debian/diashapes/shapes/Racks/rack_label_anchors_42u.png debian/diashapes/shapes/Racks/equipment_12u.png debian/diashapes/shapes/Racks/equipment_8u.png debian/diashapes/shapes/Racks/rack_12u.png debian/diashapes/shapes/Racks/power_strip_ute.png debian/diashapes/shapes/Racks/equipment_3u.png debian/diashapes/shapes/Racks/equipment_2u.png debian/diashapes/shapes/Racks/equipment_6u.png debian/diashapes/shapes/Racks/equipment_1u.png debian/diashapes/shapes/Racks/power_strip_bs.png debian/diashapes/shapes/Racks/equipment_7u.png debian/diashapes/shapes/Racks/equipment_5u.png debian/diashapes/shapes/Racks/rack_16u.png debian/diashapes/shapes/Racks/rack_20u.png debian/diashapes/shapes/Racks/equipment_4u.png debian/diashapes/shapes/Racks/equipment_9u.png debian/diashapes/shapes/electric2/isolator.png debian/diashapes/shapes/electric2/ckt-breaker.png debian/diashapes/shapes/electric2/generator.png debian/diashapes/shapes/electric2/transformer.png debian/diashapes/shapes/scenegraph/component.png debian/diashapes/shapes/scenegraph/nodekit.png debian/diashapes/shapes/scenegraph/light.png debian/diashapes/shapes/scenegraph/subgraph.png debian/diashapes/shapes/scenegraph/manipulator.png debian/diashapes/shapes/scenegraph/callback.png debian/diashapes/shapes/scenegraph/switch.png debian/diashapes/shapes/scenegraph/separator.png debian/diashapes/shapes/scenegraph/property.png debian/diashapes/shapes/scenegraph/transform.png debian/diashapes/shapes/scenegraph/appearance.png debian/diashapes/shapes/scenegraph/soselection.png debian/diashapes/shapes/scenegraph/shape.png debian/diashapes/shapes/scenegraph/metric.png debian/diashapes/shapes/scenegraph/field.png debian/diashapes/shapes/scenegraph/engine.png debian/diashapes/shapes/scenegraph/realtimeglobalfield.png debian/diashapes/shapes/scenegraph/camera.png debian/diashapes/shapes/scenegraph/group.png debian/source/format0000644000000000000000000000001412261434273011700 0ustar 3.0 (quilt) debian/dia-gnome.prerm0000644000000000000000000000026512261434273012104 0ustar #!/bin/sh -e if [ "$1" != "upgrade" ]; then update-alternatives --remove dia /usr/bin/dia-gnome update-alternatives --remove dia /usr/bin/dia-gnome-integrated fi #DEBHELPER# debian/dia-gnome.postrm0000644000000000000000000000003312261434272012273 0ustar #!/bin/sh -e #DEBHELPER# debian/dia-libs.install0000644000000000000000000000002312261434272012240 0ustar usr/lib/*/dia/*.so debian/dia-common.dirs0000644000000000000000000000004412261434273012076 0ustar usr/share/pixmaps usr/share/xml/dia debian/dia-normal-integrated0000644000000000000000000000013412261434273013262 0ustar #!/bin/sh # # Wrapped that calls dia in integrated version # dia-normal --integrated "$@" debian/control0000644000000000000000000000554712263563627010620 0ustar Source: dia Section: graphics Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Dia Team Uploaders: Roland Stigge , Wolfgang Borgert Standards-Version: 3.9.5 Build-Depends: debhelper (>= 9), libgnome2-dev, libglib2.0-dev, libgtk2.0-dev, libxml2-dev, libpopt-dev, libpng-dev, libart-2.0-dev, libfreetype6-dev, libpango1.0-dev, libgnomeui-dev, libxslt1-dev, python-dev, python-gtk2, xsltproc, libxml-parser-perl, intltool, automake, autoconf, texlive-lang-cyrillic, libtool, docbook-xsl, docbook-xml, xml-core, dh-autoreconf Build-Conflicts: autoconf2.13 Homepage: http://live.gnome.org/Dia Package: dia-common Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2 Recommends: dia | dia-gnome, dia-libs Replaces: dia (<= 0.86-1) Conflicts: dia (<= 0.86-1) Description: Diagram editor (common files) Dia is an editor for diagrams, graphs, charts etc. There is support for UML static structure diagrams (class diagrams), Entity-Relationship diagrams, network diagrams and much more. Diagrams can be exported to postscript and many other formats. . This package contains hardware independent files common to dia and dia-gnome Package: dia-libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Recommends: dia | dia-gnome, dia-common Replaces: dia (<= 0.86-1), dia-common (<= 0.92.2-3) Conflicts: dia (<= 0.86-1), dia-common (<= 0.92.2-3) Description: Diagram editor (library files) Dia is an editor for diagrams, graphs, charts etc. There is support for UML static structure diagrams (class diagrams), Entity-Relationship diagrams, network diagrams and much more. Diagrams can be exported to postscript and many other formats. . This package contains library files common to dia and dia-gnome Package: dia Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, dia-common (=${source:Version}), dia-libs (=${binary:Version}) Recommends: gsfonts-x11, dia-shapes Description: Diagram editor Dia is an editor for diagrams, graphs, charts etc. There is support for UML static structure diagrams (class diagrams), Entity-Relationship diagrams, network diagrams and much more. Diagrams can be exported to postscript and many other formats. Package: dia-gnome Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, dia-common (=${source:Version}), dia-libs (=${binary:Version}) Recommends: gsfonts-x11, dia-shapes Section: gnome Description: Diagram editor (GNOME version) Dia is an editor for diagrams, graphs, charts etc. There is support for UML static structure diagrams (class diagrams), Entity-Relationship diagrams, network diagrams and much more. Diagrams can be exported to postscript and many other formats. . This package contains the GNOME version of Dia. debian/patches/0000755000000000000000000000000012263564364010630 5ustar debian/patches/fix-cast-warnings.patch0000644000000000000000000000270612261434273015213 0ustar Description: Fix cast warnings This patch fixes some casting warnings that come up in the Debian build process. Author: Roland Stigge --- dia-0.97.2.orig/app/sheets_dialog_callbacks.c +++ dia-0.97.2/app/sheets_dialog_callbacks.c @@ -1159,7 +1159,7 @@ sheets_dialog_togglebutton_set_sensitive if (is_sensitive) { tmp = lookup_widget(dialog, "button_ok"); - gtk_object_set_data(GTK_OBJECT(tmp), "active_type", (gpointer)type); + gtk_object_set_data(GTK_OBJECT(tmp), "active_type", (gpointer)(intptr_t)type); } for (i = 0; widget_names[i]; i++) --- dia-0.97.2.orig/app/layer_dialog.c +++ dia-0.97.2/app/layer_dialog.c @@ -1449,7 +1449,7 @@ undo_layer_visibility(Diagram *dia, Laye for (i = 0; i < layers->len; i++) { Layer *temp_layer = (Layer *) g_ptr_array_index(layers, i); - visibilities = g_list_append(visibilities, (gpointer)temp_layer->visible); + visibilities = g_list_append(visibilities, (gpointer)(intptr_t)temp_layer->visible); } change->original_visibility = visibilities; --- dia-0.97.2.orig/app/menus.c +++ dia-0.97.2/app/menus.c @@ -1165,7 +1165,7 @@ menus_set_recent (GtkActionGroup *action do { id = gtk_ui_manager_new_merge_id (ui_manager); - recent_merge_ids = g_slist_prepend (recent_merge_ids, (gpointer) id); + recent_merge_ids = g_slist_prepend (recent_merge_ids, (gpointer)(intptr_t) id); gtk_ui_manager_add_ui (ui_manager, id, recent_path, debian/patches/fix-doc.patch0000644000000000000000000000472112261434273013177 0ustar Description: Documentation fixes This patch includes fixes to the XML documentation, some of which enable the processing tools to compile the documentation from XML, and make it DTD compliant. Author: Roland Stigge Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=516237 --- dia-0.97.1.orig/doc/en/usage-layers.xml +++ dia-0.97.1/doc/en/usage-layers.xml @@ -41,9 +41,15 @@ You can use layers to create overlay slide show by drawing each incremental slide in a layer and manipulating which layers are visible. If you want to automate - post processing such slide show, you can use --show-layers command line switch. + post processing such slide show, you can use --show-layers command line switch. For example: - dia --show-layers=Background,Slide3 --filter=eps-builtin --export=foo.eps foo.dia + + dia + --show-layers=Background,Slide3 + --filter=eps-builtin + --export=foo.eps + foo.dia + will export the Background and Slide3 layers, i.e. the eps output has only these two layers and none others. You would then repeat the export for each combination of layers you need to produce your slides. Using this switch --- /dev/null +++ dia-0.97.1/doc/pl/entities.xml @@ -0,0 +1,8 @@ + + + + + + + + --- dia-0.97.1.orig/doc/pl/dia.xml +++ dia-0.97.1/doc/pl/dia.xml @@ -1,5 +1,5 @@ - - + @@ -16,6 +16,8 @@ + +%local_entities; ]> debian/patches/fix-manpages.patch0000644000000000000000000000434212261434273014224 0ustar Description: Minor man page fixes This patch fixes some minor man page issues Author: Roland Stigge Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527607 --- dia-0.97.2.orig/doc/eu/dia-1.xml +++ dia-0.97.2/doc/eu/dia-1.xml @@ -186,7 +186,7 @@ - + Export loaded file in FORMAT and exit. Format are described below. @@ -262,7 +262,11 @@ - tex (TeX PSTricks macros) + pstricks-tex (TeX PSTricks macros) + + + + pgf-tex (TeX PGF/tikz macros) --- dia-0.97.2.orig/doc/en/dia-1.xml +++ dia-0.97.2/doc/en/dia-1.xml @@ -186,7 +186,7 @@ - + Export loaded file in FORMAT and exit. Format are described below. @@ -262,7 +262,11 @@ - tex (TeX PSTricks macros) + pstricks-tex (TeX PSTricks macros) + + + + pgf-tex (TeX PGF/tikz macros) --- dia-0.97.2.orig/doc/fr/dia-1.xml +++ dia-0.97.2/doc/fr/dia-1.xml @@ -190,7 +190,7 @@ - + Exporte le fichier chargé dans le FORMAT et quitte. Les FORMATS D'EXPORTATION sont décrits ci-dessous. debian/patches/fix-missing-pango-header.patch0000644000000000000000000000057612261434273016437 0ustar Description: Include Pango header This patch includes a Pango header to fix build problems. Author: Roland Stigge --- dia-0.97.1.orig/app/app_procs.c +++ dia-0.97.1/app/app_procs.c @@ -47,6 +47,10 @@ #include #endif +#ifdef HAVE_FREETYPE +#include +#endif + #include #include debian/patches/fix-pl-po.patch0000644000000000000000000000070712261434273013461 0ustar Description: Fix Polish translation This patch fixes the "/Edycja" issue in the polish version Author: Marcin 'iwi' Iwinski Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=529895 --- dia-0.97.1.orig/po/pl.po +++ dia-0.97.1/po/pl.po @@ -1189,7 +1189,7 @@ msgstr "Ustawienia _strony..." #: ../app/menus.c:87 ../app/sheets_dialog.c:236 msgid "_Edit" -msgstr "/Edycja" +msgstr "Edycja" #: ../app/menus.c:94 # debian/patches/fix-makefile.patch0000644000000000000000000000447612261434273014216 0ustar Description: Adjustment of makefiles This patch adjusts some makefiles for Debian's build style Author: Roland Stigge --- dia-0.97.2.orig/xmldocs.make +++ dia-0.97.2/xmldocs.make @@ -77,7 +77,7 @@ install-data-xml: omf install-data-html: $(progname)_html $(mkinstalldirs) $(DESTDIR)$(helpdocdir) - cp -r $(srcdir)/$(progname)_html/* $(DESTDIR)$(helpdocdir) + cp -r $(progname)_html/* $(DESTDIR)$(helpdocdir) uninstall-local-xml: uninstall-local-doc uninstall-local-omf --- dia-0.97.2.orig/hardcopies.make +++ dia-0.97.2/hardcopies.make @@ -77,19 +77,19 @@ clean-local: clean-local-xml \ endif $(progname)_html: $(progname).xml $(xml_files) $(htmlstyle) $(pngfigures) - $(mkinstalldirs) $(srcdir)/$(progname)_html - $(mkinstalldirs) $(srcdir)/$(progname)_html/$(figdir) - $(mkinstalldirs) $(srcdir)/$(progname)_html/images - $(mkinstalldirs) $(srcdir)/$(progname)_html/images/callouts - $(mkinstalldirs) $(srcdir)/$(progname)_html/css - -cp ../html/images/*.png $(srcdir)/$(progname)_html/images - -cp ../html/images/callouts/*.png \ - $(srcdir)/$(progname)_html/images/callouts - -cp ../html/css/*.css $(srcdir)/$(progname)_html/css - -cp $(srcdir)/$(figdir)/*.png $(srcdir)/$(progname)_html/$(figdir) - cd $(srcdir)/$(progname)_html \ + $(mkinstalldirs) $(progname)_html + $(mkinstalldirs) $(progname)_html/$(figdir) + $(mkinstalldirs) $(progname)_html/images + $(mkinstalldirs) $(progname)_html/images/callouts + $(mkinstalldirs) $(progname)_html/css + -cp $(srcdir)/../html/images/*.png $(progname)_html/images + -cp $(srcdir)/../html/images/callouts/*.png \ + $(progname)_html/images/callouts + -cp $(srcdir)/../html/css/*.css $(progname)_html/css + -cp $(srcdir)/$(figdir)/*.png $(progname)_html/$(figdir) + cd $(progname)_html \ && xsltproc --stringparam graphic.default.extension png \ - ../$(htmlstyle) ../$< + ../$(srcdir)/$(htmlstyle) ../$< touch $(progname)_html if WITH_PDFDOC @@ -98,6 +98,7 @@ $(progname).pdf: $(progname).xml $(xml_f -P 'latex.unicode.use=$(UNICODE)' \ -P latex.encoding='$(ENCODING)' \ $(LATEX_CLASS_OPTIONS) \ + -o $@ \ $< endif @@ -146,7 +147,7 @@ endif install-html: $(htmldoc) $(mkinstalldirs) $(sysdoc_html) - cp -r $(srcdir)/$(progname)_html/* $(sysdoc_html) + cp -r $(progname)_html/* $(sysdoc_html) uninstall-html: -rm -f $(sysdoc_html)/*.html debian/patches/fix-fr-po.patch0000644000000000000000000000114012261434273013445 0ustar Description: Fix translation bug in french translation This patch fixes a minor bug, translating now to <Échapper> instead of . Author: Roland Stigge Bug-Debian: http://bugs.debian.org/709891 --- dia-0.97.2.orig/po/fr.po +++ dia-0.97.2/po/fr.po @@ -895,7 +895,7 @@ msgid "" "Use to leave this tool" msgstr "" "Édite le texte\n" -"Utilisez pour quitter cet outil" +"Utilisez <Échapper> pour quitter cet outil" #. Translators: Menu item Verb/Control Magnitude/Change/Magnify #: ../app/interface.c:156 ../app/menus.c:215 ../objects/FS/function.c:988 debian/patches/series0000644000000000000000000000070412263563715012045 0ustar fix-doc.patch fix-helpdir.patch fix-psdoc.patch fix-missing-pango-header.patch fix-pl-po.patch remove-std-c89.patch use-sensible-browser.patch fix-manpages.patch fix-makefile.patch add-thumbnailer.patch fix-desktop-file.patch remove-backup-files.patch remove-dtds-from-examples.patch errors-to-stderr.patch fix-cast-warnings.patch fix-include-glib-headers.patch fix-crash-due-to-new-glib.patch python-multiarch.patch fix-fr-po.patch fix-freetype.patch debian/patches/fix-desktop-file.patch0000644000000000000000000000072212261434273015015 0ustar Description: Add GenericName to desktop file This patch adds GenericName to the dia.desktop.in.in file as required by freedesktop.org Author: Roland Stigge Bug-Debian: http://bugs.debian.org/641709 --- dia-0.97.2.orig/dia.desktop.in.in +++ dia-0.97.2/dia.desktop.in.in @@ -1,6 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Dia Diagram Editor +_Name=Dia +_GenericName=Diagram Editor _Comment=Edit your Diagrams Type=Application Exec=dia %F debian/patches/fix-crash-due-to-new-glib.patch0000644000000000000000000000715112261434273016427 0ustar From 213bdfe956bf8fe57c86316f68a09408fef1647e Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sat, 16 Mar 2013 16:56:58 +0000 Subject: Bug 694025 - GLib drop support for adding interfaces after class_init Without this Dia crashes at startup with new GLib version and the DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which follows the pattern also used for DiaCairoInteraciveRenderer. This should be functional equivalent to what was there before and should work for all current GLib versions. --- --- app/render_gdk.c | 60 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 23 deletions(-) --- dia-0.97.2.orig/app/render_gdk.c +++ dia-0.97.2/app/render_gdk.c @@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer gpointer window, int x, int y, int width, int height); -static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface) +typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer; +struct _DiaGdkInteractiveRenderer +{ + DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */ +}; +typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass; +struct _DiaGdkInteractiveRendererClass +{ + DiaGdkRendererClass parent_class; /*!< the base class */ +}; +#define DIA_TYPE_GDK_INTERACTIVE_RENDERER (dia_gdk_interactive_renderer_get_type ()) +#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer)) + +static void +dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface) { iface->clip_region_clear = clip_region_clear; iface->clip_region_add_rect = clip_region_add_rect; @@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init iface->set_size = set_size; } +G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER, + G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init)); + +static void +dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass) +{ +} +static void +dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object) +{ + DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object); + DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object); + DiaRenderer *dia_renderer = DIA_RENDERER(object); + + dia_renderer->is_interactive = 1; + + renderer->gc = NULL; + renderer->pixmap = NULL; + renderer->clip_region = NULL; +} + DiaRenderer * new_gdk_renderer(DDisplay *ddisp) { DiaGdkRenderer *renderer; GType renderer_type = 0; - renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL); + renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL); renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor); - if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer)) - { - static const GInterfaceInfo irenderer_iface_info = - { - (GInterfaceInitFunc) dia_gdk_renderer_iface_init, - NULL, /* iface_finalize */ - NULL /* iface_data */ - }; - - renderer_type = DIA_TYPE_GDK_RENDERER; - /* register the interactive renderer interface */ - g_type_add_interface_static (renderer_type, - DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, - &irenderer_iface_info); - - } - renderer->parent_instance.is_interactive = 1; - renderer->gc = NULL; - - renderer->pixmap = NULL; - renderer->clip_region = NULL; return DIA_RENDERER(renderer); } debian/patches/remove-backup-files.patch0000644000000000000000000000155712261434273015512 0ustar Description: Remove backup files Dia normally saves a copy of an old saved file if it is overwritten via the "File Save" function. This clutters the directory. Since the common behaviour of programs is to not save backups in a separate location (also for security reasons), this patch removes this feature and therefore removes backup files when dia is sure to have the newly written file in the correct location. Author: Roland Stigge Bug-Debian: http://bugs.debian.org/173650 --- dia-0.97.2.orig/app/load_save.c +++ dia-0.97.2/app/load_save.c @@ -1078,6 +1078,8 @@ diagram_data_save(DiagramData *data, con dia_message_filename(filename), dia_message_filename(filename), strerror(errno)); } + else /* remove backup file if new file is in place */ + g_unlink(bakname); CLEANUP: if (filename != user_filename) g_free(filename); debian/patches/use-sensible-browser.patch0000644000000000000000000000114412261434273015721 0ustar Description: Use sensible-browser This patch enables Dia to use Debian's sensible-browser Author: Roland Stigge --- dia-0.97.1.orig/app/commands.c +++ dia-0.97.1/app/commands.c @@ -690,7 +691,7 @@ help_manual_callback (GtkAction *action) ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); - command = g_strdup_printf("%s 'file://%s' &", command ? command : "xdg-open", helpindex); + command = g_strdup_printf("%s 'file://%s' &", command ? command : "sensible-browser", helpindex); system(command); g_free(command); #endif debian/patches/errors-to-stderr.patch0000644000000000000000000015633612261434273015115 0ustar Description: Direct messages and errors to stdout This patch directs messages and errors to stdout to enable piping calls of dia, e.g. "dia -e /dev/stdout ... | ..." by preventing other messages on stdout Author: Roland Stigge Bug-Debian: http://bugs.debian.org/328904 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=113909 --- dia-0.97.2.orig/lib/neworth_conn.c +++ dia-0.97.2/lib/neworth_conn.c @@ -341,14 +341,14 @@ neworthconn_update_data(NewOrthConn *ort if (connpoint_is_autogap(start_cp)) { new_points[0] = calculate_object_edge(&start_cp->pos, &new_points[1], start_cp->object); - printf("Moved start to %f, %f\n", + fprintf(stderr, "Moved start to %f, %f\n", new_points[0].x, new_points[0].y); } if (connpoint_is_autogap(end_cp)) { new_points[orth->numpoints-1] = calculate_object_edge(&end_cp->pos, &new_points[orth->numpoints-2], end_cp->object); - printf("Moved end to %f, %f\n", + fprintf(stderr, "Moved end to %f, %f\n", new_points[orth->numpoints-1].x, new_points[orth->numpoints-1].y); } g_free(points); --- dia-0.97.2.orig/lib/widgets.c +++ dia-0.97.2/lib/widgets.c @@ -1174,7 +1174,7 @@ dia_color_selector_set_color (GtkWidget green = color->green * 255; blue = color->blue * 255; if (color->red > 1.0 || color->green > 1.0 || color->blue > 1.0) { - printf("Color out of range: r %f, g %f, b %f\n", + fprintf(stderr, "Color out of range: r %f, g %f, b %f\n", color->red, color->green, color->blue); red = MIN(red, 255); green = MIN(green, 255); --- dia-0.97.2.orig/lib/dia_xml.c +++ dia-0.97.2/lib/dia_xml.c @@ -239,7 +239,7 @@ xmlDiaParseFile(const char *filename) /* We've got a corrected file to parse. */ xmlDocPtr ret = xmlDoParseFile(fname); unlink(fname); - /* printf("has read %s instead of %s\n",fname,filename); */ + /* fprintf(stderr, "has read %s instead of %s\n",fname,filename); */ g_free((void *)fname); return ret; } else { --- dia-0.97.2.orig/lib/geometry.c +++ dia-0.97.2/lib/geometry.c @@ -772,9 +772,9 @@ calculate_object_edge(Point *objmid, Poi #ifdef TRACE_DIST if (i == MAXITER) { for (i = 0; i < MAXITER; i++) { - printf("%d: %f, %f: %f\n", i, trace[i].x, trace[i].y, disttrace[i]); + fprintf(stderr, "%d: %f, %f: %f\n", i, trace[i].x, trace[i].y, disttrace[i]); } - printf("i = %d, dist = %f\n", i, dist); + fprintf(stderr, "i = %d, dist = %f\n", i, dist); } #endif --- dia-0.97.2.orig/lib/arrows.c +++ dia-0.97.2/lib/arrows.c @@ -2134,7 +2134,7 @@ arrow_type_from_name(const gchar *name) return arrow_types[i].enum_value; } } - printf("Unknown arrow type %s\n", name); + fprintf(stderr, "Unknown arrow type %s\n", name); return 0; } @@ -2153,7 +2153,7 @@ arrow_index_from_type(ArrowType atype) return i; } } - printf("Can't find arrow index for type %d\n", atype); + fprintf(stderr, "Can't find arrow index for type %d\n", atype); return 0; } --- dia-0.97.2.orig/lib/dia_svg.c +++ dia-0.97.2/lib/dia_svg.c @@ -576,7 +576,7 @@ dia_svg_parse_path(const gchar *path_str path_chomp(path); while (path[0] != '\0') { #ifdef DEBUG_CUSTOM - g_print("Path: %s\n", path); + g_printerr("Path: %s\n", path); #endif /* check for a new command */ switch (path[0]) { --- dia-0.97.2.orig/lib/dialib.c +++ dia-0.97.2/lib/dialib.c @@ -69,7 +69,7 @@ myXmlErrorReporting (void *ctx, const ch va_start(args, msg); string = g_strdup_vprintf (msg, args); - g_print ("%s", string ? string : "xml error (null)?"); + g_print("%s", string ? string : "xml error (null)?"); va_end(args); g_free(string); --- dia-0.97.2.orig/lib/debug.c +++ dia-0.97.2/lib/debug.c @@ -36,7 +36,7 @@ dia_assert_true(gboolean val, gchar *for va_list args; if (!val) { va_start(args, format); - g_vprintf(format, args); + g_vfprintf(stderr, format, args); va_end(args); } return val; --- dia-0.97.2.orig/lib/autoroute.c +++ dia-0.97.2/lib/autoroute.c @@ -105,7 +105,7 @@ autoroute_layout_orthconn(OrthConn *conn endpoint = autolayout_adjust_for_gap(&topos, enddir, endconn); autolayout_adjust_for_arrow(&endpoint, enddir, conn->extra_spacing.end_trans); /* - printf("Startdir %d enddir %d orgstart %.2f, %.2f orgend %.2f, %.2f start %.2f, %.2f end %.2f, %.2f\n", + fprintf(stderr, "Startdir %d enddir %d orgstart %.2f, %.2f orgend %.2f, %.2f start %.2f, %.2f end %.2f, %.2f\n", startdir, enddir, frompos.x, frompos.y, topos.x, topos.y, @@ -132,7 +132,7 @@ autoroute_layout_orthconn(OrthConn *conn if (this_layout != NULL) { if (this_badness-min_badness < -0.00001) { /* - printf("Dir %d to %d badness %f < %f\n", startdir, enddir, + fprintf(stderr, "Dir %d to %d badness %f < %f\n", startdir, enddir, this_badness, min_badness); */ min_badness = this_badness; @@ -286,7 +286,7 @@ autoroute_layout_parallel(Point *to, gui if (fabs(to->x) > MIN_DIST) { real top = MIN(-MIN_DIST, to->y-MIN_DIST); /* - printf("Doing parallel layout: Wide\n"); + fprintf(stderr, "Doing parallel layout: Wide\n"); */ *num_points = 4; ps = g_new0(Point, *num_points); @@ -300,7 +300,7 @@ autoroute_layout_parallel(Point *to, gui real off = to->x+MIN_DIST*(to->x>0?1.0:-1.0); real bottom = to->y-MIN_DIST; /* - printf("Doing parallel layout: Narrow\n"); + fprintf(stderr, "Doing parallel layout: Narrow\n"); */ *num_points = 6; ps = g_new0(Point, *num_points); @@ -318,7 +318,7 @@ autoroute_layout_parallel(Point *to, gui real off = MIN_DIST*(to->x>0?-1.0:1.0); real bottom = -MIN_DIST; /* - printf("Doing parallel layout: Narrow\n"); + fprintf(stderr, "Doing parallel layout: Narrow\n"); */ *num_points = 6; ps = g_new0(Point, *num_points); @@ -356,7 +356,7 @@ autoroute_layout_orthogonal(Point *to, i if (to->y < -MIN_DIST) { if (dirmult*to->x > MIN_DIST) { /* - printf("Doing orthogonal layout: Three-way\n"); + fprintf(stderr, "Doing orthogonal layout: Three-way\n"); */ *num_points = 3; ps = g_new0(Point, *num_points); @@ -402,7 +402,7 @@ autoroute_layout_orthogonal(Point *to, i } } /* - printf("Doing orthogonal layout\n"); + fprintf(stderr, "Doing orthogonal layout\n"); */ *points = ps; return calculate_badness(ps, *num_points); @@ -431,7 +431,7 @@ autoroute_layout_opposite(Point *to, gui } else { real mid = to->y/2; /* - printf("Doing opposite layout: Three-way\n"); + fprintf(stderr, "Doing opposite layout: Three-way\n"); */ /* points[0] is 0,0 */ ps[1].y = mid; @@ -444,7 +444,7 @@ autoroute_layout_opposite(Point *to, gui } else if (fabs(to->x) > 2*MIN_DIST) { real mid = to->x/2; /* - printf("Doing opposite layout: Doorhanger\n"); + fprintf(stderr, "Doing opposite layout: Doorhanger\n"); */ *num_points = 6; ps = g_new0(Point, *num_points); @@ -460,7 +460,7 @@ autoroute_layout_opposite(Point *to, gui } else { real off = MIN_DIST*(to->x>0?-1.0:1.0); /* - printf("Doing opposite layout: Overlap\n"); + fprintf(stderr, "Doing opposite layout: Overlap\n"); */ *num_points = 6; ps = g_new0(Point, *num_points); --- dia-0.97.2.orig/lib/orth_conn.c +++ dia-0.97.2/lib/orth_conn.c @@ -334,7 +334,7 @@ orthconn_update_data(OrthConn *orth) new_points[0] = calculate_object_edge(&start_cp->pos, &new_points[1], start_cp->object); /* - printf("Moved start to %f, %f\n", + fprintf(stderr, "Moved start to %f, %f\n", new_points[0].x, new_points[0].y); */ } @@ -343,7 +343,7 @@ orthconn_update_data(OrthConn *orth) calculate_object_edge(&end_cp->pos, &new_points[orth->numpoints-2], end_cp->object); /* - printf("Moved end to %f, %f\n", + fprintf(stderr, "Moved end to %f, %f\n", new_points[orth->numpoints-1].x, new_points[orth->numpoints-1].y); */ } --- dia-0.97.2.orig/lib/diarenderer.c +++ dia-0.97.2/lib/diarenderer.c @@ -1257,7 +1257,7 @@ draw_arc_with_arrows (DiaRenderer *rende if (!find_center_point(¢er, startpoint, endpoint, midpoint)) { /* Degenerate circle -- should have been caught by the drawer? */ - printf("Degenerate\n"); + fprintf(stderr, "Degenerate\n"); } righthand = is_right_hand (startpoint, midpoint, endpoint); --- dia-0.97.2.orig/lib/textline.c +++ dia-0.97.2/lib/textline.c @@ -283,7 +283,7 @@ text_line_adjust_glyphs(TextLine *line, for (i = 0; i < glyphs->num_glyphs; i++) { /* - printf("Glyph %d: width %d, offset %f, textwidth %f\n", + fprintf(stderr, "Glyph %d: width %d, offset %f, textwidth %f\n", i, new_glyphs->glyphs[i].geometry.width, line->offsets[i], line->offsets[i] * scale * 20.0 * PANGO_SCALE); */ @@ -314,7 +314,7 @@ text_line_adjust_layout_line(TextLine *l runs = line->layout_offsets->runs; if (g_slist_length(runs) != g_slist_length(layoutruns)) { - printf("Runs length error: %d != %d\n", + fprintf(stderr, "Runs length error: %d != %d\n", g_slist_length(line->layout_offsets->runs), g_slist_length(layoutline->runs)); } @@ -334,7 +334,7 @@ text_line_adjust_layout_line(TextLine *l (int)(glyphs->glyphs[i].geometry.y_offset * scale / 20.0); } if (glyphs->num_glyphs != layoutglyphs->num_glyphs) { - printf("Glyph length error: %d != %d\n", + fprintf(stderr, "Glyph length error: %d != %d\n", glyphs->num_glyphs, layoutglyphs->num_glyphs); } } --- dia-0.97.2.orig/plug-ins/python/pydia-error.c +++ dia-0.97.2/plug-ins/python/pydia-error.c @@ -127,7 +127,7 @@ PyDiaError_Write(PyDiaError *self, PyObj if (self->str) g_string_append (self->str, s); - g_print ("%s", s); + g_printerr("%s", s); Py_INCREF(Py_None); return Py_None; --- dia-0.97.2.orig/plug-ins/python/pydia-properties.c +++ dia-0.97.2/plug-ins/python/pydia-properties.c @@ -228,7 +228,7 @@ PyDiaProperties_AssSub (PyDiaProperties* name = PyString_AsString(key); p = object_prop_by_name (self->object, name); - /* g_print ("AssSub(key: '%s', type <%s>)\n", name, (p ? p->type : "none")); */ + /* g_printerr("AssSub(key: '%s', type <%s>)\n", name, (p ? p->type : "none")); */ if (p) { if (0 == PyDiaProperty_ApplyToObject(self->object, name, p, val)) { /* if applied the property is deleted */ --- dia-0.97.2.orig/plug-ins/xslt/xslt.c +++ dia-0.97.2/plug-ins/xslt/xslt.c @@ -291,14 +291,14 @@ static PluginInitResult read_configurati /*cur_from = froms; - printf("XSLT plugin configuration: \n"); + fprintf(stderr, "XSLT plugin configuration: \n"); while(cur_from != NULL) { - printf("From: %s (%s)\n", cur_from->name, cur_from->xsl); + fprintf(stderr, "From: %s (%s)\n", cur_from->name, cur_from->xsl); cur_to = cur_from->xsls; while(cur_to != NULL) { - printf("\tTo: %s (%s)\n", cur_to->name, cur_to->xsl); + fprintf(stderr, "\tTo: %s (%s)\n", cur_to->name, cur_to->xsl); cur_to = cur_to->next; } cur_from = cur_from->next; @@ -374,7 +374,7 @@ void xslt_unload(PluginInfo *info) #if 0 language_t *cur = languages, *next; - /*printf("Unloading xslt\n"); */ + /*fprintf(stderr, "Unloading xslt\n"); */ while(cur != NULL) { next = cur->next; --- dia-0.97.2.orig/plug-ins/xslt/xsltdialog.c +++ dia-0.97.2/plug-ins/xslt/xsltdialog.c @@ -71,7 +71,7 @@ from_deactivate(fromxsl_t *xsls) static void to_update(GtkWidget *widget, toxsl_t *lng) { - /* printf("To: %s\n", lng->name); */ + /* fprintf(stderr, "To: %s\n", lng->name); */ xsl_to = lng; } --- dia-0.97.2.orig/plug-ins/wpg/wpg.c +++ dia-0.97.2/plug-ins/wpg/wpg.c @@ -298,7 +298,7 @@ begin_render(DiaRenderer *self) pPal[3*i+1] = (((i / CC_LEN) % CC_LEN) * 255) / (CC_LEN - 1); /* green */ pPal[3*i+2] = ((i / (CC_LEN * CC_LEN)) * 255) / (CC_LEN - 1); /* blue varies least */ /* - g_print("%d\t%d\t%d\n", pPal[3*i ], pPal[3*i+1], pPal[3*i+2]); + g_printerr("%d\t%d\t%d\n", pPal[3*i ], pPal[3*i+1], pPal[3*i+2]); */ } @@ -1208,7 +1208,7 @@ import_data (const gchar *filename, Diag else { bRet = (1 == fread(&i16, sizeof(guint16), 1, f)); if (0x8000 & i16) { - DIAG_NOTE(g_print("Large Object: hi:lo %04X", (int)i16)); + DIAG_NOTE(g_printerr("Large Object: hi:lo %04X", (int)i16)); iSize = i16 << 16; /* Reading large objects involves major uglyness. Instead of getting * one size, as implied by "Encyclopedia of Graphics File Formats", @@ -1217,7 +1217,7 @@ import_data (const gchar *filename, Diag */ iSize = 0; bRet = (1 == fread(&i16, sizeof(guint16), 1, f)); - DIAG_NOTE(g_print("Large Object: %d\n", (int)i16)); + DIAG_NOTE(g_printerr("Large Object: %d\n", (int)i16)); iSize += i16; #if 1 /* Ignore this large objec part */ --- dia-0.97.2.orig/plug-ins/postscript/diapsft2renderer.c +++ dia-0.97.2/plug-ins/postscript/diapsft2renderer.c @@ -234,7 +234,7 @@ void postscript_draw_contour(DiaPsRender } /* - printf("Got face %s (PS %s) for font %s (diafont %s)\n", + fprintf(stderr, "Got face %s (PS %s) for font %s (diafont %s)\n", ft_face->family_name, FT_Get_Postscript_Name(ft_face), pango_font_description_to_string(pango_font_describe(font)), @@ -257,7 +257,7 @@ void postscript_draw_contour(DiaPsRender line_start_pos_x += 1.0 * geometry.width * scale; /* - printf("Drawing glyph %d: index %d at %f, %f (w %d)\n", glyph_idx, + fprintf(stderr, "Drawing glyph %d: index %d at %f, %f (w %d)\n", glyph_idx, glyphs->glyphs[glyph_idx].glyph, pos_x, pos_y, geometry.width); */ --- dia-0.97.2.orig/plug-ins/postscript/win32print.c +++ dia-0.97.2/plug-ins/postscript/win32print.c @@ -52,7 +52,7 @@ PrintError (const char* s, DWORD err) MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char*)&lpBuffer, 0,NULL); - g_print ("%s : %s", s, lpBuffer); + g_printerr ("%s : %s", s, lpBuffer); LocalFree (lpBuffer); } } @@ -86,7 +86,7 @@ win32_printer_open (char* sName) &hPrinter, NULL)) { - g_print ("Failed to open printer : %s\n", sName); + g_printerr ("Failed to open printer : %s\n", sName); return NULL; } --- dia-0.97.2.orig/plug-ins/dxf/dxf-import.c +++ dia-0.97.2/plug-ins/dxf/dxf-import.c @@ -196,7 +196,7 @@ read_entity_line_dxf(FILE *filedxf, DxfD break; case 39: line_width = g_ascii_strtod(data->value, NULL) * WIDTH_SCALE; - /*printf( "line width %f\n", line_width ); */ + /*fprintf(stderr, "line width %f\n", line_width ); */ break; case 62 : color = pal_get_rgb (atoi(data->value)); @@ -275,7 +275,7 @@ read_entity_solid_dxf(FILE *filedxf, Dxf Layer *layer = dia->active_layer; RGB_t color; -/* printf( "Solid " ); */ +/* fprintf(stderr, "Solid " ); */ do { if(read_dxf_codes(filedxf, data) == FALSE){ @@ -287,43 +287,43 @@ read_entity_solid_dxf(FILE *filedxf, Dxf break; case 8: layer = layer_find_by_name(data->value, dia); - /*printf( "layer: %s ", data->value );*/ + /*fprintf(stderr, "layer: %s ", data->value );*/ break; case 10: p[0].x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P0.x: %f ", p[0].x );*/ + /*fprintf(stderr, "P0.x: %f ", p[0].x );*/ break; case 11: p[1].x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P1.x: %f ", p[1].x );*/ + /*fprintf(stderr, "P1.x: %f ", p[1].x );*/ break; case 12: p[2].x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P2.x: %f ", p[2].x );*/ + /*fprintf(stderr, "P2.x: %f ", p[2].x );*/ break; case 13: p[3].x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P3.x: %f ", p[3].x );*/ + /*fprintf(stderr, "P3.x: %f ", p[3].x );*/ break; case 20: p[0].y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P0.y: %f ", p[0].y );*/ + /*fprintf(stderr, "P0.y: %f ", p[0].y );*/ break; case 21: p[1].y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P1.y: %f ", p[1].y );*/ + /*fprintf(stderr, "P1.y: %f ", p[1].y );*/ break; case 22: p[2].y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P2.y: %f ", p[2].y );*/ + /*fprintf(stderr, "P2.y: %f ", p[2].y );*/ break; case 23: p[3].y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P3.y: %f\n", p[3].y );*/ + /*fprintf(stderr, "P3.y: %f\n", p[3].y );*/ break; case 39: line_width = g_ascii_strtod(data->value, NULL) * WIDTH_SCALE; - /*printf( "width %f\n", line_width );*/ + /*fprintf(stderr, "width %f\n", line_width );*/ break; case 62: color = pal_get_rgb (atoi(data->value)); @@ -442,7 +442,7 @@ read_entity_polyline_dxf(FILE *filedxf, p = g_realloc( p, sizeof( Point ) * points ); - /*printf( "Vertex %d\n", points );*/ + /*fprintf(stderr, "Vertex %d\n", points );*/ } break; @@ -451,13 +451,13 @@ read_entity_polyline_dxf(FILE *filedxf, break; case 8: layer = layer_find_by_name(data->value, dia); - /*printf( "layer: %s ", data->value );*/ + /*fprintf(stderr, "layer: %s ", data->value );*/ break; case 10: if( points != 0 ) { p[points-1].x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P[%d].x: %f ", points-1, p[points-1].x );*/ + /*fprintf(stderr, "P[%d].x: %f ", points-1, p[points-1].x );*/ bulge_x_avail = (bulge_end == points); } break; @@ -465,13 +465,13 @@ read_entity_polyline_dxf(FILE *filedxf, if( points != 0 ) { p[points-1].y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "P[%d].y: %f\n", points-1, p[points-1].y );*/ + /*fprintf(stderr, "P[%d].y: %f\n", points-1, p[points-1].y );*/ bulge_y_avail = (bulge_end == points); } break; case 39: line_width = g_ascii_strtod(data->value, NULL) * WIDTH_SCALE; - /*printf( "width %f\n", line_width );*/ + /*fprintf(stderr, "width %f\n", line_width );*/ break; case 40: /* default starting width */ case 41: /* default ending width */ @@ -492,7 +492,7 @@ read_entity_polyline_dxf(FILE *filedxf, break; case 70: closed = 1 & atoi( data->value ); - /*printf( "closed %d %s", closed, data->value );*/ + /*fprintf(stderr, "closed %d %s", closed, data->value );*/ break; } if (points == bulge_end && bulge_x_avail && bulge_y_avail) { @@ -549,16 +549,16 @@ read_entity_polyline_dxf(FILE *filedxf, start_angle = atan( center.y - start.y /center.x - start.x ); } - /*printf( "start x %f end x %f center x %f\n", start.x, end.x, center.x ); - printf( "start y %f end y %f center y %f\n", start.y, end.y, center.y ); - printf( "bulge %s %f startx_angle %f\n", data->value, radius, start_angle );*/ + /*fprintf(stderr, "start x %f end x %f center x %f\n", start.x, end.x, center.x ); + fprintf(stderr, "start y %f end y %f center y %f\n", start.y, end.y, center.y ); + fprintf(stderr, "bulge %s %f startx_angle %f\n", data->value, radius, start_angle );*/ for( i=(points-1); i<(points+9); i++ ) { p[i].x = center.x + cos( start_angle ) * radius; p[i].y = center.y + sin( start_angle ) * radius; start_angle += (-M_PI/10.0 * bulge); - /*printf( "i %d x %f y %f\n", i, p[i].x, p[i].y );*/ + /*fprintf(stderr, "i %d x %f y %f\n", i, p[i].x, p[i].y );*/ } points += 10; @@ -569,7 +569,7 @@ read_entity_polyline_dxf(FILE *filedxf, if( points == 0 ) { - printf( "No vertexes defined\n" ); + fprintf(stderr, "No vertexes defined\n" ); return( NULL ); } @@ -760,18 +760,18 @@ DiaObject *read_entity_arc_dxf(FILE *fil } } while(data->code != 0); - /* printf("c.x=%f c.y=%f s",center.x,center.y); */ + /* fprintf(stderr, "c.x=%f c.y=%f s",center.x,center.y); */ start.x = center.x + cos(start_angle) * radius; start.y = center.y - sin(start_angle) * radius; end.x = center.x + cos(end_angle) * radius; end.y = center.y - sin(end_angle) * radius; - /*printf("s.x=%f s.y=%f e.x=%f e.y=%f\n",start.x,start.y,end.x,end.y);*/ + /*fprintf(stderr, "s.x=%f s.y=%f e.x=%f e.y=%f\n",start.x,start.y,end.x,end.y);*/ if (end_angle < start_angle) end_angle += 2.0*M_PI; curve_distance = radius * (1 - cos ((end_angle - start_angle)/2)); - /*printf("start_angle: %f end_angle: %f radius:%f curve_distance:%f\n", + /*fprintf(stderr, "start_angle: %f end_angle: %f radius:%f curve_distance:%f\n", start_angle,end_angle,radius,curve_distance);*/ arc_obj = otype->ops->create(¢er, otype->default_user_data, @@ -931,30 +931,30 @@ read_entity_text_dxf(FILE *filedxf, DxfD } while( *(++textp) != '\0' ); - /*printf( "Found text: %s\n", textvalue );*/ + /*fprintf(stderr, "Found text: %s\n", textvalue );*/ break; case 8: layer = layer_find_by_name(data->value, dia); break; case 10: location.x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "Found text location x: %f\n", location.x );*/ + /*fprintf(stderr, "Found text location x: %f\n", location.x );*/ break; case 11: location.x = g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "Found text location x: %f\n", location.x );*/ + /*fprintf(stderr, "Found text location x: %f\n", location.x );*/ break; case 20: location.y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; - /*printf( "Found text location y: %f\n", location.y );*/ + /*fprintf(stderr, "Found text location y: %f\n", location.y );*/ break; case 21: location.y = (-1)*g_ascii_strtod(data->value, NULL) * coord_scale * measure_scale; /*location.y = (-1)*g_ascii_strtod(data->value, NULL) / text_scale;*/ - /*printf( "Found text location y: %f\n", location.y );*/ + /*fprintf(stderr, "Found text location y: %f\n", location.y );*/ break; case 40: height = g_ascii_strtod(data->value, NULL) * text_scale * coord_scale * measure_scale; - /*printf( "text height %f\n", height );*/ + /*fprintf(stderr, "text height %f\n", height );*/ break; case 62: color = pal_get_rgb (atoi(data->value)); @@ -1088,7 +1088,7 @@ void read_entity_measurement_dxf(FILE *f measure_scale = 2.54; else measure_scale = 1.0; - /*printf( "Measure Scale: %f\n", measure_scale );*/ + /*fprintf(stderr, "Measure Scale: %f\n", measure_scale );*/ break; default: @@ -1108,7 +1108,7 @@ read_entity_textsize_dxf(FILE *filedxf, { case 40: text_scale = g_ascii_strtod(data->value, NULL); - /*printf( "Text Size: %f\n", text_scale );*/ + /*fprintf(stderr, "Text Size: %f\n", text_scale );*/ break; default: break; @@ -1241,7 +1241,7 @@ read_section_blocks_dxf(FILE *filedxf, D } else if((data->code == 0) && (strcmp(data->value, "ARC") == 0)) { obj = read_entity_arc_dxf(filedxf,data,dia); } else if((data->code == 0) && (strcmp(data->value, "BLOCK") == 0)) { - /* printf("Begin group\n" ); */ + /* fprintf(stderr, "Begin group\n" ); */ group = TRUE; group_items = 0; @@ -1260,7 +1260,7 @@ read_section_blocks_dxf(FILE *filedxf, D } while(data->code != 0); } else if((data->code == 0) && (strcmp(data->value, "ENDBLK") == 0)) { - /* printf( "End group %d\n", group_items ); */ + /* fprintf(stderr, "End group %d\n", group_items ); */ if( group && group_items > 0 && group_list != NULL ) { @@ -1335,31 +1335,31 @@ import_dxf(const gchar *filename, Diagra } else if(strcmp(data->value, "EOF") == 0) { /* handled below */ } else { - g_print ("DXF 0:%s not handled\n", data->value); + g_printerr ("DXF 0:%s not handled\n", data->value); } } else if(data->code == 2) { if(strcmp(data->value, "ENTITIES") == 0) { - /*printf( "reading section entities\n" );*/ + /*fprintf(stderr, "reading section entities\n" );*/ read_section_entities_dxf(filedxf, data, dia); } else if(strcmp(data->value, "BLOCKS") == 0) { - /*printf( "reading section BLOCKS\n" );*/ + /*fprintf(stderr, "reading section BLOCKS\n" );*/ read_section_blocks_dxf(filedxf, data, dia); } else if(strcmp(data->value, "CLASSES") == 0) { - /*printf( "reading section CLASSES\n" );*/ + /*fprintf(stderr, "reading section CLASSES\n" );*/ read_section_classes_dxf(filedxf, data, dia); } else if(strcmp(data->value, "HEADER") == 0) { - /*printf( "reading section HEADER\n" );*/ + /*fprintf(stderr, "reading section HEADER\n" );*/ read_section_header_dxf(filedxf, data, dia); } else if(strcmp(data->value, "TABLES") == 0) { - /*printf( "reading section tables\n" );*/ + /*fprintf(stderr, "reading section tables\n" );*/ read_section_tables_dxf(filedxf, data, dia); } else if(strcmp(data->value, "OBJECTS") == 0) { - /*printf( "reading section objects\n" );*/ + /*fprintf(stderr, "reading section objects\n" );*/ read_section_entities_dxf(filedxf, data, dia); } } --- dia-0.97.2.orig/plug-ins/xfig/xfig-import.c +++ dia-0.97.2/plug-ins/xfig/xfig-import.c @@ -323,11 +323,11 @@ fig_fix_text(gchar *text) { converted = g_convert(text, strlen(text), "UTF-8", "ISO-8859-1", NULL, NULL, &err); if (err != NULL) { - printf("Error converting %s: %s\n", text, err->message); + fprintf(stderr, "Error converting %s: %s\n", text, err->message); return text; } if (!g_utf8_validate(converted, -1, NULL)) { - printf("Fails to validate %s\n", converted); + fprintf(stderr, "Fails to validate %s\n", converted); return text; } if (text != converted) g_free(text); --- dia-0.97.2.orig/tests/test-objects.c +++ dia-0.97.2/tests/test-objects.c @@ -209,7 +209,7 @@ _test_movement (const DiaObjectType *typ /* FIXME: this shape should be simple enough to actually fix the bug */ || strcmp (type->name, "Assorted - Heart") == 0 ) - g_print ("SKIPPED! "); + g_printerr ("SKIPPED! "); else g_assert ( fabs((bbox2.right - bbox2.left) - (bbox1.right - bbox1.left)) < EPSILON && fabs((bbox2.bottom - bbox2.top) - (bbox1.bottom - bbox1.top)) < EPSILON); @@ -242,7 +242,7 @@ _test_change (const DiaObjectType *type) /* maybe we should do something interesting first? */ _object_change_free(change); } else { - g_print ("'%s' - no undo?\n", o->type->name); + g_printerr ("'%s' - no undo?\n", o->type->name); } } /* finally */ @@ -315,9 +315,9 @@ main (int argc, char** argv) object_registry_foreach (_ot_item, "/Dia/Objects"); ret = g_test_run (); - g_print ("%d objects.\n", num_objects); + g_printerr ("%d objects.\n", num_objects); #else - g_print ("GLib version does not support g_test_*()"); + g_printerr ("GLib version does not support g_test_*()"); #endif return ret; } --- dia-0.97.2.orig/tests/test-boundingbox.c +++ dia-0.97.2/tests/test-boundingbox.c @@ -140,7 +140,7 @@ main (int argc, char** argv) ret = g_test_run (); #else - g_print ("GLib version does not support g_test_*()"); + g_printerr ("GLib version does not support g_test_*()"); #endif return ret; } --- dia-0.97.2.orig/app/textedit_tool.c +++ dia-0.97.2/app/textedit_tool.c @@ -47,7 +47,7 @@ click_select_object(DDisplay *ddisp, Poi if (obj) { /* Selected an object. */ GList *already; - /*printf("Selected object!\n");*/ + /*fprintf(stderr, "Selected object!\n");*/ already = g_list_find(diagram->data->selected, obj); if (already == NULL) { /* Not already selected */ --- dia-0.97.2.orig/app/diagram.c +++ dia-0.97.2/app/diagram.c @@ -1186,7 +1186,7 @@ void diagram_unparent_children_selected( (change->apply)(change, dia); } if (obj->children != NULL) - printf("Obj still has %d children\n", + fprintf(stderr, "Obj still has %d children\n", g_list_length(obj->children)); } if (any_unparented) { --- dia-0.97.2.orig/app/undo.c +++ dia-0.97.2/app/undo.c @@ -29,8 +29,8 @@ #include "textedit.h" #include "parent.h" -#if 0 -#define DEBUG_PRINTF(args) printf args +#if 0 +#define DEBUG_PRINTF(args) { char *tmps = g_strdup_printf args ; fprintf(stderr, tmps); g_free(tmps); } #else #define DEBUG_PRINTF(args) #endif --- dia-0.97.2.orig/app/modify_tool.c +++ dia-0.97.2/app/modify_tool.c @@ -115,7 +115,7 @@ transitive_select(DDisplay *ddisp, Point DiaObject *obj1; for(i = 0; i < obj->num_connections; i++) { - printf("%d\n", i); + fprintf(stderr, "%d\n", i); j = obj->connections[i]->connected; while(j != NULL && (obj1 = (DiaObject *)j->data) != NULL) { diagram_select(ddisp->diagram, obj1); @@ -148,11 +148,11 @@ click_select_object(DDisplay *ddisp, Poi if (obj!=NULL) { /* Selected an object. */ GList *already; - /*printf("Selected object!\n");*/ + /*fprintf(stderr, "Selected object!\n");*/ already = g_list_find(diagram->data->selected, obj); if (already == NULL) { /* Not already selected */ - /*printf("Not already selected\n");*/ + /*fprintf(stderr, "Not already selected\n");*/ if (!(event->state & GDK_SHIFT_MASK)) { /* Not Multi-select => remove current selection */ @@ -178,7 +178,7 @@ click_select_object(DDisplay *ddisp, Poi return obj; } else { /* Clicked on already selected. */ - /*printf("Already selected\n");*/ + /*fprintf(stderr, "Already selected\n");*/ /* To be removed once text edit mode is stable. By then, * we don't want to automatically edit selected objects. textedit_activate_object(ddisp, obj, clickedpoint); @@ -352,7 +352,7 @@ modify_double_click(ModifyTool *tool, Gd if ( clicked_obj != NULL ) { object_list_properties_show(ddisp->diagram, ddisp->diagram->data->selected); } else { /* No object selected */ - /*printf("didn't select object\n");*/ + /*fprintf(stderr, "didn't select object\n");*/ if (!(event->state & GDK_SHIFT_MASK)) { /* Not Multi-select => Remove all selected */ ddisplay_do_update_menu_sensitivity(ddisp); @@ -869,10 +869,10 @@ modify_edit_end(GtkWidget *widget, GdkEv const PropDescription *props = obj->ops->describe_props(obj); int i; - printf("Ending focus\n"); + fprintf(stderr, "Ending focus\n"); for (i = 0; props[i].name != NULL; i++) { - printf("Testing to remove: %s\n", props[i].name); + fprintf(stderr, "Testing to remove: %s\n", props[i].name); if (props[i].type_quark == quark) { GPtrArray *textprops = g_ptr_array_sized_new(1); TextProperty *textprop; @@ -880,7 +880,7 @@ modify_edit_end(GtkWidget *widget, GdkEv GtkTextBuffer *buf; GtkTextIter start, end; - printf("Going to stop %d\n", i); + fprintf(stderr, "Going to stop %d\n", i); buf = gtk_text_view_get_buffer(view); g_ptr_array_add(textprops, prop); obj->ops->get_props(obj, textprops); @@ -888,7 +888,7 @@ modify_edit_end(GtkWidget *widget, GdkEv if (textprop->text_data != NULL) g_free(textprop->text_data); gtk_text_buffer_get_bounds(buf, &start, &end); textprop->text_data = gtk_text_buffer_get_text(buf, &start, &end, TRUE); - printf("Setting text %s\n", textprop->text_data); + fprintf(stderr, "Setting text %s\n", textprop->text_data); obj->ops->set_props(obj, textprops); gtk_widget_destroy(widget); } @@ -906,7 +906,7 @@ modify_start_text_edit(DDisplay *ddisp, GtkTextIter start, end; Rectangle text_bbox; - printf("modify_start_text_edit\n"); + fprintf(stderr, "modify_start_text_edit\n"); /* This might need to account for zoom factor. */ text_calc_boundingbox(text, &text_bbox); ddisplay_transform_coords(ddisp, @@ -928,7 +928,7 @@ modify_start_text_edit(DDisplay *ddisp, gtk_text_buffer_get_bounds(buf, &start, &end); gtk_text_buffer_apply_tag(buf, fonttag, &start, &end); - printf("Above lines %d below %d\n", + fprintf(stderr, "Above lines %d below %d\n", gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(view)), gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(view))); @@ -961,7 +961,7 @@ modify_make_text_edit(DDisplay *ddisp, D int i; for (i = 0; props[i].name != NULL; i++) { GQuark type = g_quark_from_string(PROP_TYPE_TEXT); - printf("Testing %s\n", props[i].type); + fprintf(stderr, "Testing %s\n", props[i].type); if (props[i].type_quark == type) { GtkWidget *view = gtk_text_view_new(); GPtrArray *textprops = g_ptr_array_sized_new(1); @@ -977,7 +977,7 @@ modify_make_text_edit(DDisplay *ddisp, D g_ptr_array_add(textprops, prop); - printf("Found text prop %d\n", i); + fprintf(stderr, "Found text prop %d\n", i); obj->ops->get_props(obj, textprops); textprop = (TextProperty*)prop; ddisplay_transform_coords(ddisp, @@ -991,7 +991,7 @@ modify_make_text_edit(DDisplay *ddisp, D ascent = ddisplay_transform_length(ddisp, text_line_get_ascent(temp_line)); text_line_destroy(temp_line); - printf("Text prop string %s pos %d, %d ascent %f\n", + fprintf(stderr, "Text prop string %s pos %d, %d ascent %f\n", textprop->text_data, x, y, ascent); ascent_pixels = ddisplay_transform_length(ddisp, ascent); y -= ascent_pixels; @@ -1008,7 +1008,7 @@ modify_make_text_edit(DDisplay *ddisp, D gtk_text_buffer_get_bounds(buf, &start, &end); gtk_text_buffer_apply_tag(buf, fonttag, &start, &end); - printf("Above lines %d below %d\n", + fprintf(stderr, "Above lines %d below %d\n", gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(view)), gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(view))); --- dia-0.97.2.orig/app/load_save.c +++ dia-0.97.2/app/load_save.c @@ -1117,7 +1117,7 @@ diagram_cleanup_autosave(Diagram *dia) savefile = dia->autosavefilename; if (savefile == NULL) return; #ifdef TRACES - g_print("Cleaning up autosave %s for %s\n", + g_printerr("Cleaning up autosave %s for %s\n", savefile, dia->filename ? dia->filename : ""); #endif if (g_stat(savefile, &statbuf) == 0) { /* Success */ --- dia-0.97.2.orig/app/display.c +++ dia-0.97.2/app/display.c @@ -644,7 +644,7 @@ ddisplay_render_pixmap(DDisplay *ddisp, #endif if (ddisp->renderer==NULL) { - printf("ERROR! Renderer was NULL!!\n"); + fprintf(stderr, "ERROR! Renderer was NULL!!\n"); return; } @@ -669,7 +669,7 @@ ddisplay_render_pixmap(DDisplay *ddisp, data_render(ddisp->diagram->data, ddisp->renderer, update, ddisplay_obj_render, (gpointer) ddisp); #ifdef TRACES - g_print ("data_render(%g%%) took %g seconds\n", ddisp->zoom_factor * 5.0, g_timer_elapsed (timer, NULL)); + g_printerr ("data_render(%g%%) took %g seconds\n", ddisp->zoom_factor * 5.0, g_timer_elapsed (timer, NULL)); g_timer_destroy (timer); #endif /* Draw handles for all selected objects */ --- dia-0.97.2.orig/app/gtkvwrapbox.c +++ dia-0.97.2/app/gtkvwrapbox.c @@ -221,7 +221,7 @@ gtk_vwrap_box_size_request (GtkWidget requisition->width = layout_width; } - /* g_print ("ratio for height %d width %d = %f\n", + /* g_printerr ("ratio for height %d width %d = %f\n", (gint) layout_height, (gint) layout_width, ratio); @@ -231,7 +231,7 @@ gtk_vwrap_box_size_request (GtkWidget requisition->width += GTK_CONTAINER (wbox)->border_width * 2; /**/ requisition->height += GTK_CONTAINER (wbox)->border_width * 2; /**/ - /* g_print ("chosen: height %d, width %d\n", + /* g_printerr ("chosen: height %d, width %d\n", requisition->height, requisition->width); */ @@ -419,10 +419,10 @@ layout_col (GtkWrapBox *wbox, } else { - /* g_print ("child_allocation.y %d += %d * %f ", + /* g_printerr ("child_allocation.y %d += %d * %f ", child_allocation.y, n_children, extra); */ child_allocation.y += n_children * extra; - /* g_print ("= %d\n", + /* g_printerr ("= %d\n", child_allocation.y); */ child_allocation.height = MIN (child_requisition.height, area->height - child_allocation.y + area->y); @@ -606,7 +606,7 @@ gtk_vwrap_box_size_allocate (GtkWidget area.width = MAX (1, (gint) allocation->width - border * 2); /**/ - /* g_print ("got: width %d, height %d\n", + /* g_printerr ("got: width %d, height %d\n", allocation->width, allocation->height); */ --- dia-0.97.2.orig/app/autosave.c +++ dia-0.97.2/app/autosave.c @@ -119,7 +119,7 @@ autosave_restore_documents(void) if (dir == NULL) return; while ((ent = g_dir_read_name(dir)) != NULL) { - printf("Found autosave file %s\n", ent); + fprintf(stderr, "Found autosave file %s\n", ent); files = g_list_prepend(files, g_strdup(ent)); } --- dia-0.97.2.orig/app/app_procs.c +++ dia-0.97.2/app/app_procs.c @@ -210,7 +210,7 @@ show_layers_parse_numbers(DiagramData *d if ( high <= low ) { /* This is not an errror */ - g_print(_("Warning: invalid layer range %lu - %lu\n"), low, high-1 ); + g_printerr(_("Warning: invalid layer range %lu - %lu\n"), low, high-1 ); return; } if (high > n_layers) @@ -222,7 +222,7 @@ show_layers_parse_numbers(DiagramData *d Layer *lay = (Layer *)g_ptr_array_index(diagdata->layers, i); if (visible_layers[i] == TRUE) - g_print(_("Warning: Layer %lu (%s) selected more than once.\n"), i, lay->name); + g_printerr(_("Warning: Layer %lu (%s) selected more than once.\n"), i, lay->name); visible_layers[i] = TRUE; } } @@ -248,7 +248,7 @@ show_layers_parse_word(DiagramData *diag && ((p[len] == 0) || (p[len] == ','))){ found = TRUE; if (visible_layers[k] == TRUE) - g_print(_("Warning: Layer %d (%s) selected more than once.\n"), k, lay->name); + g_printerr(_("Warning: Layer %d (%s) selected more than once.\n"), k, lay->name); visible_layers[k] = TRUE; } } @@ -257,7 +257,7 @@ show_layers_parse_word(DiagramData *diag } if (found == FALSE) - g_print(_("Warning: There is no layer named %s\n"), str); + g_printerr(_("Warning: There is no layer named %s\n"), str); } static void @@ -383,7 +383,7 @@ do_convert(const char *infname, } else ef->export_func(diagdata, outfname, infname, ef->user_data); - /* if (!quiet) */ fprintf(stdout, + /* if (!quiet) */ fprintf(stderr, _("%s --> %s\n"), infname,outfname); g_object_unref(diagdata); @@ -504,7 +504,7 @@ dump_dependencies(void) if ((len = readlink (PREFIX "/lib/libpango-1.0.so", linkedname, 1023)) > 0) { /* man 2 readlink : does not append a NUL character */ linkedname[len] = '\0'; - g_print ("%s/%s\n", PREFIX, linkedname); + g_printerr ("%s/%s\n", PREFIX, linkedname); } } #endif @@ -778,10 +778,10 @@ app_init (int argc, char **argv) if (!g_option_context_parse (context, &argc, &argv, &error)) { if (error) { /* IMO !error here is a bug upstream, triggered e.g. with --gdk-debug=updates */ - g_print ("%s", error->message); + g_printerr ("%s", error->message); g_error_free (error); } else { - g_print (_("Invalid option?")); + g_printerr (_("Invalid option?")); } g_option_context_free(context); @@ -804,7 +804,7 @@ app_init (int argc, char **argv) filename = g_filename_to_utf8 (filenames[i], -1, NULL, NULL, NULL); if (!filename) { - g_print (_("Filename conversion failed: %s\n"), filenames[i]); + g_printerr (_("Filename conversion failed: %s\n"), filenames[i]); continue; } @@ -817,7 +817,7 @@ app_init (int argc, char **argv) if (g_file_test (testpath, G_FILE_TEST_IS_REGULAR)) files = g_slist_append(files, filename); else { - g_print (_("Missing input: %s\n"), filename); + g_printerr (_("Missing input: %s\n"), filename); g_free (filename); } if (filename != testpath) @@ -882,9 +882,9 @@ app_init (int argc, char **argv) if (version) { #if (defined __TIME__) && (defined __DATE__) /* TRANSLATOR: 2nd and 3rd %s are time and date respectively. */ - printf(g_locale_from_utf8(_("Dia version %s, compiled %s %s\n"), -1, NULL, NULL, NULL), VERSION, __TIME__, __DATE__); + fprintf(stderr, g_locale_from_utf8(_("Dia version %s, compiled %s %s\n"), -1, NULL, NULL, NULL), VERSION, __TIME__, __DATE__); #else - printf(g_locale_from_utf8(_("Dia version %s\n"), -1, NULL, NULL, NULL), VERSION); + fprintf(stderr, g_locale_from_utf8(_("Dia version %s\n"), -1, NULL, NULL, NULL), VERSION); #endif if (verbose) dump_dependencies(); --- dia-0.97.2.orig/app/gtkhwrapbox.c +++ dia-0.97.2/app/gtkhwrapbox.c @@ -221,7 +221,7 @@ gtk_hwrap_box_size_request (GtkWidget requisition->height = layout_height; } - /* g_print ("ratio for width %d height %d = %f\n", + /* g_printerr ("ratio for width %d height %d = %f\n", (gint) layout_width, (gint) layout_height, ratio); @@ -231,7 +231,7 @@ gtk_hwrap_box_size_request (GtkWidget requisition->width += GTK_CONTAINER (wbox)->border_width * 2; /**/ requisition->height += GTK_CONTAINER (wbox)->border_width * 2; /**/ - /* g_print ("chosen: width %d, height %d\n", + /* g_printerr ("chosen: width %d, height %d\n", requisition->width, requisition->height); */ @@ -419,10 +419,10 @@ layout_row (GtkWrapBox *wbox, } else { - /* g_print ("child_allocation.x %d += %d * %f ", + /* g_printerr ("child_allocation.x %d += %d * %f ", child_allocation.x, n_children, extra); */ child_allocation.x += n_children * extra; - /* g_print ("= %d\n", + /* g_printerr ("= %d\n", child_allocation.x); */ child_allocation.width = MIN (child_requisition.width, area->width - child_allocation.x + area->x); @@ -606,7 +606,7 @@ gtk_hwrap_box_size_allocate (GtkWidget area.height = MAX (1, (gint) allocation->height - border * 2); /**/ - /* g_print ("got: width %d, height %d\n", + /* g_printerr ("got: width %d, height %d\n", allocation->width, allocation->height); */ --- dia-0.97.2.orig/app/layer_dialog.c +++ dia-0.97.2/app/layer_dialog.c @@ -247,10 +247,10 @@ layer_list_events (GtkWidget *widget, kevent = (GdkEventKey *) event; switch (kevent->keyval) { case GDK_Up: - /* printf ("up arrow\n"); */ + /* fprintf(stderr, "up arrow\n"); */ break; case GDK_Down: - /* printf ("down arrow\n"); */ + /* fprintf(stderr, "down arrow\n"); */ break; default: return FALSE; @@ -1416,7 +1416,7 @@ layer_visibility_change_revert(struct La } if (vis != NULL || i < layers->len) { - printf("Internal error: visibility undo has %d visibilities, but %d layers\n", + fprintf(stderr, "Internal error: visibility undo has %d visibilities, but %d layers\n", g_list_length(change->original_visibility), layers->len); } --- dia-0.97.2.orig/app/disp_callbacks.c +++ dia-0.97.2/app/disp_callbacks.c @@ -358,7 +358,7 @@ ddisplay_size_allocate (GtkWidget *widge g_return_if_fail (data != NULL); #if 0 - g_print ("ddisp::size_allocate: %d,%d -> %d,%d\n", allocation->width, allocation->height, + g_printerr ("ddisp::size_allocate: %d,%d -> %d,%d\n", allocation->width, allocation->height, widget->allocation.width, widget->allocation.height); #endif widget->allocation = *allocation; @@ -788,7 +788,7 @@ ddisplay_canvas_events (GtkWidget *canva key_handled = FALSE; im_context_used = FALSE; #if 0 - printf("Key input %d in state %d\n", kevent->keyval, textedit_mode(ddisp)); + fprintf(stderr, "Key input %d in state %d\n", kevent->keyval, textedit_mode(ddisp)); #endif focus = get_active_focus((DiagramData *) ddisp->diagram); if (focus != NULL) { --- dia-0.97.2.orig/objects/standard/arc.c +++ dia-0.97.2/objects/standard/arc.c @@ -335,17 +335,17 @@ arc_move_handle(Arc *arc, Handle *handle } if (handle->id == HANDLE_MIDDLE) { - TRACE(printf("curve_dist: %.2f \n",arc->curve_distance)); + TRACE(fprintf(stderr, "curve_dist: %.2f \n",arc->curve_distance)); arc->curve_distance = arc_compute_curve_distance(arc, &arc->connection.endpoints[0], &arc->connection.endpoints[1], to); - TRACE(printf("curve_dist: %.2f \n",arc->curve_distance)); + TRACE(fprintf(stderr, "curve_dist: %.2f \n",arc->curve_distance)); } else { Point best; - TRACE(printf("Modifiers: %d \n",modifiers)); + TRACE(fprintf(stderr, "Modifiers: %d \n",modifiers)); if (modifiers & MODIFIER_SHIFT) /* if(arc->end_arrow.type == ARROW_NONE)*/ { - TRACE(printf("SHIFT USED, to at %.2f %.2f ",to->x,to->y)); + TRACE(fprintf(stderr, "SHIFT USED, to at %.2f %.2f ",to->x,to->y)); if (arc_find_radial(arc, to, &best)){ /* needs to move two handles at the same time * compute pos of middle handle */ @@ -360,10 +360,10 @@ arc_move_handle(Arc *arc, Handle *handle connection_move_handle(&arc->connection, handle->id, &best, cp, reason, modifiers); /* recompute curve distance equiv. move middle handle */ arc->curve_distance = arc_compute_curve_distance(arc, &arc->connection.endpoints[0], &arc->connection.endpoints[1], &midpoint); - TRACE(printf("curve_dist: %.2f \n",arc->curve_distance)); + TRACE(fprintf(stderr, "curve_dist: %.2f \n",arc->curve_distance)); } else { - TRACE(printf("NO best\n")); + TRACE(fprintf(stderr, "NO best\n")); } } else { connection_move_handle(&arc->connection, handle->id, to, cp, reason, modifiers); @@ -411,21 +411,21 @@ arc_compute_midpoint(Arc *arc, const Poi return 0; } if (angle < -1 * M_PI){ - TRACE(printf("angle: %.2f ",angle)); + TRACE(fprintf(stderr, "angle: %.2f ",angle)); angle += 2*M_PI; - TRACE(printf("angle: %.2f ",angle)); + TRACE(fprintf(stderr, "angle: %.2f ",angle)); } if (angle > 1 * M_PI){ - TRACE(printf("angle: %.2f ",angle)); + TRACE(fprintf(stderr, "angle: %.2f ",angle)); angle -= 2*M_PI; - TRACE(printf("angle: %.2f ",angle)); + TRACE(fprintf(stderr, "angle: %.2f ",angle)); } midpos = arc->middle_handle.pos; /*rotate middle handle by half the angle */ - TRACE(printf("\nmidpos before: %.2f %.2f \n",midpos.x, midpos.y)); + TRACE(fprintf(stderr, "\nmidpos before: %.2f %.2f \n",midpos.x, midpos.y)); rotate_point_around_point(&midpos, &arc->center, angle/2); - TRACE(printf("\nmidpos after : %.2f %.2f \n",midpos.x, midpos.y)); + TRACE(fprintf(stderr, "\nmidpos after : %.2f %.2f \n",midpos.x, midpos.y)); *midpoint = midpos; return 1; } @@ -481,12 +481,12 @@ calculate_arc_object_edge(Arc *arc, real mid2 = get_middle_arc_angle(ang_start, ang_end, clockwiseness); mid3 = ang_end; - TRACE(printf("Find middle angle between %f° and %f°\n",ang_start,ang_end)); + TRACE(fprintf(stderr, "Find middle angle between %f° and %f°\n",ang_start,ang_end)); /* If the other end is inside the object */ arc_get_point_at_angle(arc,target,mid1); dist = obj->ops->distance_from(obj, target ); if (dist < 0.001){ - TRACE(printf("Point at %f°: %f,%f is very close to object: %f, returning it\n",mid1, target->x, target->y, dist)); + TRACE(fprintf(stderr, "Point at %f°: %f,%f is very close to object: %f, returning it\n",mid1, target->x, target->y, dist)); return ; } do { @@ -510,7 +510,7 @@ calculate_arc_object_edge(Arc *arc, real #ifdef TRACE_DIST for (j = 0; j < i; j++) { arc_get_point_at_angle(arc,target,trace[j]); - printf("%d: %f ° : %f,%f :%f\n", j, trace[j],target->x,target->y, disttrace[j]); + fprintf(stderr, "%d: %f ° : %f,%f :%f\n", j, trace[j],target->x,target->y, disttrace[j]); } #endif arc_get_point_at_angle(arc,target,mid2); @@ -534,17 +534,17 @@ arc_draw(Arc *arc, DiaRenderer *renderer start_cp = arc->connection.endpoint_handles[0].connected_to; end_cp = arc->connection.endpoint_handles[1].connected_to; - TRACE(printf("drawing arc:\n start:%f °:%f,%f \tend:%f °:%f,%f\n",arc->angle1,endpoints[0].x,endpoints[0].y, arc->angle2,endpoints[1].x,endpoints[1].y)); + TRACE(fprintf(stderr, "drawing arc:\n start:%f °:%f,%f \tend:%f °:%f,%f\n",arc->angle1,endpoints[0].x,endpoints[0].y, arc->angle2,endpoints[1].x,endpoints[1].y)); if (connpoint_is_autogap(start_cp)) { - TRACE(printf("computing start intersection\ncurve_distance: %f\n",arc->curve_distance)); + TRACE(fprintf(stderr, "computing start intersection\ncurve_distance: %f\n",arc->curve_distance)); if (arc->curve_distance < 0) calculate_arc_object_edge(arc, arc->angle1, arc->angle2, start_cp->object, &gaptmp[0], FALSE); else calculate_arc_object_edge(arc, arc->angle2, arc->angle1, start_cp->object, &gaptmp[0], TRUE); } if (connpoint_is_autogap(end_cp)) { - TRACE(printf("computing end intersection\ncurve_distance: %f\n",arc->curve_distance)); + TRACE(fprintf(stderr, "computing end intersection\ncurve_distance: %f\n",arc->curve_distance)); if (arc->curve_distance < 0) calculate_arc_object_edge(arc, arc->angle2, arc->angle1, end_cp->object, &gaptmp[1], TRUE); else @@ -561,7 +561,7 @@ arc_draw(Arc *arc, DiaRenderer *renderer /* Special case when almost line: */ if (fabs(arc->curve_distance) <= 0.01) { - TRACE(printf("drawing like a line\n")); + TRACE(fprintf(stderr, "drawing like a line\n")); renderer_ops->draw_line_with_arrows(renderer, &gaptmp[0], &gaptmp[1], arc->line_width, --- dia-0.97.2.orig/objects/chronogram/chronoline_event.c +++ dia-0.97.2/objects/chronogram/chronoline_event.c @@ -74,7 +74,7 @@ static void dump_parsed_clelist(CLEventL int i = 0; const char *s = NULL; - printf("ChronoLine Event List dump follows:\n"); + fprintf(stderr, "ChronoLine Event List dump follows:\n"); while (clel) { CLEvent *evt = (CLEvent *)(clel->data); switch (evt->type) { @@ -85,11 +85,11 @@ static void dump_parsed_clelist(CLEventL default: g_assert_not_reached(); } - printf("%3d t=%7.3f %s\n",i++,evt->time,s); + fprintf(stderr, "%3d t=%7.3f %s\n",i++,evt->time,s); clel = g_slist_next(clel); } - printf("ChronoLine Event List dump finished.\n"); + fprintf(stderr, "ChronoLine Event List dump finished.\n"); } #endif @@ -248,7 +248,7 @@ __chksum(const char *str, real rise, rea i = __forward_checksum_i(i,*p); p++; } - /* printf("chksum[%s] = %d\n",str,i); */ + /* fprintf(stderr, "chksum[%s] = %d\n",str,i); */ return i; } --- dia-0.97.2.orig/objects/Database/table_dialog.c +++ dia-0.97.2/objects/Database/table_dialog.c @@ -323,7 +323,7 @@ table_change_apply (TableChange * change TableState * old_state; GList * lst; - g_print ("apply (o: 0x%08x) (c: 0x%08x)\n", GPOINTER_TO_UINT(obj), GPOINTER_TO_UINT(change)); + g_printerr ("apply (o: 0x%08x) (c: 0x%08x)\n", GPOINTER_TO_UINT(obj), GPOINTER_TO_UINT(change)); /* first the get the current state for later use */ old_state = table_state_new (change->obj); --- dia-0.97.2.orig/objects/custom/shape_typeinfo.c +++ dia-0.97.2/objects/custom/shape_typeinfo.c @@ -148,9 +148,9 @@ _error (void *ctx, if (READ_DONE == context->state) return; /* we are ready, not interested in further complains */ va_start(args, msg); - g_print ("Error: %s\n", context->si->filename); - g_vprintf (msg, args); - g_print ("\n"); + g_printerr ("Error: %s\n", context->si->filename); + g_vfprintf(stderr, msg, args); + g_printerr ("\n"); va_end(args); } @@ -165,9 +165,9 @@ _warning (void *ctx, if (READ_DONE == context->state) return; /* we are ready, not interested in further complains */ va_start(args, msg); - g_print ("Warning: %s\n", context->si->filename); - g_vprintf (msg, args); - g_print ("\n"); + g_printerr ("Warning: %s\n", context->si->filename); + g_vfprintf(stderr, msg, args); + g_printerr ("\n"); va_end(args); } @@ -215,7 +215,7 @@ shape_typeinfo_load (ShapeInfo* info) } return TRUE; } else { - g_print ("Preloading shape file '%s' failed.\n" + g_printerr ("Preloading shape file '%s' failed.\n" "Please ensure that and are early in the file.\n", info->filename); } --- dia-0.97.2.orig/objects/UML/class_dialog.c +++ dia-0.97.2/objects/UML/class_dialog.c @@ -742,7 +742,7 @@ attribute_list_item_destroy_callback(Gtk if (attr != NULL) { uml_attribute_destroy(attr); - /*printf("Destroying list_item's user_data!\n");*/ + /*fprintf(stderr, "Destroying list_item's user_data!\n");*/ } } @@ -1686,7 +1686,7 @@ operations_list_item_destroy_callback(Gt if (op != NULL) { uml_operation_destroy(op); - /*printf("Destroying operation list_item's user_data!\n");*/ + /*fprintf(stderr, "Destroying operation list_item's user_data!\n");*/ } } @@ -2508,7 +2508,7 @@ templates_list_item_destroy_callback(Gtk if (param != NULL) { uml_formalparameter_destroy(param); - /*printf("Destroying list_item's user_data!\n"); */ + /*fprintf(stderr, "Destroying list_item's user_data!\n"); */ } } debian/patches/remove-std-c89.patch0000644000000000000000000000114212261434273014326 0ustar Description: Don't use --std=c89 This patch fixes implicit pointer conversions by disabling the c89 GCC option Author: Roland Stigge Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=364544 --- dia-0.97.1.orig/configure.in +++ dia-0.97.1/configure.in @@ -411,7 +411,6 @@ if test "$GCC" = yes; then DIA_CHECK_CFLAG(-Wall) dnl DIA_CHECK_CFLAG(-Wunused) - DIA_CHECK_CFLAG(--std=c89) DIA_CHECK_CFLAG(-Wdeclaration-after-statement) dnl I'd rather like to enable this but it fails on isnan() with -std=c89 dnl DIA_CHECK_CFLAG(-Werror-implicit-function-declaration) debian/patches/fix-include-glib-headers.patch0000644000000000000000000000310412261434273016373 0ustar Description: Fix glib header include glib headers must be included via glib.h only (not via separate partial glib*.h headers). This patch fixes that. Author: Roland Stigge Bug-Debian: http://bugs.debian.org/665521 Index: dia-0.97.2/objects/custom/shape_typeinfo.c =================================================================== --- dia-0.97.2.orig/objects/custom/shape_typeinfo.c 2011-12-31 16:43:25.000000000 +0100 +++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-03-24 22:04:20.000000000 +0100 @@ -27,7 +27,7 @@ #include "custom_util.h" #include #include -#include +#include #include #include Index: dia-0.97.2/tests/test-boundingbox.c =================================================================== --- dia-0.97.2.orig/tests/test-boundingbox.c 2011-12-31 16:43:25.000000000 +0100 +++ dia-0.97.2/tests/test-boundingbox.c 2012-03-24 22:36:02.000000000 +0100 @@ -28,9 +28,6 @@ #include #include -#if GLIB_CHECK_VERSION(2,16,0) -#include -#endif #include "dialib.h" /* Index: dia-0.97.2/tests/test-objects.c =================================================================== --- dia-0.97.2.orig/tests/test-objects.c 2012-03-24 22:50:25.000000000 +0100 +++ dia-0.97.2/tests/test-objects.c 2012-03-24 22:51:01.000000000 +0100 @@ -28,10 +28,6 @@ #include #include -#if GLIB_CHECK_VERSION(2,16,0) -#include -#endif - #include "object.h" #include "plug-ins.h" #include "dialib.h" debian/patches/fix-psdoc.patch0000644000000000000000000000103412261434273013534 0ustar Description: Fix PSDOC PSDOC currently doesn't build. Therefore omit it. Author: Roland Stigge --- dia-0.97.1.orig/configure.in +++ dia-0.97.1/configure.in @@ -510,7 +510,7 @@ if test "x$with_hardbooks" = "xno"; then else AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno") AM_CONDITIONAL(WITH_PDFDOC, test "x$dblatex" != "xno") - AM_CONDITIONAL(WITH_PSDOC, test "x$dblatex" != "xno") + AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno") if test "x$dblatex" != "xno" ; then hardbook_ok=yes else debian/patches/fix-helpdir.patch0000644000000000000000000000344312261434273014061 0ustar Description: Use Debian help path This patch fixes Dia to use Debian's help directory for documentation Author: Roland Stigge --- dia-0.97.1.orig/app/commands.c +++ dia-0.97.1/app/commands.c @@ -632,16 +632,14 @@ edit_redo_callback (GtkAction *action) void help_manual_callback (GtkAction *action) { -#ifdef GNOME - gnome_help_display("dia", NULL, NULL); -#else char *helpdir, *helpindex = NULL, *command; guint bestscore = G_MAXINT; GDir *dp; const char *dentry; GError *error = NULL; - helpdir = dia_get_data_directory("help"); + /* helpdir = dia_get_data_directory("help"); */ + helpdir = g_strdup("/usr/share/doc/dia/html"); if (!helpdir) { message_warning(_("Could not find help directory")); return; @@ -696,7 +694,6 @@ help_manual_callback (GtkAction *action) #endif g_free(helpindex); -#endif } static void --- dia-0.97.1.orig/xmldocs.make +++ dia-0.97.1/xmldocs.make @@ -36,13 +36,8 @@ # ********** Begin of section some packagers may need to modify ********** # This variable (helpdocdir) specifies where the documents should be installed. # This default value should work for most packages. -if HAVE_GNOME -helpdocdir = $(datadir)/gnome/help/$(docname)/$(lang) -install-data-hook: install-data-hook-omf -else -helpdocdir = $(datadir)/$(docname)/help/$(lang) +helpdocdir = $(datadir)/doc/dia/html/$(lang) install-data-hook: -endif # ********** You should not have to edit below this line ********** xml_files = $(entities) $(docname).xml --- dia-0.97.1.orig/doc/Makefile.am +++ dia-0.97.1/doc/Makefile.am @@ -8,11 +8,7 @@ EXTRA_DIST = \ shape.dtd \ sheet.dtd -if HAVE_GNOME -helpdir = $(datadir)/gnome/help/$(docname) -else -helpdir = $(pkgdatadir)/help -endif +helpdir = $(datadir)/doc/dia/html sysdoc = $(DESTDIR)$(docdir) debian/patches/python-multiarch.patch0000644000000000000000000000713112261434273015153 0ustar Author: Robie Basak Description: use python-config for python include and library paths This fixes an FTBFS due to non-multiarch assumptions. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=697364 Last-Update: 2013-04-05 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -201,12 +201,16 @@ [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +if command -v python-config >/dev/null 2>&1; then + PYTHON_INCLUDES="$PYTHON_INCLUDES $(python-config --includes)" +else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi fi AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: @@ -224,29 +228,33 @@ [AC_REQUIRE([AM_PATH_PYTHON]) AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) -AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a) - -py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config" - -py_makefile="${py_config_dir}/Makefile" -if test -f "$py_makefile"; then -dnl extra required libs - py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile` - py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile` - -dnl now the actual libpython - if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then - PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs" - AC_MSG_RESULT(found) - elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then - dnl Same as above, but looking into the previous location: bug #581533 - PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs" - AC_MSG_RESULT(found) +if command -v python-config >/dev/null 2>&1; then + PYTHON_LIBS=$(python-config --ldflags) +else + AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a) + + py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config" + + py_makefile="${py_config_dir}/Makefile" + if test -f "$py_makefile"; then + dnl extra required libs + py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile` + py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile` + + dnl now the actual libpython + if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then + PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs" + AC_MSG_RESULT(found) + elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then + dnl Same as above, but looking into the previous location: bug #581533 + PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs" + AC_MSG_RESULT(found) + else + AC_MSG_RESULT(not found lib) + fi else - AC_MSG_RESULT(not found lib) + AC_MSG_RESULT(not found config) fi -else - AC_MSG_RESULT(not found config) fi AC_SUBST(PYTHON_LIBS)]) debian/patches/fix-freetype.patch0000644000000000000000000000145012261342160014242 0ustar From 0b863adcad031c70601e375d72dae64fdd967752 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Dec 2013 22:30:40 +0000 Subject: plugin: Use the Freetype developer's proposed way if #include'ing their headers. Allows us to build against Freetype 2.5.1 (without breaking older versions). https://bugzilla.gnome.org/show_bug.cgi?id=720573 Signed-off-by: Hans Breuer --- --- dia-0.97.2.orig/plug-ins/postscript/diapsft2renderer.c +++ dia-0.97.2/plug-ins/postscript/diapsft2renderer.c @@ -29,8 +29,9 @@ #include #include /* I'd really rather avoid this */ -#include -#include +#include +#include FT_GLYPH_H +#include FT_OUTLINE_H #define DPI 300 debian/patches/add-thumbnailer.patch0000644000000000000000000000134212261434273014702 0ustar Description: Add thumbnailer This patch adds a thumbnailer for the dia MIME type. Author: Roland Stigge Bug-Debian: http://bugs.debian.org/653469 --- dia-0.97.2.orig/Makefile.am +++ dia-0.97.2/Makefile.am @@ -93,6 +93,10 @@ dist-hook: echo A git clone is required to generate a ChageLog >&2; \ fi +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(datadir)/thumbnailers + $(INSTALL_DATA) $(srcdir)/dia.thumbnailer $(DESTDIR)$(datadir)/thumbnailers/dia.thumbnailer + if MAINTAINER_MODE THANKS: all-recursive app/run_dia.sh --credits > THANKS --- /dev/null +++ dia-0.97.2/dia.thumbnailer @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=dia +Exec=dia -t png -e %o -s %s %i +MimeType=application/x-dia-diagram; debian/patches/remove-dtds-from-examples.patch0000644000000000000000000000234212261434273016651 0ustar Description: Remove DTDs from examples By default, dia installs dtds duplicated in several language's example/ documentation directories. This is not necessary for Debian (installing DTDs in standard catalog registration locations). Therefore removing. Author: Roland Stigge --- dia-0.97.2.orig/doc/eu/Makefile.am +++ dia-0.97.2/doc/eu/Makefile.am @@ -72,11 +72,6 @@ metadata = \ dia-eu.omf \ topic.dat -examples = \ - ../shape.dtd \ - ../diagram.dtd \ - ../sheet.dtd - ## $(progname).$(progfiles_extension) DISTCLEANFILES = --- dia-0.97.2.orig/doc/en/Makefile.am +++ dia-0.97.2/doc/en/Makefile.am @@ -153,11 +153,6 @@ metadata = \ dia-C.omf \ topic.dat -examples = \ - ../shape.dtd \ - ../diagram.dtd \ - ../sheet.dtd - DISTCLEANFILES = --- dia-0.97.2.orig/doc/pl/Makefile.am +++ dia-0.97.2/doc/pl/Makefile.am @@ -73,10 +73,6 @@ metadata = \ dia-pl.omf \ topic.dat -examples = \ - ../shape.dtd \ - ../diagram.dtd \ - ../sheet.dtd ## $(progname).$(progfiles_extension) \ --- dia-0.97.2.orig/doc/fr/Makefile.am +++ dia-0.97.2/doc/fr/Makefile.am @@ -76,10 +76,6 @@ metadata = \ dia-fr.omf \ topic.dat -examples = \ - ../shape.dtd \ - ../diagram.dtd \ - ../sheet.dtd DISTCLEANFILES = debian/dia-common.lintian-overrides0000644000000000000000000000030212261434272014567 0ustar # "dia" is provided by binary packages dia and dia-gnome which are usually available if dia-common is installed dia-common: desktop-command-not-in-package usr/share/applications/dia.desktop dia debian/dia.prerm0000644000000000000000000000026712261434273011003 0ustar #!/bin/sh -e if [ "$1" != "upgrade" ]; then update-alternatives --remove dia /usr/bin/dia-normal update-alternatives --remove dia /usr/bin/dia-normal-integrated fi #DEBHELPER# debian/dia-gnome.mime0000644000000000000000000000015512261434273011704 0ustar application/x-dia-diagram; dia '%s'; description="DIA diagram"; test=test -n "$DISPLAY"; nametemplate=%s.dia debian/dia.lintian-overrides0000644000000000000000000000037312261434273013312 0ustar # File is in dia-common dia: menu-icon-missing *usr/share/pixmaps/dia_menu.xpm # Man page dia.1 (independent of GNOME or not) is in dia-common dia: binary-without-manpage *usr/bin/dia-normal dia: binary-without-manpage *usr/bin/dia-normal-integrated debian/dia-gnome.lintian-overrides0000644000000000000000000000063212261434272014412 0ustar # Unfortunately, RPATH is the technique by Dia to find its libraries dia-gnome: binary-or-shlib-defines-rpath *usr/bin/dia-gnome /usr/lib/dia # File is in dia-common dia-gnome: menu-icon-missing *usr/share/pixmaps/dia_menu.xpm # Man page dia.1 (independent of GNOME or not) is in dia-common dia-gnome: binary-without-manpage *usr/bin/dia-gnome dia-gnome: binary-without-manpage *usr/bin/dia-gnome-integrated debian/rules0000755000000000000000000000254112261434273010254 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 CONFIGURE_OPTIONS=--with-python --with-cairo %: dh $@ --with python2,autoreconf override_dh_auto_configure: dh_auto_configure -Bdia -- $(CONFIGURE_OPTIONS) --with-hardbooks dh_auto_configure -Bdia-gnome -- $(CONFIGURE_OPTIONS) --enable-gnome override_dh_auto_build: # docbook-xsl source for referenced pngs ln -s /usr/share/xml/docbook/stylesheet/docbook-xsl doc/html dh_auto_build -Bdia dh_auto_build -Bdia-gnome override_dh_auto_install: dh_auto_install -Bdia install -D debian/tmp/usr/bin/dia debian/dia/usr/bin/dia-normal install -D dia-gnome/app/.libs/dia debian/dia-gnome/usr/bin/dia-gnome $(MAKE) -C dia/doc install-html DESTDIR=$(CURDIR)/debian/dia-common # remove links in doc dir: en, fr, pl, eu rm debian/tmp/usr/share/doc/dia/html/en/en rm debian/tmp/usr/share/doc/dia/html/fr/fr rm debian/tmp/usr/share/doc/dia/html/eu/eu rm debian/tmp/usr/share/doc/dia/html/pl/pl override_dh_auto_clean: dh_auto_clean -find . -name 'Makefile.in' | xargs rm -f -rm -rf dia dia-gnome override_dh_compress: dh_compress -X.dia -X.pdf override_dh_installcatalogs: dh_installcatalogs # Workaround as long as dh_installxmlcatalogs is not integrated in dh (#575770) dh_installxmlcatalogs # Workaround for #611418 leaving /etc/xml around rm -rf debian/dia-common/etc debian/dia-common.docs0000644000000000000000000000005312261434273012065 0ustar doc/custom-shapes NEWS README TODO AUTHORS debian/clean0000644000000000000000000000017112261434273010176 0ustar config.log configure config.h.in aclocal.m4 ltmain.sh po/.intltool-merge-cache* sheets/sheet-translation-report doc/html debian/dia-gnome.menu0000644000000000000000000000073312261434273011723 0ustar ?package(dia-gnome): \ needs="X11" \ section="Applications/Graphics" \ hints="Vector" \ command="/usr/bin/dia" \ icon="/usr/share/pixmaps/dia_menu.xpm" \ title="Dia (GNOME)" \ longtitle="Draw diagrams" \ description="Dia can be used to draw different kind of diagrams. \ There is support for UML static structure diagrams \ (class diagrams), Entity-Relationship diagrams and \ Network diagrams. Diagrams can be exported to postscript." debian/compat0000644000000000000000000000000212261434273010370 0ustar 9 debian/catalog.xml0000644000000000000000000000112312261434272011322 0ustar debian/dia.postinst0000644000000000000000000000034012261434272011530 0ustar #!/bin/sh -e case "$1" in configure) update-alternatives --install /usr/bin/dia dia /usr/bin/dia-normal 40 update-alternatives --install /usr/bin/dia dia /usr/bin/dia-normal-integrated 45 ;; esac #DEBHELPER# debian/dia_menu.xpm0000644000000000000000000001103012261434273011474 0ustar /* XPM */ static char *dia_menu2[] = { /* columns rows colors chars-per-pixel */ "32 32 108 2", " c #000A000A000A", ". c #098909890989", "X c #00001E1E0000", "o c #131313131313", "O c #1B9C1B9C1B9C", "+ c #228922892289", "@ c #2BEC2BEC2BEC", "# c #383828283838", "$ c #343434343434", "% c #3BBC3BBC3BBC", "& c #3C3C3F3F4040", "* c #00006BEC0000", "= c #000072720000", "- c #393943434949", "; c #5B5B35351C1C", ": c #5D5D38382020", "> c #7D7D26260000", ", c #7E7E28280000", "< c #64643D3D2424", "1 c #43C42BAC43C4", "2 c #404030304040", "3 c #4E4E3A3A4E4E", "4 c #50503C3C5050", "5 c #6A6A43432A2A", "6 c #44BD44CC44DB", "7 c #444446464848", "8 c #44C44ACB4ECF", "9 c #4BE24BE24BE2", "0 c #43EE4C4C5151", "q c #4D4D4F4F5151", "w c #4CA250FB5353", "e c #57574B4B5757", "r c #59594D4D5959", "t c gray33", "y c #5AEB5B185B2E", "u c #606058586060", "i c #626262A262E2", "p c gray42", "a c #747474747474", "s c #757578787979", "d c #7AAD7AAD7AAD", "f c green", "g c #FFFF5C5C0000", "h c #E9E96F6F1C1C", "j c #FFFF64640000", "k c #F2F273731E9E", "l c #EDED75752727", "z c #FAFA77772020", "x c #CDCD7BAE44AB", "c c #CFCF7F7F4848", "v c #D1D17E7E4646", "b c #D608831C4BB2", "n c #DD3289DF52A8", "m c #D8D88E8E5B5B", "M c #E1E18D375454", "N c #E7E796966161", "B c #EAEA98986262", "V c #85C585C585C5", "C c #8B8B8B8B8B8B", "Z c #925292529252", "A c #9B1A9B1A9B1A", "S c #89899797A1A1", "D c #9E9E9F9FA0A0", "F c #9393A0A0A9A9", "G c #9A9AA221A6A6", "H c #9D9DADADB7B7", "J c #B0B097978888", "K c #BFBFA0A08B8B", "L c #A443A454A466", "P c #A0A0A7A7ACAC", "I c #A471AAAAAEE1", "U c #ABF3ABF3ABF3", "Y c #A525ACACB130", "T c #A8A8ACACB0B0", "R c #A4A4B1B1BABA", "E c #AAAAB1B1B6B6", "W c #ADADB6B6BDBD", "Q c #ADADB8B8BFBF", "! c #B427B427B427", "~ c #B1B1B7B7BBBB", "^ c #B50AB9B9BC66", "/ c #BCCABCDEBCE5", "( c #ACACB9B9C2C2", ") c #B6B6BFBFC6C6", "_ c #B9B9C0C0C5C5", "` c #C3C3A2A28B8B", "' c #CBCBA1A18787", "] c #C40FC40FC40F", "[ c #C4C4C6C6C8C8", "{ c #C4C4C8C8CCCC", "} c #CC2ECC2ECC2E", "| c #CCCCCECED0D0", " . c #CACAD1D1D6D6", ".. c #D45CD45CD45C", "X. c #D5D5D7D7D9D9", "o. c #D4D4D958DBDB", "O. c #D9D9D5D5D9D9", "+. c #DC4ADC40DC4A", "@. c #CFCFDCDCE5E5", "#. c #D4D4DFDFE6E6", "$. c #E439DB85E439", "%. c #E8E8DEDEE8E8", "&. c #E503E4CFE503", "*. c #EBEBE1E1EBEB", "=. c #EC76EC76EC76", "-. c #F38DF38DF38D", ";. c #FF4CFF4CFF4C", ":. c None", /* pixels */ ":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.", ":.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;./ :.:.", ":.;.=...+.+.*.*.*.*.%.$.&.&.=.=.=.=.=.-.-.-.-.-.-.-.;.;.;. :.:.", ":.;.=...+.$.X = * * r $.+.=.&.=.=.=.=.=.-.-.-.-.-.;.;.-.;. :.:.", ":.;.=.....%.= f f f 4 _ ..&.&.&.=.=.=.=.=.-.-.-.;.-.;.-.;. :.:.", ":.;.=.....$.* f f f 1 T ] &.&.&.&.=.=.=.=.=.-.-.-.-.-.;.;. :.:.", ":.;.=.} ..$.= f f f # A ] +.&.&.&.&.=.=.=.=.-.-.-.-.-.-.;. :.:.", ":.;.&.} ..O.r 4 & : u A } +.&.&.&.=.&.=.=.-.=.=.-.-.-.-.;. :.:.", ":.;.=...+.+...y 9 A L / ..O.$.+.+.&.+.$.+...&.=.-.=.-.-.;. :.:.", ":.;.=.C y y i + + 9 9 y y y y y i y y V ^ +.+.+.=.-.=.-.;. :.:.", ":.;.&.C 9 9 9 O O 6 7 9 7 9 q 9 q q 9 $ o C +.+.+.-.-.;. :.:.", ":.;.&.} ] U U 9 6 A U U U ^ ) M ^ / / ] L + $ U +.=.-.;. :.:.", ":.;.&.] ] ] } t 6 L ! } } .N g Q [ ......^ @ . U +.=.;. :.:.", ":.;.&.] } } ..y 6 U ] ....@.g l b _ +.+.+.+.U + / +.;. :.:.", ":.;.+.] } } ..y 6 U ] ..o.B l J g R } +.+.+.+.9 a ] ;. :.:.", ":.;.&.] ] ] ..y 9 U } +.#.j ` H k n { &.L =.=.V @ ! =. :.:.", ":.;.+.] ] ] ..y O 9 y i 5 > 0 q 5 , w i O y D Z o D &. :.:.", ":.;.&./ ] ] } y O 7 7 - , - & 6 8 ; ; 0 O 9 C C O A +. :.:.", ":.;.&./ ] ] } y 7 A I n k S G E W K j F a ! [ p % A +. :.:.", ":.;.+./ / ] } t 7 A ( g h x b M n m g b I ] X.6 p A +. :.:.", ":.;.+./ ] ] } t 6 G ' n x x v v b b b x U } ] . $ V U =. :.:.", ":.;.+.^ / / ] t 6 L ^ ! I G P I Y Y I U / X.y O d C / -. :.:.", ":.;.+./ / / ] t 6 D ^ ] / / / ] _ ] [ } X.y + d C ! ..-. :.:.", ":.;.+./ ] [ ..y 7 U ] } ....X.X.+.X.O.a . i Z C U } +.-. :.:.", ":.;.+.9 o 6 d U A q / } X.+.-. :.:.", ":.;.+.! U L L 9 6 C A L L L L L L U L L L L U ] ......+.=. :.:.", ":.;.+.U L L a o o y Z L L U L U U U U ! / ] } ........+.=. :.:.", ":.;.+.U ! ! V d p i U ! / / ] ] ] [ ] [ } } } ..........=. :.:.", ":.;.+.U ! ! ^ 6 % A U ! / ] / ] [ ] [ } } } } ..........=. :.:.", ":.;...U U ! ! d p A U / / / / ] ] ] ] ] } } } } } } ....=. :.:.", ":.;.&.! / ] [ ] / ! [ } } } ......X.O.O.+.+.+.+.+.+.&.&.-. :.:.", ":.L t :.:." }; debian/dia-common.doc-base0000644000000000000000000000046312261434272012616 0ustar Document: dia-manual Title: Dia User's Manual Author: Kevin Breit, Henry House, Judith Samson Abstract: This User's Manual introduces Dia, an application for creating technical diagrams. Section: Graphics Format: HTML Index: /usr/share/doc/dia/html/en/index.html Files: /usr/share/doc/dia/html/en/*.html debian/dia-gnome.postinst0000644000000000000000000000033612261434272012640 0ustar #!/bin/sh -e case "$1" in configure) update-alternatives --install /usr/bin/dia dia /usr/bin/dia-gnome 50 update-alternatives --install /usr/bin/dia dia /usr/bin/dia-gnome-integrated 55 ;; esac #DEBHELPER# debian/dia-common.install0000644000000000000000000000033512261434273012606 0ustar debian/*.xpm usr/share/pixmaps/ usr/share/doc/dia/* usr/share/locale/* usr/share/dia/* usr/share/applications/* usr/share/icons/* usr/share/mime-info/* usr/share/thumbnailers/* usr/share/man/* doc/*.dtd usr/share/xml/dia debian/watch0000644000000000000000000000012112261434273010215 0ustar version=3 ftp://ftp.gnome.org/pub/gnome/sources/dia/([\d\.]+)/dia-(.+)\.tar\..+ debian/dia-common.xmlcatalogs0000644000000000000000000000051612261434272013456 0ustar local;debian/catalog.xml;/usr/share/xml/dia/ root-and-package;system;http://www.lysator.liu.se/~alla/dia/;/usr/share/xml/dia/diagram.dtd root-and-package;system;http://www.lysator.liu.se/~alla/dia/dia-sheet-ns;/usr/share/xml/dia/sheet.dtd root-and-package;system;http://www.daa.com.au/~james/dia-shape-ns;/usr/share/xml/dia/shape.dtd