Merge tag 'upstream/4.2.2'debian/1;4.2.2-1.2

Upstream version 4.2.2

17 files changed, 0 insertions, 364 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 987a1c4..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 521a1ec..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,180 +0,0 @@
-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
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index fc1e45d..0000000
--- a/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: xtrkcad
-Section: editors
-Priority: extra
-Maintainer: Daniel E. Markle <dmarkle@ashtech.net>
-Build-Depends: debhelper (>= 9), libglib2.0-dev, libgtk2.0-dev, libx11-dev, netpbm, imagemagick, libwebkitgtk-dev, libcairo2-dev, cmake
-Standards-Version: 3.9.7
-Homepage: http://xtrkcad.org/
-#Vcs-Git: git://git.debian.org/collab-maint/xtrkcad.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/xtrkcad.git;a=summary
-
-Package: xtrkcad
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Model Train Track CAD Program
- This program allows you to design model train layouts.  It is fundamentally
- a drawing (CAD) program, but tailored to some of the specific issues in the
- model train world.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index d2f159f..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,93 +0,0 @@
-Format: http://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: *
-Copyright: 2003 by Sillub Technology and 2007 by Martin Fischer and Bob Blackwell.
-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>
-License: GPL-2+
-
-Files: app/wlib/gtklib/uthash.h
-Copyright: 2005-2015, Troy D. Hanson  http://troydhanson.github.com/uthash/
-License: BSD-Revised
-
-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-Revised
-  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: 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/docs b/debian/docs
deleted file mode 100644
index 634f57b..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-CMakeLists.txt
-README
diff --git a/debian/info b/debian/info
deleted file mode 100644
index ddc57ff..0000000
--- a/debian/info
+++ /dev/null
@@ -1 +0,0 @@
-app/help/xtrkcad.info
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 83de9ac..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ --parallel
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-			-DMAKE_BUILD_TYPE=RelWithDebInfo \
-			-DXTRKCAD_USE_GETTEXT=ON \
-			-DXTRKCAD_USE_GTK=ON \
-			-DXTRKCAD_USE_GTK_CAIRO=ON \
-			-DXTRKCAD_USE_LAYOUTCONTROL=ON
-
-override_dh_install:
-	dh_install
-	rm -f debian/xtrkcad/usr/share/xtrkcad/COPYING
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 28130f5..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# because of the way this project embeds distributions in subdirectories,
-# the sourceforge redirector does not work
-xtrkcad source: debian-watch-file-should-use-sf-redirector
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 8f04d6d..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression = "bzip2"
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 779e779..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts="downloadurlmangle=s/$/\//,filenamemangle=s/$//" \
-  http://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/ Version%20(.*)/
diff --git a/debian/xtrkcad.1 b/debian/xtrkcad.1
deleted file mode 100644
index 37cd140..0000000
--- a/debian/xtrkcad.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.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
deleted file mode 100644
index 25c384c..0000000
--- a/debian/xtrkcad.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index a8a00a3..0000000
--- a/debian/xtrkcad.docs
+++ /dev/null
@@ -1 +0,0 @@
-app/lib/Readme.txt
diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install
deleted file mode 100644
index 4ab189b..0000000
--- a/debian/xtrkcad.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/xtrkcad.desktop usr/share/applications
diff --git a/debian/xtrkcad.manpages b/debian/xtrkcad.manpages
deleted file mode 100644
index b8163ad..0000000
--- a/debian/xtrkcad.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/xtrkcad.1