[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#737050: Some corrections to the package



Hi, I packaged wx3.0 doc, and after that I discovered this ITP and the package on mentors...

For this reason I'm sending to you my debdiff against the version on mentors, really similar but with the jquery lintian error fixed.

Also the copyright file in my opinion was outdated, so I changed it, removing the wx3.0 code specific copyrights.

BTW feel free to change and remove me from uploaders, I thought nobody was caring so I took the possibility, but if you care feel free to go on ;)

For the maintainer I think freewx-maint is the best choice... But I don't have a strong opinion and I have no upload possibilities 


diff -Nru wx3.0-doc-3.0.1/debian/changelog wx3.0-doc-3.0.1/debian/changelog
--- wx3.0-doc-3.0.1/debian/changelog    2014-08-24 07:33:42.000000000 +0200
+++ wx3.0-doc-3.0.1/debian/changelog    2014-09-01 15:38:56.000000000 +0200
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #737050)
 
- -- SUGIMOTO Norimitsu <dictoss@live.jp>  Sat, 19 Jul 2014 13:02:56 +0900
+ -- Sugimoto Norimitsu <dictoss@live.jp>  Sat, 19 Jul 2014 13:02:56 +0900
diff -Nru wx3.0-doc-3.0.1/debian/control wx3.0-doc-3.0.1/debian/control
--- wx3.0-doc-3.0.1/debian/control    2014-07-24 15:20:05.000000000 +0200
+++ wx3.0-doc-3.0.1/debian/control    2014-09-01 15:40:58.000000000 +0200
@@ -1,21 +1,30 @@
 Source: wx3.0-doc
 Section: doc
-Maintainer: SUGIMOTO Norimitsu <dictoss@live.jp>
-Build-Depends: debhelper (>= 9)
+Priority: optional
+Build-Depends: debhelper (>=9), dh-linktree, libjs-jquery
+Maintainer: wxWidgets Maintainers <freewx-maint@lists.alioth.debian.org>
+Uploaders: Olly Betts <olly@survex.com>,
+ Sugimoto Norimitsu <dictoss@live.jp>,
+ Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
 Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/freewx/wx.git -b wx3.0-doc
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=freewx/wx.git;a=shortlog;h=refs/heads/wx3.0-doc
 Homepage: http://www.wxwidgets.org/
-#Vcs-Git: git://anonscm.debian.org/collab-maint/wx3.0-doc.git
-#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/wx3.0-doc.git;a=summary
 
 Package: wx3.0-doc
 Section: doc
 Architecture: all
-Provides: wx-doc
+Provides: wx3.0-doc
 Suggests: doc-base, www-browser
 Depends: ${misc:Depends}
 Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing the same
+ program to work for all supported platforms, wxThread class for writing
+ multithreaded programs, and much more.
+ .
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), Microsoft Windows, and Mac OS X.
  .
  This package provides a HTML version of the wxWidgets reference manual.
diff -Nru wx3.0-doc-3.0.1/debian/copyright wx3.0-doc-3.0.1/debian/copyright
--- wx3.0-doc-3.0.1/debian/copyright    2014-07-24 15:20:05.000000000 +0200
+++ wx3.0-doc-3.0.1/debian/copyright    2014-09-01 15:41:19.000000000 +0200
@@ -1,5 +1,5 @@
-This package was debianized by Ron Lee <ron@debian.org> on
-Sun, 13 Feb 2000 18:40:00 +1030.
+This package was debianized by Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+and Sugimoto Norimitsu <dictoss@live.jp>, on Tue, 26 Aug 2014 18:00:06 +0200.
 
 More information about wxWidgets, as well as the source these debs
 are produced from can be found at http://www.wxwidgets.org/
@@ -192,295 +192,3 @@
   OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 -----------------------------------------------------------------------------
