Commit af6e6020 authored by Dmitry Smirnov's avatar Dmitry Smirnov

New upstream release [3.0.1] + changelog summary

 * Copyright updates and lintianisation.
 * Dropped unused lintian-override.
 * Patchworks.
 * Corrected icon installation path.
 * Install missing files.
parent 949bcb9a
usr/share/abiword-*/certs
usr/share/abiword-*/clipart
usr/share/abiword-*/omml_xslt
usr/share/abiword-*/strings
usr/share/abiword-*/system.*
usr/share/abiword-*/templates
usr/share/abiword-*/ui
usr/share/abiword-*/xsltml
usr/share/abiword-*/*.xml
usr/share/abiword-*/system.profile*
usr/share/dbus-*
usr/bin
usr/lib/*/abiword-*/plugins/*.so
usr/share/applications
abiword.png usr/share/pixmaps
usr/share/icons
debian/abiword.xpm usr/share/pixmaps
# false-positives
hardening-no-fortify-functions
# perhaps not important for plugins
library-not-linked-against-libc usr/lib/*/abiword-*/plugins/*
abiword (3.0.1-1) experimental; urgency=medium
* QA upload.
* New upstream release [December 2014].
* Dropped obsolete patches and lintian-overrides.
* Install missing files under "usr/share/abiword-3.0".
* Changed icon installation path.
* Updated "debian/copyright".
-- Dmitry Smirnov <onlyjob@debian.org> Thu, 01 Jan 2015 11:03:35 +1100
abiword (3.0.0-8) unstable; urgency=medium
* QA upload.
......
......@@ -4,27 +4,6 @@ Source: http://www.abisource.com/download/
Comment: This package was debianized by
Masayuki Hatta (mhatta) <mhatta@debian.org> on Sun, 22 Mar 2009 18:42:01 +0900
Files: debian/*
Copyright: 2011-2013 Dmitry Smirnov <onlyjob@debian.org>
2001 Aaron Lehmann <aaronl@vitelus.com>
2001 Anthony Fok <foka@debian.org>
1999-2000 Darren Benham <gecko@debian.org>
2011 Hector Oron <zumbi@debian.org>
2005 J.H.M. Dassen (Ray) <jdassen@debian.org>
2010 Jari Aalto <jari.aalto@cante.net>
2004-2008 Joshua Kwan <joshk@triplehelix.org>
2004 Jordi Mallach <jordi@debian.org>
2001-2002 LaMont Jones <lamont@debian.org>
2002-2009 Masayuki Hatta (mhatta) <mhatta@debian.org>
2006 Matthias Klose <doko@debian.org>
2007 Matthias Klose <doko@debian.org>
2011 Michael Biebl <biebl@debian.org>
2009-2010 Patrik Fimml <patrik@fimml.at>
2011 Regis Boudin <regis@debian.org>
2011 Rene Engelhard <rene@debian.org>
2008 Ryan Pavlik <abiryan@ryand.net>
License: GPL-3+
Files: *
Copyright: 2012 AbiSource.com
1998-2005,2010 AbiSource, Inc
......@@ -317,7 +296,7 @@ License: LGPL-2.1+
Files: plugins/latex/xsltml/README
Copyright: 2001-2003, Vasil Yaroshevich
License: MIT/X11 (BSD like)
License: BSD-like
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
......@@ -358,7 +337,7 @@ License: MPL-1.1 or GPL-2+
Files: src/af/ev/gtk/ev_UnixKeysym2ucs.cpp
Copyright: not applicable
License: Public domain
License: public-domain
This software is in the public domain. Share and enjoy!
Files: src/wp/impexp/xp/MathSVGScript.h
......@@ -385,7 +364,7 @@ Files:
plugins/paint/win/bmp2png.cpp
plugins/paint/win/png2bmp.cpp
Copyright: 2002 Jason Summers <jason1@pobox.com>
License:
License: custom
This software 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.
......@@ -393,22 +372,6 @@ License:
Permission is hereby granted to use, copy, modify, and distribute this
source code for any purpose, without fee.
Files:
plugins/mathview/itex2mml/y.tab.c.msvc
plugins/mathview/itex2mml/y.tab.h.msvc
Copyright: 1984,1989-1990,2000-2006 Free Software Foundation, Inc.
License: GPL-3+
Disclaimer:
As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
Files:
src/af/ev/gtk/ev_UnixFontCombo.cpp
src/af/ev/gtk/ev_UnixFontCombo.h
......@@ -416,17 +379,10 @@ Copyright: 2005 Robert Staudinger
License: LGPL-2+
Files:
plugins/collab/backends/service/xp/msc_stdint.h
plugins/collab/backends/service/xp/soa.h
plugins/collab/backends/service/xp/soa_result.cpp
plugins/collab/backends/service/xp/soa_result.h
plugins/collab/backends/service/xp/soa_soup.cpp
plugins/collab/backends/service/xp/soa_soup.h
plugins/collab/backends/service/xp/soa_types.h
plugins/collab/backends/service/xp/tls_tunnel.cpp
plugins/collab/backends/service/xp/tls_tunnel.h
plugins/collab/backends/service/xp/soa*
plugins/collab/backends/service/xp/tls_tunnel.*
Copyright: 2008-2009 AbiSource Corporation B.V
License: BSD-2-clause
License: BSD-3-clause
Files: goffice-bits2/goffice/utils/go-color.h
Copyright: 1999-2000, EMC Capital Management, Inc
......@@ -454,8 +410,6 @@ Files:
goffice-bits/goffice/goffice.c
goffice-bits/goffice/goffice.h
goffice-bits/goffice/gtk/goffice-gtk.c
goffice-bits/goffice/gtk/go-palette.c
goffice-bits/goffice/gtk/go-palette.h
goffice-bits/goffice/utils/go-color.c
goffice-bits/goffice/utils/go-image.c
goffice-bits/goffice/utils/goffice-utils.h
......@@ -468,8 +422,6 @@ Files:
goffice-bits2/goffice/utils/go-color.c
goffice-bits2/goffice/utils/go-image.c
goffice-bits2/goffice/utils/goffice-utils.h
goffice-bits2/goffice/gtk/go-palette.c
goffice-bits2/goffice/gtk/go-palette.h
Copyright: 2003 Red Hat, Inc
2006 Emmanuel Pacaud <emmanuel.pacaud@lapp.in2p3.fr>
2003-2005 Jody Goldberg <jody@gnome.org>
......@@ -498,10 +450,6 @@ Files:
goffice-bits2/goffice/gtk/go-color-group.c
goffice-bits/goffice/gtk/go-color-group.h
goffice-bits2/goffice/gtk/go-color-group.h
goffice-bits/goffice/gtk/go-color-selector.c
goffice-bits2/goffice/gtk/go-color-selector.c
goffice-bits/goffice/gtk/go-color-selector.h
goffice-bits2/goffice/gtk/go-color-selector.h
src/af/xap/gtk/xap_UnixTableWidget.cpp
src/af/xap/gtk/xap_UnixTableWidget.h
Copyright: 2000-2004 Ximian, Inc
......@@ -526,6 +474,27 @@ Copyright: 2000 Eazel, Inc
2007 Emmanuel Pacaud <emmanuel.pacaud@lapp.in2p3.fr>
License: GPL-2
Files: debian/*
Copyright: 2011-2015 Dmitry Smirnov <onlyjob@debian.org>
2001 Aaron Lehmann <aaronl@vitelus.com>
2001 Anthony Fok <foka@debian.org>
1999-2000 Darren Benham <gecko@debian.org>
2011 Hector Oron <zumbi@debian.org>
2005 J.H.M. Dassen (Ray) <jdassen@debian.org>
2010 Jari Aalto <jari.aalto@cante.net>
2004-2008 Joshua Kwan <joshk@triplehelix.org>
2004 Jordi Mallach <jordi@debian.org>
2001-2002 LaMont Jones <lamont@debian.org>
2002-2009 Masayuki Hatta (mhatta) <mhatta@debian.org>
2006 Matthias Klose <doko@debian.org>
2007 Matthias Klose <doko@debian.org>
2011 Michael Biebl <biebl@debian.org>
2009-2010 Patrik Fimml <patrik@fimml.at>
2011 Regis Boudin <regis@debian.org>
2011 Rene Engelhard <rene@debian.org>
2008 Ryan Pavlik <abiryan@ryand.net>
License: GPL-3+
License: MPL-1.1
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
......@@ -540,7 +509,7 @@ License: MPL-1.1
.
You may obtain a copy of the License at http://www.mozilla.org/MPL/
License: BSD-2-clause
License: BSD-3-clause
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
......
......@@ -11,7 +11,7 @@ Description: Disable smooth scrolling
--- a/src/text/fmt/xp/fv_View.cpp
+++ b/src/text/fmt/xp/fv_View.cpp
@@ -14313,16 +14313,19 @@
@@ -14339,16 +14339,19 @@
if(static_cast<UT_sint32>(m_iNumHorizPages) > m_pLayout->countPages())
{
m_iNumHorizPages = m_pLayout->countPages();
......
Last-Update: 2014-02-05
Forwarded: yes
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Bug-Debian: http://bugs.debian.org/737551
Bug-Abiword: http://bugzilla.abisource.com/13602
Description: fix FTBFS with libboost1.54-dev
--- a/plugins/collab/core/sync/xp/SynchronizedQueue.h
+++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h
@@ -21,8 +21,9 @@
#include <deque>
#include <boost/bind.hpp>
#include <boost/function.hpp>
+#include <boost/noncopyable.hpp>
#include <sync/xp/lock.h>
#include <sync/xp/Synchronizer.h>
class EmptyQueueException {};
--- a/plugins/collab/backends/tcp/xp/Session.h
+++ b/plugins/collab/backends/tcp/xp/Session.h
@@ -21,8 +21,9 @@
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <boost/noncopyable.hpp>
#include <deque>
#include <sync/xp/lock.h>
#include <sync/xp/Synchronizer.h>
Last-Update: 2013-09-07
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Bug-Debian: http://bugs.debian.org/722030
Bug-Abiword: http://bugzilla.abisource.com/13532
Description: fix FTBFS with evolution-data-server (>= 3.8)
--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp
+++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp
@@ -1883,9 +1883,9 @@
#ifdef WITH_EVOLUTION_DATA_SERVER
extern "C" {
- #include <libebook/e-book.h>
+ #include <libebook/libebook.h>
};
static std::string get( EVCard* c, const char* v )
{
Last-Update: 2014-11-15
Bug-Debian: http://bugs.debian.org/766845
Bug-Abiword: http://bugzilla.abisource.com/13586
Description: fix format painter bug
Index: abiword/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
===================================================================
--- abiword.orig/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
+++ abiword/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
@@ -36,42 +36,60 @@ static void handle_dragged_cb (FvTextHan
mode = _fv_text_handle_get_mode (handle);
- if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START)
+ if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START) {
handles->updateSelectionStart ((UT_sint32)x, (UT_sint32)y);
+ }
else {
- if (mode == FV_TEXT_HANDLE_MODE_SELECTION)
+ if (mode == FV_TEXT_HANDLE_MODE_SELECTION) {
handles->updateSelectionEnd ((UT_sint32)x, (UT_sint32)y);
- else
+ }
+ else {
handles->updateCursor((UT_sint32)x, (UT_sint32)y);
+ }
}
}
FV_UnixSelectionHandles::FV_UnixSelectionHandles(FV_View *view, FV_Selection selection)
: FV_SelectionHandles (view, selection)
+ , m_text_handle(NULL)
{
XAP_Frame * pFrame = static_cast<XAP_Frame*>(m_pView->getParentData());
- XAP_UnixFrameImpl * pFrameImpl =static_cast<XAP_UnixFrameImpl *>( pFrame->getFrameImpl());
- GtkWidget * pWidget = pFrameImpl->getViewWidget();
-
- m_text_handle = _fv_text_handle_new (pWidget);
- _fv_text_handle_set_relative_to (m_text_handle,
- gtk_widget_get_window (pWidget));
- g_signal_connect (m_text_handle, "handle-dragged",
- G_CALLBACK(handle_dragged_cb), this);
+ // When saving to PDF (and printing) we don't have a frame
+ // See bug 13586
+ if (pFrame) {
+ XAP_UnixFrameImpl * pFrameImpl = static_cast<XAP_UnixFrameImpl *>(pFrame->getFrameImpl());
+ GtkWidget * pWidget = pFrameImpl->getViewWidget();
+
+ m_text_handle = _fv_text_handle_new (pWidget);
+ _fv_text_handle_set_relative_to (m_text_handle,
+ gtk_widget_get_window (pWidget));
+ g_signal_connect (m_text_handle, "handle-dragged",
+ G_CALLBACK(handle_dragged_cb), this);
+ }
}
FV_UnixSelectionHandles::~FV_UnixSelectionHandles()
{
+ if(!m_text_handle) {
+ return;
+ }
g_object_unref (m_text_handle);
}
void FV_UnixSelectionHandles::hide()
{
+ if(!m_text_handle) {
+ return;
+ }
_fv_text_handle_set_mode (m_text_handle, FV_TEXT_HANDLE_MODE_NONE);
}
void FV_UnixSelectionHandles::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint32 height, bool visible)
{
+ if(!m_text_handle) {
+ return;
+ }
+
GdkRectangle rect;
_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_CURSOR);
@@ -92,6 +110,10 @@ void FV_UnixSelectionHandles::setCursorC
void FV_UnixSelectionHandles::setSelectionCoords(UT_sint32 start_x, UT_sint32 start_y, UT_uint32 start_height, bool start_visible,
UT_sint32 end_x, UT_sint32 end_y, UT_uint32 end_height, bool end_visible)
{
+ if(!m_text_handle) {
+ return;
+ }
+
GdkRectangle rect;
_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_SELECTION);
Last-Update: 2014-07-24
Forwarded: not-needed
Origin: http://bugzilla.abisource.com/attachment.cgi?id=5720
Bug-Debian: http://bugs.debian.org/754554
Bug-Abiword: http://bugzilla.abisource.com/13657
Description: fix FTBFS with gnutls3
--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp
+++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp
@@ -48,91 +48,9 @@
typedef boost::shared_ptr<asio::ip::tcp::socket> socket_ptr_t;
typedef boost::shared_ptr<gnutls_session_t> session_ptr_t;
typedef boost::shared_ptr< std::vector<char> > buffer_ptr_t;
-class mutex {
-public:
- mutex() {
-#ifdef WIN32
- repr = CreateMutex(0, FALSE, 0);
-#else
- pthread_mutex_init(&repr, NULL);
-#endif
- }
-
- void lock() {
-#ifdef WIN32
- WaitForSingleObject(repr, INFINITE);
-#else
- pthread_mutex_lock(&repr);
-#endif
- }
-
- void unlock() {
-#ifdef WIN32
- ReleaseMutex(repr);
-#else
- pthread_mutex_unlock(&repr);
-#endif
- }
-
- ~mutex()
- {
-#ifdef WIN32
- CloseHandle(repr);
-#else
- pthread_mutex_destroy(&repr);
-#endif
- }
-
-private:
- mutex( const mutex& );
- const mutex& operator=( const mutex& );
-
-#ifdef WIN32
- HANDLE repr;
-#else
- pthread_mutex_t repr;
-#endif
-};
-
-static int gcry_tunnel_mutex_init(void **priv)
-{
- if (!priv)
- return -1;
- *priv = new mutex();
- return 0;
-}
-
-static int gcry_tunnel_mutex_destroy(void **priv)
-{
- if (!priv || !*priv)
- return -1;
- delete reinterpret_cast<mutex*>(*priv);
- return 0;
-}
-
-static int gcry_tunnel_mutex_lock(void **priv)
-{
- reinterpret_cast<mutex*>(*priv)->lock();
- return 0;
-}
-
-static int gcry_tunnel_mutex_unlock(void **priv)
-{
- reinterpret_cast<mutex*>(*priv)->unlock();
- return 0;
-}
-
-static struct gcry_thread_cbs gcry_threads_tunnel =
-{ GCRY_THREAD_OPTION_USER, NULL,
- gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy,
- gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
-
bool Proxy::tls_tunnel_init() {
- if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)
- return false;
if (gnutls_global_init() != 0)
return false;
return true;
}
--- a/plugins/collab/backends/service/xp/tls_tunnel.h
+++ b/plugins/collab/backends/service/xp/tls_tunnel.h
@@ -39,9 +39,8 @@
#ifdef _MSC_VER
typedef long ssize_t;
typedef int pid_t;
#endif
-#include <gcrypt.h>
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
namespace tls_tunnel {
Last-update: 2014-02-02
Author: Dimitri John Ledkov <xnox@ubuntu.com>
Description: Cherrypick patch from NetBSD, to fix FTBFS with bison 3.0.
--- a/plugins/mathview/itex2mml/itex2MML.y
+++ b/plugins/mathview/itex2mml/itex2MML.y
@@ -1,8 +1,10 @@
/* itex2MML 1.4.8
* itex2MML.y last modified 9/21/2011
*/
+%parse-param {char **ret_str}
+
%{
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -26,9 +28,9 @@
}
void (*itex2MML_error) (const char * msg) = itex2MML_default_error;
- static void yyerror (char * s)
+ static void yyerror (char **ret_str, char * s)
{
char * msg = itex2MML_copy3 (s, " at token ", yytext);
if (itex2MML_error)
(*itex2MML_error) (msg);
......@@ -1268,7 +1268,7 @@ Description: switch to librevenge-based import libs
if test "$enable_wpg" != ""; then
@@ -1472,10 +1472,10 @@
@@ -1468,10 +1468,10 @@
AC_SUBST([AIKSAURUS_CFLAGS])
AC_SUBST([AIKSAURUS_LIBS])
......@@ -1281,7 +1281,7 @@ Description: switch to librevenge-based import libs
WORDPERFECT_CFLAGS=
WORDPERFECT_LIBS=
@@ -1502,9 +1502,9 @@
@@ -1498,9 +1498,9 @@
wp_deps_pkgs="$wordperfect_pkgs"
PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
......
......@@ -8,7 +8,7 @@ Description: prevent breaking of source tree
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,13 +59,9 @@
@@ -58,13 +58,9 @@
compile-resource \
lt-compile-resource
......
evolution-data-server3.8.patch
gnutls-no-libgcrypt.patch
boost54.patch
itex2MML.y.patch
librevenge.patch
624095-disable_smooth_scrolling.patch
......@@ -10,4 +6,3 @@ autosave.diff -p1
ctrl-comma-subscript.diff -p1
mime-types-desktop.diff -p1
mime-types.diff -p1
format-painter-fix.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment