Bug#604174: Fwd: [debian-mysql] mysql-workbench-gpl_5.2.31a-1_amd64.changes REJECTED
I'm forwarding a message I have sent to Norbert. It includes a diff of the source tree and addresses the issues raised by the FTP masters.
Regards,
Mateusz Kijowski
---------- Forwarded message ----------
From:
Mateusz Kijowski <mateusz.kijowski@gmail.com>Date: 2011/5/28
Subject: Re: [debian-mysql] mysql-workbench-gpl_5.2.31a-1_amd64.changes REJECTED
To: Norbert Tretkowski <
norbert@tretkowski.de>
Cc: Debian MySQL Maintainers <
pkg-mysql-maint@lists.alioth.debian.org>
Hi Norbert,
I'd really like mysql-workbench to be included in debian and I have been working on the package to fix the issues raised by the ftpmasters. I have (hopefully) resolved all issues regarding copyright and also some build issues related to gcc 4.6 (see
http://bugs.mysql.com/60603). There has been an upstream release two days ago, so I've upgraded the package. Right now the package builds and seems to work fine on amd64 sid.
Please bare in mind that this would be my first addition to Debian so I'd appreciate your review of my changes and any remarks. I also need you to sponsor my upload.
I have attached a patch containing my changes. If you think they are OK, please give me access to SVN so that I can commit them.
Below I have commented on how I resolved the issues brought up by the ftpmasters:
2011/3/16 Alexander Reichle-Schmehl
<ftpmaster@debian.org>
[cut]
Several Win32 binaries come without source:
ext/cppconn/win/registration/mysql_ca.dll
rm'd from orig.tar.gz
frontend/windows/MySQLWorkbench/Dependencies/DockPanel/*.dll
is not in orig.tar.gz
Most other files are (C) Oracle and/or its affiliates although several files
are (still) copyright Sun Microsystems Inc. or MySQL AB. These often just
state "All rights reserved" and do not included the usual GPL notice.
Several files are not included in the copyright information:
images/*:
readme states CC-BY-3.0. Trademark restrictions might apply to selected
images.
library/tinyxml/*, library/vsqlite++/*, res/fonts/*, ext/python/pexpect/*:
images, tinyxml, vsqlite, pexpect - added copyright and licenses to debian/copyright
[cut]
frontend/windows/ScintillaNET/FlagsDesigner.cs:
(C) G Himangi; license unknown
is not in orig.tar.gz
res/scripts/*:
Several files are released under the LGPL.
fixed in debian/copyright
ext/scintilla/cocoa/*:
LGPL-2.1+ as an alternative to the Scintilla license.
rm'd from orig.tar.gz
ext/scintilla/lexers/*:
Additional copyright holders that are not mentioned in debian/copyright.
added to debian/copyright
yassl (in ext/yassl) seems to be GPL-2+ (not just GPL-2) plus FOSS exceptions.
no longer present in upstream source
The years of copyright for Google CTemplate also include 2006-2009.
fixed in debian/copyright
MySQL Connector/Python is released under the same terms as the C++ Connector.
fixed in debian/copyright
Several C# source files state "This code was generated by a tool." I'm not sure
how they can be regenerated.
I too am not sure how/if they can be regenerated.
library/forms/swig includes files generated by swig, but these are not
regenerated during build (the package does not build-depend on swig). It would
be nice to have them built from the real source.
The swig files are regenerated.
Why is the architecture limited to i386 and amd64? All dependencies seem to be
available for other architectures as well.
I need advice on this one. Perhaps the architecture limitation should be dropeed?
Please consider moving arch independent files to an additional package. The
databse included in /usr/share/mysql-workbench/modules/data/DocLibrary alone is
8 MB large.
Of course, it can be done, but I consider this rather a suggestion than a reason not to accept the upload.
Note: ext/cppconn/win/Bitmaps/InstConfIcon.exe is identified as "MS Windows
icon resource - [...]" same as the *.ico files. I assume GIMP or some other
program can be used to edit it, but have not verified it.
whole ext/cppconn/win is rm'd from orig.tar.gz
[cut]
Regards,
Mateusz Kijowski
diff --git a/debian/changelog b/debian/changelog
index b9b0fac..b50bc07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+mysql-workbench-gpl (5.2.34-1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+ * patch updated
+ * added patch for makefile related to ScintillaNET which
+ was removed from upstream source
+
+ -- Mateusz Kijowski <matik@kurdel.ch6.kijowski.info> Sat, 28 May 2011 16:55:45 +0200
+
+mysql-workbench-gpl (5.2.33b-1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release.
+ * Copyright changes
+ * patch necessary tu build under gcc 4.6
+ (from http://bugs.mysql.com/60603)
+
+ -- Mateusz Kijowski <mateusz.kijowski@gmail.com> Thu, 21 Apr 2011 15:57:59 +0200
+
mysql-workbench-gpl (5.2.33-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 88cf9b8..7a05c45 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: extra
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
Uploaders: Norbert Tretkowski <norbert@tretkowski.de>
-Build-Depends: debhelper (>= 5), libmysqlclient-dev, libgnome2-dev, autoconf, automake, libtool, libzip-dev, libsigc++-2.0-dev, libglade2-dev, libgtkmm-2.4-dev, uuid-dev, liblua5.1-0-dev, libgl1-mesa-dev | libgl-dev, libpcre3-dev, python-dev, libboost-dev, libsqlite3-dev, libctemplate-dev
+Build-Depends: debhelper (>= 5), libmysqlclient-dev, libgnome2-dev, autoconf, automake, libtool, libzip-dev, libsigc++-2.0-dev, libglade2-dev, libgtkmm-2.4-dev, uuid-dev, liblua5.1-0-dev, libgl1-mesa-dev | libgl-dev, libpcre3-dev, python-dev, libboost-dev, libsqlite3-dev, libctemplate-dev, swig
Standards-Version: 3.9.1
Homepage: http://dev.mysql.com/workbench/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-workbench/
diff --git a/debian/copyright b/debian/copyright
index 9d2258b..56d5d89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,8 @@ since Wed, 11 Feb 2009.
It was downloaded from http://dev.mysql.com/workbench/
Copyright:
- (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+ (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+ (c) 2007-2010 by Oracle and/or its affiliates.
License:
This package is free software; you can redistribute it and/or modify
@@ -27,8 +28,332 @@ License:
License can be found in /usr/share/common-licenses/GPL-2.
+File:
+ res/scripts/lua/wb_library.lua
+ res/scripts/shell/mysql_system_status.vbs
+ res/scripts/shell/mysql_system_status_rmt.vbs
-== MySQL Connector/C++ ==
+Copyright:
+ Copyright (c) 2008, 2009 Sun Microsystems, Inc
+
+License:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ On Debian systems, the complete text of the GNU Lesser General
+ License can be found in /usr/share/common-licenses/LGPL-2.
+
+File:
+ images/*
+
+Copyright:
+ (c) 2007-2010 by Oracle and/or its affiliates.
+
+License:
+ Creative Commons Attribution 3.0 license,
+ http://creativecommons.org/licenses/by/3.0/.
+
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN
+ AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE
+ MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+
+ 1. Definitions
+
+ 1. "Adaptation" means a work based upon the Work, or upon the Work
+ and other pre-existing works, such as a translation, adaptation,
+ derivative work, arrangement of music or other alterations of a
+ literary or artistic work, or phonogram or performance and includes
+ cinematographic adaptations or any other form in which the Work may be
+ recast, transformed, or adapted including in any form recognizably
+ derived from the original, except that a work that constitutes a
+ Collection will not be considered an Adaptation for the purpose of this
+ License. For the avoidance of doubt, where the Work is a musical work,
+ performance or phonogram, the synchronization of the Work in
+ timed-relation with a moving image ("synching") will be considered an
+ Adaptation for the purpose of this License.
+ 2. "Collection" means a collection of literary or artistic works,
+ such as encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed in
+ Section 1(f) below, which, by reason of the selection and arrangement
+ of their contents, constitute intellectual creations, in which the Work
+ is included in its entirety in unmodified form along with one or more
+ other contributions, each constituting separate and independent works
+ in themselves, which together are assembled into a collective whole. A
+ work that constitutes a Collection will not be considered an Adaptation
+ (as defined above) for the purposes of this License.
+ 3. "Distribute" means to make available to the public the original
+ and copies of the Work or Adaptation, as appropriate, through sale or
+ other transfer of ownership.
+ 4. "Licensor" means the individual, individuals, entity or entities
+ that offer(s) the Work under the terms of this License.
+ 5. "Original Author" means, in the case of a literary or artistic
+ work, the individual, individuals, entity or entities who created the
+ Work or if no individual or entity can be identified, the publisher;
+ and in addition (i) in the case of a performance the actors, singers,
+ musicians, dancers, and other persons who act, sing, deliver, declaim,
+ play in, interpret or otherwise perform literary or artistic works or
+ expressions of folklore; (ii) in the case of a phonogram the producer
+ being the person or legal entity who first fixes the sounds of a
+ performance or other sounds; and, (iii) in the case of broadcasts, the
+ organization that transmits the broadcast.
+ 6. "Work" means the literary and/or artistic work offered under the
+ terms of this License including without limitation any production in
+ the literary, scientific and artistic domain, whatever may be the mode
+ or form of its expression including digital form, such as a book,
+ pamphlet and other writing; a lecture, address, sermon or other work of
+ the same nature; a dramatic or dramatico-musical work; a choreographic
+ work or entertainment in dumb show; a musical composition with or
+ without words; a cinematographic work to which are assimilated works
+ expressed by a process analogous to cinematography; a work of drawing,
+ painting, architecture, sculpture, engraving or lithography; a
+ photographic work to which are assimilated works expressed by a process
+ analogous to photography; a work of applied art; an illustration, map,
+ plan, sketch or three-dimensional work relative to geography,
+ topography, architecture or science; a performance; a broadcast; a
+ phonogram; a compilation of data to the extent it is protected as a
+ copyrightable work; or a work performed by a variety or circus
+ performer to the extent it is not otherwise considered a literary or
+ artistic work.
+ 7. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License with
+ respect to the Work, or who has received express permission from the
+ Licensor to exercise rights under this License despite a previous
+ violation.
+ 8. "Publicly Perform" means to perform public recitations of the Work
+ and to communicate to the public those public recitations, by any means
+ or process, including by wire or wireless means or public digital
+ performances; to make available to the public Works in such a way that
+ members of the public may access these Works from a place and at a
+ place individually chosen by them; to perform the Work to the public by
+ any means or process and the communication to the public of the
+ performances of the Work, including by public digital performance; to
+ broadcast and rebroadcast the Work by any means including signs, sounds
+ or images.
+ 9. "Reproduce" means to make copies of the Work by any means
+ including without limitation by sound or visual recordings and the
+ right of fixation and reproducing fixations of the Work, including
+ storage of a protected performance or phonogram in digital form or
+ other electronic medium.
+
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable
+ laws.
+
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+
+ 1. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ 2. to create and Reproduce Adaptations provided that any such
+ Adaptation, including any translation in any medium, takes reasonable
+ steps to clearly label, demarcate or otherwise identify that changes
+ were made to the original Work. For example, a translation could be
+ marked "The original work was translated from English to Spanish," or a
+ modification could indicate "The original work has been modified.";
+ 3. to Distribute and Publicly Perform the Work including as
+ incorporated in Collections; and,
+ 4. to Distribute and Publicly Perform Adaptations.
+ 5.
+
+ For the avoidance of doubt:
+ 1. Non-waivable Compulsory License Schemes. In those
+ jurisdictions in which the right to collect royalties through any
+ statutory or compulsory licensing scheme cannot be waived, the Licensor
+ reserves the exclusive right to collect such royalties for any exercise
+ by You of the rights granted under this License;
+ 2. Waivable Compulsory License Schemes. In those jurisdictions
+ in which the right to collect royalties through any statutory or
+ compulsory licensing scheme can be waived, the Licensor waives the
+ exclusive right to collect such royalties for any exercise by You of
+ the rights granted under this License; and,
+ 3. Voluntary License Schemes. The Licensor waives the right to
+ collect royalties, whether individually or, in the event that the
+ Licensor is a member of a collecting society that administers voluntary
+ licensing schemes, via that society, from any exercise by You of the
+ rights granted under this License.
+
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. Subject to Section 8(f), all rights not
+ expressly granted by Licensor are hereby reserved.
+
+ 4. Restrictions. The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+
+ 1. You may Distribute or Publicly Perform the Work only under the
+ terms of this License. You must include a copy of, or the Uniform
+ Resource Identifier (URI) for, this License with every copy of the Work
+ You Distribute or Publicly Perform. You may not offer or impose any
+ terms on the Work that restrict the terms of this License or the
+ ability of the recipient of the Work to exercise the rights granted to
+ that recipient under the terms of the License. You may not sublicense
+ the Work. You must keep intact all notices that refer to this License
+ and to the disclaimer of warranties with every copy of the Work You
+ Distribute or Publicly Perform. When You Distribute or Publicly Perform
+ the Work, You may not impose any effective technological measures on
+ the Work that restrict the ability of a recipient of the Work from You
+ to exercise the rights granted to that recipient under the terms of the
+ License. This Section 4(a) applies to the Work as incorporated in a
+ Collection, but this does not require the Collection apart from the
+ Work itself to be made subject to the terms of this License. If You
+ create a Collection, upon notice from any Licensor You must, to the
+ extent practicable, remove from the Collection any credit as required
+ by Section 4(b), as requested. If You create an Adaptation, upon notice
+ from any Licensor You must, to the extent practicable, remove from the
+ Adaptation any credit as required by Section 4(b), as requested.
+ 2. If You Distribute, or Publicly Perform the Work or any Adaptations
+ or Collections, You must, unless a request has been made pursuant to
+ Section 4(a), keep intact all copyright notices for the Work and
+ provide, reasonable to the medium or means You are utilizing: (i) the
+ name of the Original Author (or pseudonym, if applicable) if supplied,
+ and/or if the Original Author and/or Licensor designate another party
+ or parties (e.g., a sponsor institute, publishing entity, journal) for
+ attribution ("Attribution Parties") in Licensor's copyright notice,
+ terms of service or by other reasonable means, the name of such party
+ or parties; (ii) the title of the Work if supplied; (iii) to the extent
+ reasonably practicable, the URI, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and (iv) ,
+ consistent with Section 3(b), in the case of an Adaptation, a credit
+ identifying the use of the Work in the Adaptation (e.g., "French
+ translation of the Work by Original Author," or "Screenplay based on
+ original Work by Original Author"). The credit required by this Section
+ 4 (b) may be implemented in any reasonable manner; provided, however,
+ that in the case of a Adaptation or Collection, at a minimum such
+ credit will appear, if a credit for all contributing authors of the
+ Adaptation or Collection appears, then as part of these credits and in
+ a manner at least as prominent as the credits for the other
+ contributing authors. For the avoidance of doubt, You may only use the
+ credit required by this Section for the purpose of attribution in the
+ manner set out above and, by exercising Your rights under this License,
+ You may not implicitly or explicitly assert or imply any connection
+ with, sponsorship or endorsement by the Original Author, Licensor
+ and/or Attribution Parties, as appropriate, of You or Your use of the
+ Work, without the separate, express prior written permission of the
+ Original Author, Licensor and/or Attribution Parties.
+ 3. Except as otherwise agreed in writing by the Licensor or as may be
+ otherwise permitted by applicable law, if You Reproduce, Distribute or
+ Publicly Perform the Work either by itself or as part of any
+ Adaptations or Collections, You must not distort, mutilate, modify or
+ take other derogatory action in relation to the Work which would be
+ prejudicial to the Original Author's honor or reputation. Licensor
+ agrees that in those jurisdictions (e.g. Japan), in which any exercise
+ of the right granted in Section 3(b) of this License (the right to make
+ Adaptations) would be deemed to be a distortion, mutilation,
+ modification or other derogatory action prejudicial to the Original
+ Author's honor and reputation, the Licensor will waive or not assert,
+ as appropriate, this Section, to the fullest extent permitted by the
+ applicable national law, to enable You to reasonably exercise Your
+ right under Section 3(b) of this License (right to make Adaptations)
+ but not otherwise.
+
+ 5. Representations, Warranties and Disclaimer
+
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO
+ YOU.
+
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
+ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. Termination
+
+ 1. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Adaptations or Collections
+ from You under this License, however, will not have their licenses
+ terminated provided such individuals or entities remain in full
+ compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+ survive any termination of this License.
+ 2. Subject to the above terms and conditions, the license granted
+ here is perpetual (for the duration of the applicable copyright in the
+ Work). Notwithstanding the above, Licensor reserves the right to
+ release the Work under different license terms or to stop distributing
+ the Work at any time; provided, however that any such election will not
+ serve to withdraw this License (or any other license that has been, or
+ is required to be, granted under the terms of this License), and this
+ License will continue in full force and effect unless terminated as
+ stated above.
+
+ 8. Miscellaneous
+
+ 1. Each time You Distribute or Publicly Perform the Work or a
+ Collection, the Licensor offers to the recipient a license to the Work
+ on the same terms and conditions as the license granted to You under
+ this License.
+ 2. Each time You Distribute or Publicly Perform an Adaptation,
+ Licensor offers to the recipient a license to the original Work on the
+ same terms and conditions as the license granted to You under this
+ License.
+ 3. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this License, and without further action
+ by the parties to this agreement, such provision shall be reformed to
+ the minimum extent necessary to make such provision valid and
+ enforceable.
+ 4. No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in writing
+ and signed by the party to be charged with such waiver or consent.
+ 5. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no understandings,
+ agreements or representations with respect to the Work not specified
+ here. Licensor shall not be bound by any additional provisions that may
+ appear in any communication from You. This License may not be modified
+ without the mutual written agreement of the Licensor and You.
+ 6. The rights granted under, and the subject matter referenced, in
+ this License were drafted utilizing the terminology of the Berne
+ Convention for the Protection of Literary and Artistic Works (as
+ amended on September 28, 1979), the Rome Convention of 1961, the WIPO
+ Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty
+ of 1996 and the Universal Copyright Convention (as revised on July 24,
+ 1971). These rights and subject matter take effect in the relevant
+ jurisdiction in which the License terms are sought to be enforced
+ according to the corresponding provisions of the implementation of
+ those treaty provisions in the applicable national law. If the standard
+ suite of rights granted under applicable copyright law includes
+ additional rights not granted under this License, such additional
+ rights are deemed to be included in the License; this License is not
+ intended to restrict the license of any rights under applicable law.
+
+ Trademark restrictions might apply to selected images.
+
+
+== MySQL Connector/C++ and MySQL Connector/Python ==
Copyright:
(c) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc.
@@ -152,7 +477,7 @@ FLOSS License Exception:
== Google CTemplate ==
Copyright:
- (c) 2005, Google Inc.
+ (c) 2005-2009 Google Inc.
License:
Redistribution and use in source and binary forms, with or without
@@ -182,22 +507,36 @@ License:
-== yaSSL ==
-
-Copyright:
- (c) 2003, Sawtooth Consulting Ltd.
-
-License:
- GPL v2 with "FLOSS exception"
-
- See above for the full text.
-
-
-
== Scintilla ==
Copyright:
- (c) 1998-2009 by Neil Hodgson
+ (c) 1998-2010 by Neil Hodgson
+ (c) 2002 by Sergey Koshcheyev <sergey.k@seznam.cz>
+ (c) 2004 by Herr Pfarrer rpfarrer <at> yahoo <dot> de
+ (c) 2001- by Vamsi Potluru <vamsi@who.net> & Praveen Ambekar <ambekarpraveen@yahoo.com>
+ (c) 2005-2009 by Robert Roessler <robertr@rftp.com>
+ (c) 2003-2004 by Ron Schofield <ron@schofieldcomputer.com>
+ (c) 2007 by Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+ (c) 2006 by Waldemar Augustyn <waldemar@wdmsys.com>
+ (c) 2003 by Patrizio Bekerle (patrizio@bekerle.com)
+ (c) 2005 by Randy Butler
+ (c) 2010 by Xavi <jarabal/at/gmail.com> (Harbour)
+ (c) 2007 by Istvan Szollosi ( szteven <at> gmail <dot> com )
+ (c) 2004 by Manfred Becker <manfred@becker-trdf.de>
+ (c) 2003 by Kein-Hong Man <mkh@pl.jaring.my>
+ (c) 2003 by Marius Gheorghe <mgheorghe@cabletest.com>
+ (c) 2003 - 2005 by Angelo Mandato <angelo [at] spaceblue [dot] com>
+ (c) 1990-2007, Scientific Toolworks, Inc.
+ (c) 2008 by Tim Gerundt <tim@gerundt.de>
+ (c) 2006-2007 by Yuval Papish <Yuval@YuvCom.com>
+ (c) 2005 by Pascal Hurni <pascal_hurni@fastmail.fm>
+ (c) 2001- by Clemens Wyss <wys@helbling.ch>
+ (c) 2009 by James Moffatt and Yuzhou Xin
+ (c) 2005 by Robert Roessler <robertr@rftp.com>
+ (c) 2006 by Fabien Proriol
+ (c) 1998-2001 by Andre Arpin <arpin@kingston.net>
+ (c) 2003- by Sean O'Dell <sean@celsoft.com>
+
License:
@@ -250,3 +589,89 @@ License:
Portions of SilverCity are based on Scintilla. See above for Scintilla
license.
+
+
+== pyexpect ==
+
+Copyright:
+ (c) by 2008 Noah Spurrier
+
+License:
+
+ 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.
+
+
+== VSQLite++ ==
+
+Copyright:
+ (c) by 2006 Vinzenz Feenstra vinzenz.feenstra@virtuosic-bytes.com
+
+
+License:
+ 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.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of virtuosic bytes nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ 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.
+
+
+== tinyxml ==
+
+Copyright:
+ (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
+
+
+License:
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
diff --git a/debian/patches/frontend_makefile.patch b/debian/patches/frontend_makefile.patch
new file mode 100644
index 0000000..8c067a8
--- /dev/null
+++ b/debian/patches/frontend_makefile.patch
@@ -0,0 +1,18 @@
+--- mysql-workbench-gpl-5.2.34.orig/frontend/linux/workbench/Makefile.am
++++ mysql-workbench-gpl-5.2.34/frontend/linux/workbench/Makefile.am
+@@ -12,14 +12,7 @@
+ res/diagram_size_form.glade\
+ res/input_dialog.glade\
+ res/db_sql_editor_view.glade\
+- workbench.rc\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/python.xml\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/lua.xml\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/mysql.xml\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/default.xml\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/LexerStyleNames/python.txt\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/LexerStyleNames/mysql.txt\
+- $(top_srcdir)/frontend/windows/ScintillaNET/Configuration/Builtin/LexerStyleNames/lua.txt
++ workbench.rc
+
+ #BUILT_SOURCES=precompiled.h.gch
+
diff --git a/debian/patches/gcc_4.6.patch b/debian/patches/gcc_4.6.patch
new file mode 100644
index 0000000..88ab647
--- /dev/null
+++ b/debian/patches/gcc_4.6.patch
@@ -0,0 +1,10 @@
+--- mysql-workbench-gpl-5.2.34.orig/modules/db.mysql/src/db_mysql_catalog_report.h
++++ mysql-workbench-gpl-5.2.34/modules/db.mysql/src/db_mysql_catalog_report.h
+@@ -10,6 +10,7 @@
+ #include "config.h"
+ #endif
+
++#include <cstddef>
+ #include "ctemplate/template.h"
+
+ #include "grt/common.h"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e633820
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+frontend_makefile.patch
+gcc_4.6.patch
diff --git a/debian/rules b/debian/rules
index 23ff90f..a7db5b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@ DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f
DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_UPSTREAM_DIR_VERSION ?= $(shell echo $(DEB_UPSTREAM_VERSION) | tr -d 'a-zA-Z')
+
+#CXXFLAGS += -Wall -fpermissive
configure: configure-stamp
configure-stamp:
@@ -30,6 +33,7 @@ build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
+ $(MAKE) -j2 -C library/forms/swig/ -f Makefile.swig
$(MAKE) -j2
#docbook-to-man debian/mysql-workbench.sgml > mysql-workbench.1
@@ -97,14 +101,17 @@ get-orig-source:
-O /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-src.tar.gz \
http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-src.tar.gz
@tar xfz /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-src.tar.gz -C /tmp
- @mv /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-src /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+ @mv /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_DIR_VERSION)-src /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/boost/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/cppconn/CMakeFiles/
+ @rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/cppconn/win/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/curl/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/libsigc++/
+ @rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/scintilla/cocoa/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/scintilla/doc/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/scintilla/macosx/
+ @rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/tinyxml/windows/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/frontend/mac/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/frontend/windows/
@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/MySQLWorkbench.xcodeproj/
Reply to: