diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS.Debian | 7 | ||||
| -rw-r--r-- | debian/README.source | 6 | ||||
| -rw-r--r-- | debian/changelog | 258 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 63 | ||||
| -rw-r--r-- | debian/copyright | 180 | ||||
| -rw-r--r-- | debian/info | 1 | ||||
| -rw-r--r-- | debian/patches/0900-spelling-errors.patch | 137 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 16 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 3 | ||||
| -rw-r--r-- | debian/xtrkcad-common.doc-base | 7 | ||||
| -rw-r--r-- | debian/xtrkcad-common.install | 6 | ||||
| -rw-r--r-- | debian/xtrkcad.1 | 25 | ||||
| -rw-r--r-- | debian/xtrkcad.desktop | 9 | ||||
| -rw-r--r-- | debian/xtrkcad.docs | 1 | ||||
| -rw-r--r-- | debian/xtrkcad.install | 3 | ||||
| -rw-r--r-- | debian/xtrkcad.manpages | 1 |
19 files changed, 726 insertions, 0 deletions
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian new file mode 100644 index 0000000..1f018f3 --- /dev/null +++ b/debian/NEWS.Debian @@ -0,0 +1,7 @@ +xtrkcad (1:4.2.4a-1) unstable; urgency=medium + + With this release xtrkcad are spilt into two packages. + The new xtrkcad-common contains the demos, examples and the params + directories. The new package also include the html documentation. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 02 Jan 2017 06:58:26 +0100 diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..987a1c4 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,6 @@ +xtrkcad for Debian sources +-------------------------- + +Note that as this project uses cmake, the package uses a separate intermediary +folder, build, for actual construction. This directory is then removed in +the clean step. Be careful to make any changes above this temporary directory. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0b0ca17 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,258 @@ +xtrkcad (1:5.1.0-1) unstable; urgency=medium + + [ Jörg Frings-Fürst ] + * New upstream release. + - Remove from the upstream applied patches: + + debian/patches/0700-info_file.patch + + debian/patches/0705-help_path.patch + + debian/patches/0100-gtk.patch + - Refresh patches: + + debian/patches/0900-spelling-errors.patch + - Refresh debian/copyright. + - debian/xtrkcad.docs: Rename Readme.txt to Readme.md. + - debian/xtrkcad.install: Remove Readme.txt. + - debian/control: Remove not longer used libwebkitgtk-1.0-0 + (Closes: #790221). + * debian/control: + - Add Daniel E. Markle as maintainer again. + - Add myself as uploader. + - Use http for the homepage because https isn't available. + * Declare compliance with Debian Policy 4.1.3 (No changes needed). + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. + - Remove --parallel from debian/rules. + * debian/changelog, debian/control: Remove trailing whitespaces. + * Change to my new mail address: + - debian/control, + - debian/copyright + + -- Jörg Frings-Fürst <debian@jff.email> Mon, 19 Mar 2018 23:31:33 +0100 + +xtrkcad (1:4.2.4a-1) unstable; urgency=medium + + [ Mike Gabriel & Jörg Frings-Fürst ] + * New Maintainer (Closes: #849139): + - debian/control: Add myself as maintainer. + - debian/copyright: Add myself to debian/*. + Thanks for your work to Daniel E. Markle. + * New upstream release (Closes: #847843, #784423). + - New debian/patches/0100-gtk.patch to prevent gcc format-security errors. + * Remove debian/source/options to use the standard compression. + * Remove debian/source.lintian-overrides. + * Change debian/compat to 10 (no changes required). + * debian/control: + - Add Mike Gabriel <sunweaver@debian.org> as Uploader (Closes: #847843). + - Bump Standards-Version to 3.9.8 (no changes required). + - Bump debhelper B-D minimum version to 10. + - Add Vcs-* tags. + - Change Priority from extra to optional to match with current ftp-master + override file. + - Rewrite package description. + - Remove not longer used libglib2.0-dev, libx11-dev, netpbm, imagemagick + and libcairo2-dev from Build-Depends. + * debian/rules: + - Enable hardening. + - Remove now unused parameter from dh_auto_configure. + - Add -DCMAKE_INSTALL_PREFIX:PATH=/usr/ to dh_auto_configure. + * New debian/patches/0700-info_file.patch to add requested directory entry + and INFO-DIR-SECTION. + * New debian/patches/0900-spelling-errors.patch to correct some typos. + * Rewrite debian/watch to use the sf redirector. + - Add files to exclude in debian/copyright. + * Rewrite debian/copyright. + * Split package into arch-indep and arch-dep packages: + - New package xtrkcad-common for the arch-indep files. + + Add section for xtrkcad-common into debian/control. + + New debian/xtrkcad-common.install. + + Rewrite debian/xtrkcad.install. + + Remove now useless override_dh_install for debian/rules. + + New debian/NEWS.debian. + + New debian/xtrkcat-common.doc-base. + + New debian/patches/0705-help_path.patch: + - Change the directory with the help html files to the installation + specific. + * Remove useless debian/docs. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 02 Jan 2017 15:43:42 +0100 + +xtrkcad (1:4.2.2-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Change build-depends from libwebkit-dev to libwebkitgtk-dev as a + part of webkit transition (Closes: #635432). + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 17 Feb 2016 14:38:06 +0100 + +xtrkcad (1:4.2.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix licenses (Closes: #811091). + * Bump std-version to 3.9.7. + * Update rules file to new dh sequencer. + (add manpages file) + * Remove useless include-binaries file. + * Use cmake build with debug symbols. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 17 Feb 2016 14:05:22 +0100 + +xtrkcad (1:4.2.2-1) unstable; urgency=low + + * new upstream version + * dep5 copyright file added + * removed obsolete debian menu entry + * removed harden patch now upstream + + -- Daniel E. Markle <dmarkle@ashtech.net> Thu, 19 Nov 2015 01:20:44 -0500 + +xtrkcad (1:4.2.1-1) unstable; urgency=low + + * new upstream version, closes: #622924 + * packaging updates and fixes; removes patchset for help system as is now + integrated upstream + * turnout naming fix from upstream, closes: #784423 + + -- Daniel E. Markle <dmarkle@ashtech.net> Sun, 08 Nov 2015 14:52:44 -0500 + +xtrkcad (1:4.0.2-2) unstable; urgency=low + + * new maintainer, closes: #383968 + * switched help system to libwebkit, closes: #549039 + + -- Daniel E. Markle <dmarkle@ashtech.net> Fri, 25 Jun 2010 07:59:01 -0400 + +xtrkcad (1:4.0.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * chmod +x sbcsgen.pl script used in building (Closes: 482257) + - required by newer versions of cmake + + -- Mike O'Connor <stew@debian.org> Tue, 03 Jun 2008 21:54:51 -0400 + +xtrkcad (1:4.0.2-1) unstable; urgency=low + + * new uptream version, closes: #458077 + * fix path to docs in man page, closes: #458319 + + -- Bdale Garbee <bdale@gag.com> Tue, 15 Apr 2008 22:50:44 -0600 + +xtrkcad (1:4.0.1-1) unstable; urgency=low + + * new upstream version + * building twice in a row appears to work now, closes: #424098 + * don't strip in bin/Makefile, closes: #438353 + + -- Bdale Garbee <bdale@gag.com> Wed, 05 Sep 2007 13:43:47 +0100 + +xtrkcad (20061215-1) unstable; urgency=low + + * freshen from upstream CVS (just one minor variable initialization patch) + + -- Bdale Garbee <bdale@gag.com> Fri, 15 Dec 2006 09:54:11 -0700 + +xtrkcad (20060529-2) unstable; urgency=low + + * add build dependency on imagemagick, closes: #374639 + + -- Bdale Garbee <bdale@gag.com> Tue, 20 Jun 2006 11:31:30 -0600 + +xtrkcad (20060529-1) unstable; urgency=low + + * new upstream version + * move from xtrkcad (dormant) to xtrkcad-fork on advice from Alistair Baty + * update control file to reflect this is no longer feature-reduced + + -- Bdale Garbee <bdale@gag.com> Mon, 29 May 2006 22:45:15 -0600 + +xtrkcad (20060415-1) unstable; urgency=low + + * xtrkcad is now GPL'ed, so it can move to main! closes: #318369 + * building a CVS snapshot from sourceforge + * fix priority to match override file + * should build anywhere, so change from i386 to any + + -- Bdale Garbee <bdale@gag.com> Sat, 15 Apr 2006 11:22:33 -0600 + +xtrkcad (3.1.4-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee <bdale@gag.com> Sat, 15 Nov 2003 15:23:21 -0700 + +xtrkcad (3.1.2.3-1) unstable; urgency=low + + * new upstream version, actually 3.1.2-3 in Sillub's notation + * freshen packaging to current standards + + -- Bdale Garbee <bdale@gag.com> Wed, 6 Nov 2002 17:15:48 -0700 + +xtrkcad (2.2.0-2) unstable; urgency=low + + * update to current standards, FHS, clean up lintian report + + -- Bdale Garbee <bdale@gag.com> Fri, 7 Jan 2000 21:29:01 -0700 + +xtrkcad (2.2.0-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee <bdale@gag.com> Wed, 26 May 1999 13:27:32 -0600 + +xtrkcad (2.0.4-1) unstable; urgency=low + + * new upstream version, closes 20040 + * minor cleanups to files in debian directory to close all Lintian errors, + some warnings remain since this is a libc5 binary-only package, etc... + + -- Bdale Garbee <bdale@gag.com> Sun, 6 Sep 1998 12:05:54 -0600 + +xtrkcad (1.2.1-4) unstable; urgency=low + + * fix a bunch of packaging funnies found by lintian + * move from debstd to debhelper + + -- Bdale Garbee <bdale@gag.com> Sun, 15 Feb 1998 11:45:26 -0700 + +xtrkcad (1.2.1-3) unstable; urgency=low + + * add new param files from Sillub web page. These add a P4 scale, + update the Walthers HP structure lib, and add libs for Arnold N + scale turnouts, Peco HO scale turnouts, and UK P4 fine scale + turnouts. There's also a new example layout. Closes bug 16388. + * don't gzip example layouts, since they are then invisible to the file + menu, which is really confusing. + * add support for update-menus. + + -- Bdale Garbee <bdale@gag.com> Sat, 3 Jan 1998 01:14:23 -0700 + +xtrkcad (1.2.1-2) unstable; urgency=low + + * moved html stuff out of /usr/lib and into /usr/doc + * repackaged to get dependency information right for hamm + + -- Bdale Garbee <bdale@gag.com> Sat, 25 Oct 1997 11:39:58 -0600 + +xtrkcad (1.2.1-1) unstable; urgency=low + + * new upstream version, converted with alien and merged with Debian + diffs from 1.2.0 + * moved from contrib to non-free since no source is available + * included example layouts from the Sillub web pages + + -- Bdale Garbee <bdale@gag.com> Sun, 7 Sep 1997 18:21:34 -0600 + +xtrkcad (1.2.0-2) unstable; urgency=low + + * Moving from contrib to non-free to meet new policy on such. + + -- Bdale Garbee <bdale@gag.com> Wed, 6 Aug 1997 14:04:12 -0600 + +xtrkcad (1.2.0-1) unstable; urgency=low + + * Converted from distributed .tar.gz format to a Debian package + + -- Bdale Garbee <bdale@gag.com> Mon, 31 Mar 1997 17:28:01 -0700 + +Local variables: +mode: debian-changelog +End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..67ab54b --- /dev/null +++ b/debian/control @@ -0,0 +1,63 @@ +Source: xtrkcad +Section: editors +Priority: optional +Maintainer: Daniel E. Markle <dmarkle@ashtech.net> +Uploaders: + Mike Gabriel <sunweaver@debian.org>, + Jörg Frings-Fürst <debian@jff.email> +Build-Depends: + cmake, + debhelper (>= 11), + libgtk2.0-dev +Standards-Version: 4.1.3 +Homepage: http://xtrkcad.org/ +Vcs-Git: git://anonscm.debian.org/collab-maint/xtrkcad.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xtrkcad.git + +Package: xtrkcad +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + xtrkcad-common (= ${source:Version}) +Description: CAD program for designing model railroad layouts + With XTrackCAD you can: + Design layouts in any scale and gauge + Use the predefined libraries for many popular brands of turnouts to + help you get started easily + Add your own favorite components + Manipulate track much like you would with actual flex-track to modify + extend and join tracks and turnouts + Test your design by running trains, including picking them up and moving + them with the mouse. + At any point you can print the design in a scale of your choice. When + printed in 1:1 scale the printout can be used as a template for laying + the track to build your dream layout. + Learning XTrackCAD is made easy with the extensive on-line help and + demonstrations. + +Package: xtrkcad-common +Architecture: all +Depends: + ${misc:Depends} +Breaks: + xtrkcad (<< 1:4.2.4a-1) +Replaces: + xtrkcad (<< 1:4.2.4a-1) +Description: CAD program for designing model railroad layouts (common files) + With XTrackCAD you can: + Design layouts in any scale and gauge + Use the predefined libraries for many popular brands of turnouts to + help you get started easily + Add your own favorite components + Manipulate track much like you would with actual flex-track to modify + extend and join tracks and turnouts + Test your design by running trains, including picking them up and moving + them with the mouse. + At any point you can print the design in a scale of your choice. When + printed in 1:1 scale the printout can be used as a template for laying + the track to build your dream layout. + Learning XTrackCAD is made easy with the extensive on-line help and + demonstrations. + . + This package contains the demo, examples, parameter and the help files. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..1fa90d6 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,180 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: XTrkCAD +Upstream-Contact: XTrkCAD Developers <xtrkcad-fork-developers@lists.sourceforge.net> +Source: http://sourceforge.net/projects/xtrkcad-fork/ +Files-Excluded: .hgtags .hgignore + +Files: * +Copyright: 2003 Sillub Technology + 2005-2015 Troy D. Hanson + 2005-2007 Dave Bullis + 2006-2017 Martin Fischer + 2007 Bob Blackwell +License: GPL-2+ + +Files: app/bin/cblock.c + app/bin/cswitchmotor.c + app/bin/ccontrol.c + app/bin/csensor.c + app/bin/csignal.c + app/bin/dcontmgm.c + app/bin/dxfformat.c +Copyright: 2002-2017 Robert Heller D/B/A Deepwoods Software +License: GPL-2+ + +Files: app/bin/i18n.* + app/i18n/stripmsg.c + app/i18n/fi.po +Copyright: 2007-2008 Mikko Nissinen +License: GPL-2+ + +Files: app/i18n/pt_BR.po +Copyright: 2009 Daniel Spagnol +License: GPL-2+ + +Files: app/lib/params/protosteam.xtp +Copyright: 2012 Serdar Soysal <online@soysals.com> +License: GPL-2+ + +Files: app/tools/halibut/* +Copyright: 1999-2007 Simon Tatham +License: Expat + +Files: app/tools/halibut/charset/macenc.c +Copyright: 2008 Ben Harris +License: Expat + +Files: app/tools/dirent.* +Copyright: 1997-2003 Kevlin Henney +License: permissive + +Files: app/wlib/gtklib/uthash.h +Copyright: 2005-2014 Troy D. Hanson +License: BSD-1-Clause + +Files: app/wlib/include/getopt.h +Copyright: 1998-2003 David A. Hinds +License: GPL-2+ + +Files: app/wlib/mswlib/getopt.c +Copyright: 1998-2003 David A. Hinds +License: GPL-2+ + +Files: app/wlib/mswlib/gwin32.c +Copyright: 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald + 1998-1999 Tor Lillqvist +License: GPL-2+ + +Files: app/wlib/mswlib/simple-gettext.c +Copyright: 1995-2005 Free Software Foundation, Inc. +License: GPL-2+ + +Files: app/lib/icon.svg + app/bin/bitmaps/SVG/tipofday.svg +Copyright: Jakub Steiner +License: public-domain + +Files: debian/* +Copyright: 2015 Daniel E. Markle <dmarkle@ashtech.net> + 2016-2018 Jörg Frings-Fürst <debian@jff.email> + 2016-2017 Mike Gabriel <sunweaver@debian.org> +License: GPL-2+ + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: BSD-1-Clause + Copyright (c) 2005-2015, Troy D. Hanson http://troydhanson.github.com/uthash/ + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: permissive + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose is hereby granted without fee, provided + that this copyright and permissions notice appear in all copies and + derivatives. + . + This software is supplied "as is" without express or implied warranty. + +License: public-domain + THIS WORK IS IN PUBLIC DOMAIN: + The person or persons who have associated work with this document + (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best + of his knowledge, the work of authorship identified is in the public domain of + the country from which the work is published, or (b) hereby dedicates whatever + copyright the dedicators holds in the work of authorship identified below + (the "Work") to the public domain. A certifier, moreover, dedicates any + copyright interest he may have in the associated work, and for these purposes, + is described as a "dedicator" below. + . + A certifier has taken reasonable steps to verify the copyright status of this + work. Certifier recognizes that his good faith efforts may not shield him from + liability if in fact the work certified is not in the public domain. + . + Dedicator makes this dedication for the benefit of the public at large and to + the detriment of the Dedicator's heirs and successors. Dedicator intends this + dedication to be an overt act of relinquishment in perpetuity of all present + and future rights under copyright law, whether vested or contingent, in the + Work. Dedicator understands that such relinquishment of all rights includes the + relinquishment of all rights to enforce (by lawsuit or otherwise) those + copyrights in the Work. + . + Dedicator recognizes that, once placed in the public domain, the Work may be + freely reproduced, distributed, transmitted, used, modified, built upon, or + otherwise exploited by anyone for any purpose, commercial or non-commercial, + and in any way, including by methods that have not yet been invented or + conceived. diff --git a/debian/info b/debian/info new file mode 100644 index 0000000..ddc57ff --- /dev/null +++ b/debian/info @@ -0,0 +1 @@ +app/help/xtrkcad.info diff --git a/debian/patches/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch new file mode 100644 index 0000000..e3cef33 --- /dev/null +++ b/debian/patches/0900-spelling-errors.patch @@ -0,0 +1,137 @@ +Description: Correct some typos +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/165/ +Last-Update: 2018-03-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/app/help/genhelp.in +=================================================================== +--- trunk.orig/app/help/genhelp.in ++++ trunk/app/help/genhelp.in +@@ -112,7 +112,7 @@ cmdPan Pan or Zoom the Layout + cmdParallel Create a parallel track + cmdParameter Register register + cmdPaste Copy objects from clipboard +-cmdPref Perferences dialog ++cmdPref Preferences dialog + cmdPricelist Display prices of turnouts, sectional tracks and structures + cmdPrint Print the layout + cmdPrmfile Loads and unloads parameter files +Index: trunk/app/help/xtrkcad.info +=================================================================== +--- trunk.orig/app/help/xtrkcad.info ++++ trunk/app/help/xtrkcad.info +@@ -176,7 +176,7 @@ Register + :cmdPaste + Copy objects from clipboard + :cmdPref +-Perferences dialog ++Preferences dialog + :cmdPricelist + Display prices of turnouts, sectional tracks and structures + :cmdPrint +Index: trunk/app/i18n/de_DE.po +=================================================================== +--- trunk.orig/app/i18n/de_DE.po ++++ trunk/app/i18n/de_DE.po +@@ -390,7 +390,7 @@ msgid "Control" + msgstr "Steuerung"
+
+ #: ../bin/ccontrol.c:386 ../bin/csensor.c:358 ../bin/csignal.c:486
+-msgid "Orgin X"
++msgid "Origin X"
+ msgstr "Ausgangspunkt: X"
+
+ #: ../bin/ccontrol.c:388 ../bin/csensor.c:360 ../bin/csignal.c:488
+@@ -6977,7 +6977,7 @@ msgid "Copy objects from clipboard" + msgstr "Objekte von der Zwischenablage kopieren"
+
+ #: ../../../../build/work/app/bin/bllnhlp.c:100
+-msgid "Perferences dialog"
++msgid "Preferences dialog"
+ msgstr "Einstellungen"
+
+ #: ../../../../build/work/app/bin/bllnhlp.c:101
+Index: trunk/app/i18n/fi.po +=================================================================== +--- trunk.orig/app/i18n/fi.po ++++ trunk/app/i18n/fi.po +@@ -390,7 +390,7 @@ msgstr "Junien hallinta" + + #: ../bin/ccontrol.c:386 ../bin/csensor.c:358 ../bin/csignal.c:486 + #, fuzzy +-msgid "Orgin X" ++msgid "Origin X" + msgstr "Marginaali" + + #: ../bin/ccontrol.c:388 ../bin/csensor.c:360 ../bin/csignal.c:488 +@@ -6843,7 +6843,7 @@ msgid "Copy objects from clipboard" + msgstr "Liitä objektit leikepöydältä" + + #: ../../../../build/work/app/bin/bllnhlp.c:99 +-msgid "Perferences dialog" ++msgid "Preferences dialog" + msgstr "Ominaisuudet" + + #: ../../../../build/work/app/bin/bllnhlp.c:100 +Index: trunk/app/i18n/pt_BR.po +=================================================================== +--- trunk.orig/app/i18n/pt_BR.po ++++ trunk/app/i18n/pt_BR.po +@@ -389,7 +389,7 @@ msgstr "Controle de trem" + + #: ../bin/ccontrol.c:386 ../bin/csensor.c:358 ../bin/csignal.c:486 + #, fuzzy +-msgid "Orgin X" ++msgid "Origin X" + msgstr "Margem" + + #: ../bin/ccontrol.c:388 ../bin/csensor.c:360 ../bin/csignal.c:488 +@@ -6680,7 +6680,7 @@ msgid "Copy objects from clipboard" + msgstr "Copia objetos da área de transferencia" + + #: ../../../../build/work/app/bin/bllnhlp.c:99 +-msgid "Perferences dialog" ++msgid "Preferences dialog" + msgstr "Caixa de diálogo de preferências" + + #: ../../../../build/work/app/bin/bllnhlp.c:100 +Index: trunk/app/bin/ccontrol.c +=================================================================== +--- trunk.orig/app/bin/ccontrol.c ++++ trunk/app/bin/ccontrol.c +@@ -383,7 +383,7 @@ static paramData_t controlEditPLs[] = { + #define I_CONTROLNAME (0) + /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF, (void*)200, N_("Name") }, + #define I_ORIGX (1) +- /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, ++ /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, + #define I_ORIGY (2) + /*2*/ { PD_FLOAT, &controlEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") }, + #define I_CONTROLONSCRIPT (3) +Index: trunk/app/bin/csensor.c +=================================================================== +--- trunk.orig/app/bin/csensor.c ++++ trunk/app/bin/csensor.c +@@ -355,7 +355,7 @@ static paramData_t sensorEditPLs[] = { + #define I_SENSORNAME (0) + /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF, (void*)200, N_("Name") }, + #define I_ORIGX (1) +- /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, ++ /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, + #define I_ORIGY (2) + /*2*/ { PD_FLOAT, &sensorEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") }, + #define I_SENSORSCRIPT (3) +Index: trunk/app/bin/csignal.c +=================================================================== +--- trunk.orig/app/bin/csignal.c ++++ trunk/app/bin/csignal.c +@@ -483,7 +483,7 @@ static paramData_t signalEditPLs[] = { + #define I_SIGNALNAME (0) + /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF, (void*)200, N_("Name") }, + #define I_ORIGX (1) +- /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, ++ /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, + #define I_ORIGY (2) + /*2*/ { PD_FLOAT, &signalEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") }, + #define I_ANGLE (3) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c6c3550 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0900-spelling-errors.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7bfa15d --- /dev/null +++ b/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# hardening +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DXTRKCAD_USE_GETTEXT=ON \ + -DXTRKCAD_USE_GTK=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr/ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9836eaa --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +#opts="downloadurlmangle=s/$/\//,filenamemangle=s/$//" \ + http://sf.net/xtrkcad-fork/ xtrkcad-source-(\d\.\d\.\d)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/debian/xtrkcad-common.doc-base b/debian/xtrkcad-common.doc-base new file mode 100644 index 0000000..a2fe4cc --- /dev/null +++ b/debian/xtrkcad-common.doc-base @@ -0,0 +1,7 @@ +Document: xtrkcad +Title: xtrkcad Documentation +Section: Editors + +Format: HTML +Index: /usr/share/doc/xtrkcad-common/html/index.html +Files: /usr/share/doc/xtrkcad-common/html/*.html diff --git a/debian/xtrkcad-common.install b/debian/xtrkcad-common.install new file mode 100644 index 0000000..4d5fb92 --- /dev/null +++ b/debian/xtrkcad-common.install @@ -0,0 +1,6 @@ +usr/share/xtrkcad/demos/* usr/share/xtrkcad/demos +usr/share/xtrkcad/examples/* usr/share/xtrkcad/examples +usr/share/xtrkcad/params/* usr/share/xtrkcad/params +usr/share/xtrkcad/xtrkcad.tip usr/share/xtrkcad +usr/share/xtrkcad/xtrkcad.xtq usr/share/xtrkcad +usr/share/xtrkcad/html/* usr/share/doc/xtrkcad-common/html diff --git a/debian/xtrkcad.1 b/debian/xtrkcad.1 new file mode 100644 index 0000000..37cd140 --- /dev/null +++ b/debian/xtrkcad.1 @@ -0,0 +1,25 @@ +.TH XTRKCAD 1 +.SH NAME +xtrkcad \- model railroad track CAD program +.SH "DESCRIPTION" +This manual page documents briefly the +.BR xtrkcad +command. +This manual page was written for the Debian GNU/Linux distribution +(but may be used by others), because the original program did not +have a manual page. +.PP +.B xtrkcad +is a program that can be used to design a model railroad layout. +.PP +For more information on +.B xtrkcad, +go read the online documentation under /usr/share/doc/xtrkcad. +.SH LICENSE +The +.B xtrkcad +program was originally a product of Sillub. See www.sillub.com for more +information. It is now maintained by a community effort on SourceForge. +.SH AUTHOR +This (incredibly lame) manual page was written by Bdale Garbee <bdale@gag.com>, +for the Debian GNU/Linux system. diff --git a/debian/xtrkcad.desktop b/debian/xtrkcad.desktop new file mode 100644 index 0000000..25c384c --- /dev/null +++ b/debian/xtrkcad.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=XTrkCAD +Comment=Model Railroad CAD +Keywords=train;railroad;cad;model +Icon=/usr/share/xtrkcad/logo.bmp +Exec=xtrkcad +Categories=Graphics diff --git a/debian/xtrkcad.docs b/debian/xtrkcad.docs new file mode 100644 index 0000000..ef4fceb --- /dev/null +++ b/debian/xtrkcad.docs @@ -0,0 +1 @@ +app/lib/Readme.md
\ No newline at end of file diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install new file mode 100644 index 0000000..fee34e7 --- /dev/null +++ b/debian/xtrkcad.install @@ -0,0 +1,3 @@ +debian/xtrkcad.desktop usr/share/applications +usr/share/xtrkcad/logo.bmp usr/share/doc/xtrkcad +usr/bin/* diff --git a/debian/xtrkcad.manpages b/debian/xtrkcad.manpages new file mode 100644 index 0000000..b8163ad --- /dev/null +++ b/debian/xtrkcad.manpages @@ -0,0 +1 @@ +debian/xtrkcad.1 |