-
-src/stc/scintilla is licensed as follows:
-
-License for Scintilla and SciTE
-
-Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-
-All Rights Reserved 
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that 
-both that copyright notice and this permission notice appear in 
-supporting documentation. 
-
-NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
-OR PERFORMANCE OF THIS SOFTWARE. 
-
------------------------------------------------------------------------------
-
-src/expat (unused in the debian binary packages) is licensed as follows:
-
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-                               and Clark Cooper
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
-
-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.
-
------------------------------------------------------------------------------
-
-src/jpeg (unused in the debian binary packages) is licensed as follows:
-
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-fitness for a particular purpose.  This software is provided "AS IS", and you,
-its user, assume the entire risk as to its quality and accuracy.
-
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
-
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
-
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it.  This software may be referred to only as "the Independent JPEG Group's
-software".
-
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
-
-
-ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-by the usual distribution terms of the Free Software Foundation; principally,
-that you must include source code if you redistribute it.  (See the file
-ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
-of any program generated from the IJG code, this does not limit you more than
-the foregoing paragraphs do.
-
-The Unix configuration script "configure" was produced with GNU Autoconf.
-It is copyright by the Free Software Foundation but is freely distributable.
-The same holds for its supporting scripts (config.guess, config.sub,
-ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
-by M.I.T. but is also freely distributable.
-
-It appears that the arithmetic coding option of the JPEG spec is covered by
-patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
-legally be used without obtaining one or more licenses.  For this reason,
-support for arithmetic coding has been removed from the free JPEG software.
-(Since arithmetic coding provides only a marginal gain over the unpatented
-Huffman mode, it is unlikely that very many implementations will support it.)
-So far as we are aware, there are no patent restrictions on the remaining
-code.
-
-The IJG distribution formerly included code to read and write GIF files.
-To avoid entanglement with the Unisys LZW patent, GIF reading support has
-been removed altogether, and the GIF writer has been simplified to produce
-"uncompressed GIFs".  This technique does not use the LZW algorithm; the
-resulting GIF files are larger than usual, but are readable by all standard
-GIF decoders.
-
-We are required to state that
-    "The Graphics Interchange Format(c) is the Copyright property of
-    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-    CompuServe Incorporated."
-
------------------------------------------------------------------------------
-
-src/png (unused in the debian binary packages) is licensed as follows:
-
-This code is released under the libpng license.
-
-libpng versions 1.2.6, August 15, 2004, through 1.6.2, April 25, 2013, are
-Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.2.5
-with the following individual added to the list of Contributing Authors
-
-   Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6
-with the following individuals added to the list of Contributing Authors
-
-   Simon-Pierre Cadieux
-   Eric S. Raymond
-   Gilles Vollant
-
-and with the following additions to the disclaimer:
-
-   There is no warranty against interference with your enjoyment of the
-   library or against infringement.  There is no warranty that our
-   efforts or the library will fulfill any of your particular purposes
-   or needs.  This library is provided with all faults, and the entire
-   risk of satisfactory quality, performance, accuracy, and effort is with
-   the user.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,
-with the following individuals added to the list of Contributing Authors:
-
-   Tom Lane
-   Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,
-with the following individuals added to the list of Contributing Authors:
-
-   John Bowler
-   Kevin Bracey
-   Sam Bushell
-   Magnus Holmgren
-   Greg Roelofs
-   Tom Tanner
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose.  The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-1. The origin of this source code must not be misrepresented.
-
-2. Altered versions must be plainly marked as such and must not
-   be misrepresented as being the original source.
-
-3. This Copyright notice may not be removed or altered from any
-   source or altered source distribution.
-
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products.  If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
-
-
-A "png_get_copyright" function is available, for convenient use in "about"
-boxes and the like:
-
-   printf("%s",png_get_copyright(NULL));
-
-Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-April 25, 2013
-
------------------------------------------------------------------------------
-
-src/tiff (unused in the debian binary packages) is licensed as follows:
-
-Copyright (c) 1988-1997 Sam Leffler
-Copyright (c) 1991-1997 Silicon Graphics, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and 
-its documentation for any purpose is hereby granted without fee, provided
-that (i) the above copyright notices and this permission notice appear in
-all copies of the software and related documentation, and (ii) the names of
-Sam Leffler and Silicon Graphics may not be used in any advertising or
-publicity relating to the software without the specific, prior written
-permission of Sam Leffler and Silicon Graphics.
-
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-
-IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-OF THIS SOFTWARE.
-
------------------------------------------------------------------------------
-
-src/zlib (unused in the debian binary packages) is licensed as follows:
-
- (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  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.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.
diff -Nru wx3.0-doc-3.0.1/debian/rules wx3.0-doc-3.0.1/debian/rules
--- wx3.0-doc-3.0.1/debian/rules    2014-07-24 15:50:15.000000000 +0200
+++ wx3.0-doc-3.0.1/debian/rules    2014-09-01 15:31:23.000000000 +0200
@@ -1,32 +1,4 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
 
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-# main packaging script based on dh7 syntax
 %:
-    dh $@ 
-
-# debmake generated override targets
-# This is example for Cmake (See http://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#    dh_auto_configure -- \
-#    -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-
-
-
+    dh $@ --with linktree
diff -Nru wx3.0-doc-3.0.1/debian/watch wx3.0-doc-3.0.1/debian/watch
--- wx3.0-doc-3.0.1/debian/watch    2014-07-24 15:20:05.000000000 +0200
+++ wx3.0-doc-3.0.1/debian/watch    2014-09-01 15:18:44.000000000 +0200
@@ -1,2 +1,3 @@
 version=3
-http://www.wxwidgets.org/downloads/ https://sourceforge.net/projects/wxwindows/files/.*/wxWidgets-(.+)-docs-html\.tar\.bz2
+opts=dversionmangle=s/\+dfsg.*$// \
+  http://sf.net/wxwindows/wxWidgets-([0-9.]+)-docs-html\.tar\.bz2 debian uupdate
diff -Nru wx3.0-doc-3.0.1/debian/wx3.0-doc.doc-base wx3.0-doc-3.0.1/debian/wx3.0-doc.doc-base
--- wx3.0-doc-3.0.1/debian/wx3.0-doc.doc-base    2014-08-24 07:32:08.000000000 +0200
+++ wx3.0-doc-3.0.1/debian/wx3.0-doc.doc-base    2014-09-01 15:37:06.000000000 +0200
@@ -6,5 +6,4 @@
 
 Format: HTML
 Index: /usr/share/doc/wx3.0-doc/index.html
-Files: /usr/share/doc/wx3.0-doc//*.html
-
+Files: /usr/share/doc/wx3.0-doc/*.html
diff -Nru wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees
--- wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees    1970-01-01 01:00:00.000000000 +0100
+++ wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees    2014-09-01 15:34:21.000000000 +0200
@@ -0,0 +1 @@
+replace usr/share/javascript/jquery/jquery.js usr/share/doc/wx3.0-doc/jquery.js

 




Gianfranco

Attachment: debdiff
Description: Binary data


Reply to: