Bug#836564: Missing OnlyShowIn=KDE; in klipper autostart file

2016-09-28 Thread Jonathan Riddell
On Sun, Sep 04, 2016 at 07:22:37PM -0300, Lisandro Damián Nicanor Pérez Meyer 
wrote:
> Indeed I missread you, sorry for that. yes, it shouldn't be run by default 
> except the user or the desktop upstreams decide so.
> 
> Jonathan: please take a look at the bug. I think Michael is right here, users 
> should be able to use Klipper on non-plasma desktops but it shouldn't happen 
> by default. Of course a fix directly in upstream will be preferable here :)

Sorry for the late reply.  In Plasma/5.7 branch it's set to autostart 
NotShowIn=KDE which makes it start automatically on Gnome etc which is strange, 
the change was for the menu file as there's no point having it in the menu for 
Plasma because you can run it through the systray but other desktop users might 
be interested in running it so it should be shown.  Should be fixed in 5.8 
branch which has two desktop files, menu file gets shown in !KDE and autostart 
file is only for KDE.

https://phabricator.kde.org/D2323

Jonathan



Bug#758109: obsolete okular patch

2014-08-14 Thread Jonathan Riddell
Package: okular

no_xrandr_support_on_xvfb.patch is unneeded with libkscreen 1.0.5


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#753322: suggest on imagemagick

2014-06-30 Thread Jonathan Riddell
Package: kopete

The latex plugin requires imagemagick to work so adding a Suggests on 
imagemagick would be a good idea, we have done this in Kubuntu

Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#753328: remove explicit baloo dependency from libraries

2014-06-30 Thread Jonathan Riddell
Package: baloo

In the initial packaging I added an explicit dependency in the
.symbols files so anything using a baloo library would depend on
baloo.  Upstream has said this is wrong to do as it's perfectly valid
to not have baloo installed and be running e.g. dolphin.  Also
baloo-kf5 will be appearing sometime which is should be a drop in
replacement.  So it should rather be seeded in whatever meta-package is
installed for people to install a Plasma and KDE Software desktop.

Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#751874: depend on qtdeclarative4-kqtquickcharts-1

2014-06-17 Thread Jonathan Riddell
Package: ktouch

from Kubuntu:

- Add dependency on qtdeclarative4-kqtquickcharts-1 as the qml module
is needed for anything to be displayed. LP: #1310019

Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#749933: Drop obsolete cmake option -DENABLE_LCMS2=ON

2014-05-30 Thread Jonathan Riddell
Package: libkdcraw

From Kubuntu:
+   - Drop obsolete cmake option -DENABLE_LCMS2=ON as that's now the only
+ supported version

--- ../../debi/libkdcraw/debian/rules   2014-05-30 18:35:52.666834045 +0100
+++ debian/rules2014-05-30 18:37:25.319515000 +0100
@@ -2,9 +2,6 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-override_dh_auto_configure:
-   $(overridden_command) -- -DENABLE_LCMS2=ON
-
 override_dh_shlibdeps:
$(overridden_command) $(foreach p,$(shell dh_listpackages | grep 
^lib),-p$p) -- -xkde-runtime
$(overridden_command) --remaining-packages


Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#732063: sphinx detection

2013-12-13 Thread Jonathan Riddell
Package: opencv

I had to add this patch to fix compilation with sphinx 1.2

Index: opencv-2.4.6.1+dfsg/cmake/OpenCVDetectPython.cmake
===
--- opencv-2.4.6.1+dfsg.orig/cmake/OpenCVDetectPython.cmake 2013-12-13 
12:59:27.672317672 +
+++ opencv-2.4.6.1+dfsg/cmake/OpenCVDetectPython.cmake  2013-12-13 
12:59:57.224318429 +
@@ -108,7 +108,7 @@
 OUTPUT_QUIET
 ERROR_VARIABLE SPHINX_OUTPUT
 OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(SPHINX_OUTPUT MATCHES ^Sphinx v([0-9][^ \n]*))
+if(SPHINX_OUTPUT MATCHES Sphinx v([0-9][^ \n]*))
   set(SPHINX_VERSION ${CMAKE_MATCH_1})
   set(HAVE_SPHINX 1)
   message(STATUS Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD})


Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#732028: add ocl support

2013-12-12 Thread Jonathan Riddell
Package: opencv

In Ubuntu I have added OCL support to this package, debdiff attached
diff -Nru opencv-2.4.6.1+dfsg/debian/changelog 
opencv-2.4.6.1+dfsg/debian/changelog
--- opencv-2.4.6.1+dfsg/debian/changelog2013-11-23 04:31:06.0 
+
+++ opencv-2.4.6.1+dfsg/debian/changelog2013-12-12 16:29:01.0 
+
@@ -1,3 +1,14 @@
+opencv (2.4.6.1+dfsg-2ubuntu1) trusty; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+   - build-dep on ocl-icd-opencl-dev and add libopencv-ocl-dev to libcv-dev 
depends
+ and add libopencv-ocl2.4 and libopencv-ocl-dev packages
+  * Add detect_opencl to build ocl with multiarched libraries
+  * opencv-data breaks libopencv-dev (= 2.4.6.1+dfsg-2ubuntu1)
+  * Add detect_opencl to fix finding opencl library with multiarch
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Wed, 11 Dec 2013 16:23:54 +
+
 opencv (2.4.6.1+dfsg-2) unstable; urgency=low
 
   [ Anton Gladky ]
@@ -67,6 +78,40 @@
 
  -- Nobuhiro Iwamatsu iwama...@debian.org  Fri, 12 Jul 2013 13:00:43 +0900
 
+opencv (2.4.5+dfsg-0ubuntu5) trusty; urgency=low
+
+  * No change rebuild against libav9.
+
+ -- Dmitrijs Ledkovs x...@ubuntu.com  Thu, 07 Nov 2013 11:25:28 +
+
+opencv (2.4.5+dfsg-0ubuntu4) saucy; urgency=low
+
+  * Add libopencv-ocl-dev to depends of libopencv-dev
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Thu, 10 Oct 2013 16:58:42 +0100
+
+opencv (2.4.5+dfsg-0ubuntu3) saucy; urgency=low
+
+  [ Thomas Bleher ]
+  * Package missing library libopencv-ocl LP: #1213861
+
+  [ Jonathan Riddell ]
+  * Add build-dep on ocl-icd-opencl-dev
+
+ -- Thomas Bleher thomasble...@gmx.de  Mon, 19 Aug 2013 08:21:39 +0200
+
+opencv (2.4.5+dfsg-0ubuntu2) saucy; urgency=low
+
+  * Package missing library libopencv-superres
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Fri, 28 Jun 2013 14:01:14 +0100
+
+opencv (2.4.5+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Wed, 26 Jun 2013 16:44:16 +0100
+
 opencv (2.4.3+dfsg-1) experimental; urgency=low
 
   * New upstream release.
diff -Nru opencv-2.4.6.1+dfsg/debian/control opencv-2.4.6.1+dfsg/debian/control
--- opencv-2.4.6.1+dfsg/debian/control  2013-10-12 22:09:18.0 +0100
+++ opencv-2.4.6.1+dfsg/debian/control  2013-12-12 16:17:52.0 +
@@ -1,7 +1,8 @@
 Source: opencv
 Priority: optional
 Section: devel
-Maintainer: Debian Science Team 
debian-science-maintain...@lists.alioth.debian.org
+Maintainer: Kubuntu Developers kubuntu-de...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Science Team 
debian-science-maintain...@lists.alioth.debian.org
 Uploaders: Sam Hocevar (Debian packages) sam+...@zoy.org,
Nobuhiro Iwamatsu iwama...@debian.org
 Build-Depends: debhelper (= 9),
@@ -25,7 +26,8 @@
  python-numpy,
  python-sphinx,
  texlive-fonts-extra, texlive-latex-extra, texlive-latex-recommended,
- latex-xcolor, texlive-fonts-recommended
+ latex-xcolor, texlive-fonts-recommended,
+ ocl-icd-opencl-dev
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/opencv/trunk/
 Vcs-Browser: 
http://anonscm.debian.org/viewsvn/debian-science/packages/opencv/trunk/
@@ -65,7 +67,8 @@
libopencv-objdetect-dev,
libopencv-legacy-dev,
libopencv-video-dev,
-   libopencv-ml-dev
+   libopencv-ml-dev,
+libopencv-ocl-dev
 Conflicts: libcvaux-dev (= 2.1.0-7), libhighgui-dev (= 2.1.0-7)
 Description: Translation package for libcv-dev
  This package provide files for translation from libcv-dev to
@@ -249,7 +252,7 @@
 Section: libdevel
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: libopencv-dev (= 2.3.1-12)
+Breaks: libopencv-dev ( 2.4.6.1+dfsg-2ubuntu1)
 Description: development data for opencv
  This is a metapackage providing development package necessary for
  development of OpenCV (Open Computer Vision).
@@ -1030,6 +1033,50 @@
  .
  The Open Computer Vision Library is a collection of algorithms and sample
  code for various computer vision problems. The library is compatible with
+ IPL (Intel's Image Processing Library) and, if available, can use IPP
+ (Intel's Integrated Performance Primitives) for better performance.
+ .
+ OpenCV provides low level portable data types and operators, and a set
+ of high level functionalities for video acquisition, image processing and
+ analysis, structural analysis, motion analysis and object tracking, object
+ recognition, camera calibration and 3D reconstruction.
+
+Package: libopencv-ocl-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+   libopencv-core-dev (= ${binary:Version}),
+   libopencv-imgproc-dev (= ${binary:Version}),
+   libopencv-objdetect-dev (= ${binary:Version}),
+   libopencv-features2d-dev (= ${binary:Version}),
+   libopencv-ocl2.4 (= ${binary:Version})
+Description: development files for libopencv-photo2.4
+ This package contains the header

Bug#715527: kubuntu

2013-12-11 Thread Jonathan Riddell
Packaged for Kubuntu as part of Google Code in
https://bugs.launchpad.net/ubuntu/+bug/1157723
It downloads a GTK app to set itself up so I'm not minded to put it into
the Ubuntu archive.

Jonathan


Bug#731936: Phonon Qt 5

2013-12-11 Thread Jonathan Riddell
Package: phonon

I've added builds of Phonon4Qt5 to the phonon and 
phonon-backend-gstreamer and phonon-backend-vlc packages in Kubuntu.
It requires a second build of the package to create a Qt 5 version. 

If you want patches for these see the sources in
https://launchpad.net/ubuntu/+source/phonon 

or ping me on IRC 

Jonathan 


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#731958: manpage

2013-12-11 Thread Jonathan Riddell
Package: partitionmanager

In Kubuntu we have a manpage for this tool in line with Debian policy

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/partitionmanager/trusty/view/head:/debian/partitionmanager.pod

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/partitionmanager/trusty/view/head:/debian/rules

Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#731957: ntfsprogs is now

2013-12-11 Thread Jonathan Riddell
Package: partitionmanager

partitionmanager suggests ntfsprogs but this package is now ntfs-3g

Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#730355: do not add dependency on kdepim-runtime

2013-11-24 Thread Jonathan Riddell
Package: libkolab

libkolab binary package depends on kdepim-runtime.  This is added by
kdepimlibs libraries which have symbols files modified to force the
dependency.  This causes problems with a circular dependency with
kdepim-runtime build requiring itself installed.

Add this to debian/rules to prevent it
override_dh_shlibdeps:
$(overridden_command) -- -xkdepim-runtime

this should also be added to libkgapi and libkfbapi if you package them

Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#700676: ubuntu

2013-06-10 Thread Jonathan Riddell
package now in ubuntu based off Marcus Watts's packagae with some fixes

https://launchpad.net/ubuntu/+source/opencolorio

  * Build with --with python2
  * Add build-depends on libxi-dev and libxmu-dev
  * Set -DOCIO_BUILD_DOCS:BOOL=OFF to avoid compile failures
  * Rebuild tar without ext/ and src/mari/ directory for licence simplicity
  * Complete debian/copyright

Jonathan


Bug#664054: non-dfsg files

2012-03-15 Thread Jonathan Riddell
Source: fonts-kanjistrokeorders

PDF files are in this source package without a preferred modifiable form of the 
file, this is not DFSG compliant.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#650006: kdebase still used

2011-11-25 Thread Jonathan Riddell
Package: kdetoys

kdetoys packaging in Git still build-deps on kdebase-workspace-dev which should 
now be kde-workspace-dev

kdetoys-dbg still depends on kdebase-runtime-dbg which should be kde-runtime-dbg

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#649917: Acknowledgement (missing file)

2011-11-25 Thread Jonathan Riddell
Reported upstream to https://bugs.kde.org/show_bug.cgi?id=287544



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#650008: kdebase dependency

2011-11-25 Thread Jonathan Riddell
Package: plasma-scriptengine-superkaramba

in git packaging plasma-scriptengine-superkaramba suggests 
kdebase-workspace-bin which should now be kde-workspace-bin

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#650011: depends on kdebase

2011-11-25 Thread Jonathan Riddell
Package: kdewebdev

kdewebdev-dbg depends on kdebase-runtime-dbg which should now be kde-runtime-dbg



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#649916: incorrect licence

2011-11-24 Thread Jonathan Riddell
Package: kdegraphics-strigi-analyzer

in debian/copyright it should be LGPL-2+ not LGPL-2



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#649917: missing file

2011-11-24 Thread Jonathan Riddell
Package: kdegames

usr/share/kde4/apps/kdegames/pics/star.png is not installed in kdegames.  In 
ubuntu i've put it into libkdegames5a.install



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#649928: missing header

2011-11-24 Thread Jonathan Riddell
Package: libmsn

version 4.2 needs xmlParser.h in soap.h but it is not installed, this is the 
change in ubuntu to fix this

http://people.canonical.com/~jriddell/tmp/libmsn_4.2-1ubuntu1.debdiff

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#649963: kdeplasma-addons-dbg depends on obsolete package

2011-11-24 Thread Jonathan Riddell
Package: kdeplasma-addons

kdeplasma-addons-dbg depends on kdebase-workspace-dbg in Git packaging, it 
should depend on kde-workspace-dbg

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#641019: pristine-tar does not work with tar files made by openSUSE

2011-09-09 Thread Jonathan Riddell
Package: pristine-tar
Version: 1.14

openSUSE includes a patch to bzip2 to change a maxlength value back to
the pre bzip2 1.0.3 setting.  This means upstream tars such as those
made for KDE can not be used with pristine-tar.

Offending patch
https://build.opensuse.org/package/view_file?file=bzip2-maxlen20.patchpackage=bzip2project=openSUSE%3AFactorysrcmd5=3ee4cf959e98e3ca50a881d1cdc13570

Example offending tar file:
https://launchpad.net/ubuntu/+archive/primary/+files/kde-l10n-is_4.7.1.orig.tar.bz2

Good tar file to compare to:
https://launchpad.net/ubuntu/oneiric/+source/kde-l10n-is/4:4.7.0-0ubuntu1/+files/kde-l10n-is_4.7.0.orig.tar.bz2

failing command:
pristine-bz2 --no-verbose --no-debug --no-keep gendelta 
kde-l10n-is_4.7.1.orig.tar.bz2 kde-l10n-is_4.7.0.orig.tar.bz2

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#618932: cmake multiarch support

2011-03-19 Thread Jonathan Riddell
Package: cmake

Unlike autoconf, cmake doesn't use the linker to find libraries.

This patch adds support for multiarch library directories to cmake.  It also 
needs a runtime dependency on dpkg-dev.

Jonathan
--- cmake-2.8.3.orig/Source/cmFindBase.cxx
+++ cmake-2.8.3/Source/cmFindBase.cxx
@@ -324,6 +324,14 @@ void cmFindBase::AddPrefixPaths(std::vec
   {
   dir += /;
   }
+if (subdir == lib)
+  {
+  const char* triplet = 
this-Makefile-GetDefinition(CMAKE_ARCH_TRIPLET);
+  if (triplet)
+{
+this-AddPathInternal(dir+lib/+triplet, pathType);
+}
+  }
 std::string add = dir + subdir;
 if(add != /)
   {
--- cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake
+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
@@ -29,6 +29,8 @@ SET(UNIX 1)
 GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR ${CMAKE_ROOT} PATH)
 GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR ${_CMAKE_INSTALL_DIR} PATH)
 
+EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE 
CMAKE_ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 # List common installation prefixes.  These will be used for all
 # search types.
 LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
@@ -74,6 +76,7 @@ LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
   )
 
 LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+  /lib/${CMAKE_ARCH_TRIPLET} /usr/lib/${CMAKE_ARCH_TRIPLET}
   /lib /usr/lib /usr/lib32 /usr/lib64
   )
 


Bug#611245: try again

2011-02-02 Thread Jonathan Riddell
try again with attachment
diff -Nru qtmobility-1.1.0/debian/changelog qtmobility-1.1.0/debian/changelog
--- qtmobility-1.1.0/debian/changelog   2010-11-16 16:26:40.0 +
+++ qtmobility-1.1.0/debian/changelog   2011-01-27 10:53:14.0 +
@@ -1,3 +1,9 @@
+qtmobility (1.1.0-0ubuntu2) natty; urgency=low
+
+  * Move hal to a suggests on libqtsysteminfo1, LP: #708519
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Thu, 27 Jan 2011 10:52:34 +
+
 qtmobility (1.1.0-0ubuntu1) natty; urgency=low
 
   * New upstream release
diff -Nru qtmobility-1.1.0/debian/control qtmobility-1.1.0/debian/control
--- qtmobility-1.1.0/debian/control 2010-11-16 17:44:12.0 +
+++ qtmobility-1.1.0/debian/control 2011-01-27 10:51:39.0 +
@@ -134,7 +134,7 @@
 
 Package: libqtserviceframework1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Service Framework module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
@@ -145,7 +145,7 @@
 Package: libqtsysteminfo1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: qtmobility-l10n
+Suggests: qtmobility-l10n, hal
 Description: Qt Mobility System Information module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .


Bug#611245: patch

2011-01-27 Thread Jonathan Riddell
Here is the patch used in Ubuntu.  hal is moved to a suggests (it has runtime 
code to fall back gracefully if hal isn't available).

Further it turns out the dependency on hal is actually on the wrong package, it 
should be on libqtsysteminfo1 not libqtserviceframework1

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#611255: GCC 4.6 fix for Qt 3

2011-01-27 Thread Jonathan Riddell
Package: qt-x11-free

GCC 4.6 is more strict about headers than previous versions.  Programmes that 
use Qt 3 fail to compile.  This patch fixes the problem.
diff -u qt-x11-free-3.3.8-b/debian/changelog 
qt-x11-free-3.3.8-b/debian/changelog
--- qt-x11-free-3.3.8-b/debian/changelog
+++ qt-x11-free-3.3.8-b/debian/changelog
@@ -1,3 +1,10 @@
+qt-x11-free (3:3.3.8-b-7ubuntu2) natty; urgency=low
+
+  * Add kubuntu_10_gcc46_includes.diff to fix programmes using Qt3 and
+compiling with GCC 4.6
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Thu, 27 Jan 2011 10:31:32 +
+
 qt-x11-free (3:3.3.8-b-7ubuntu1) natty; urgency=low
 
   * Merge with Debian, remaining changes:
diff -u qt-x11-free-3.3.8-b/debian/patches/series 
qt-x11-free-3.3.8-b/debian/patches/series
--- qt-x11-free-3.3.8-b/debian/patches/series
+++ qt-x11-free-3.3.8-b/debian/patches/series
@@ -61,0 +62 @@
+kubuntu_10_gcc46_includes.diff
only in patch2:
unchanged:
--- qt-x11-free-3.3.8-b.orig/debian/patches/kubuntu_10_gcc46_includes.diff
+++ qt-x11-free-3.3.8-b/debian/patches/kubuntu_10_gcc46_includes.diff
@@ -0,0 +1,20 @@
+--- qt3/src/tools/qvaluelist.h 2008-01-15 19:09:13.0 +
 qt3/src/tools/qvaluelist.h 2011-01-27 10:29:39.559757983 +
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include iterator
+ #include list
++#include cstddef
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
+--- qt3/src/tools/qmap.h   2008-01-15 19:09:13.0 +
 qt3/src/tools/qmap.h   2011-01-27 10:30:12.087757984 +
+@@ -52,6 +52,7 @@
+ #ifndef QT_NO_STL
+ #include iterator
+ #include map
++#include cstddef
+ #endif
+ 
+ //#define QT_CHECK_MAP_RANGE


Bug#609581: Incompatible licences

2011-01-11 Thread Jonathan Riddell

The question is if the plugin is a derived work of both the GPL 2 only
libpoppler and the GPL 3 only application.  Since it can't exist
without either then it almost certainly is.  And since the licences
are incompatible that makes it illegal to distribute.

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#609581: Incompatible licences

2011-01-10 Thread Jonathan Riddell
Package: calibre

calibre is licenced as GPL 3 only.  It links to Poppler which is GPL 2
only.  These two licences are incompatible, see
http://gplv3.fsf.org/wiki/index.php/Compatible_licenses#GPLv3-incompatible_licenses
so the poppler plugin for calibre needs to be removed.

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#581511: system-config-printer-kde

2010-07-28 Thread Jonathan Riddell

I'm the upstream author of system-config-printer-kde

system-config-printer-kde needs cupshelpers modules, config.py,
smburi.py and debug.py.  

cupshelpers modules are currently in your python-cupsutils package
The other modules are included in python-cupsutils in Debian
unstable's packages which does not match how upstream installs the files and
means system-config-printer-kde needs to be patched.

I recommend splitting config.py, smburi.py and debug.py into a
system-config-printer-common package so that system-config-printer-kde
does not have to depend on the whole system-config-printer.

In Ubuntu we also include testpage-a4.ps and testpage-letter.ps in
system-config-printer-common, I'm not sure if Debian ships equivalent
files.

Other modules which might get used by system-config-printer-kde in
future and so would be candidates for system-config-printer-common are
check-device-ids.py, dnssdresolve.py, firewall.py, installdriver.py,
installpackage.py, monitor.py, PhysicalDevice.py, ppdippstr.py,
probe_printer.py, SearchCriterion.py, statereason.py, XmlHelper.py.

Jonathan Riddell



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#584112: uim compile failure

2010-06-01 Thread Jonathan Riddell
Package: uim

uim failed to compile in Ubuntu.  This probably means it will fail to
compile in Debian one day soon as well.  This patch fixed it.

#! /bin/sh /usr/share/dpatch/dpatch-run
## 17_qt4_compile_fix.diff by Jonathan Riddell jridd...@ubuntu.com
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
--- uim/qt4/pref/customwidgets.cpp  2009-11-21 12:55:15.0 +
+++ uim/qt4/pref/customwidgets.cpp  2010-06-01 10:53:25.845596448 +
@@ -884,7 +884,7 @@
   pressed_keyval( 0 ),
   pressed_keystate( Qt::NoModifier ),
   pressed_unichar ( 0 ),
-  m_keystr( 0 )
+  m_keystr(  )
 {
 QLabel *l = new QLabel( _(Press keys to grab (e.g. Controla)), this );
 


Bug#583266: spelling mistakes

2010-05-26 Thread Jonathan Riddell

Package: libqalculate

There are spelling mistakes in the currencies

https://sourceforge.net/tracker/?group_id=86696atid=580546

attached patch fixes
--- libqalculate-0.9.6/data/currencies.xml.in   2006-04-27 18:47:58.0 
+0200
+++ libqalculate-0.9.6~/data/currencies.xml.in  2008-08-30 22:59:45.0 
+0200
@@ -23,7 +23,7 @@
   _namesar:GBP,au:#xA3;/_names
 /builtin_unit
 builtin_unit name=THB
-  _titleThai Bat/_title
+  _titleThai Baht/_title
   _namesar:THB/_names
 /builtin_unit
 builtin_unit name=SEK
@@ -51,7 +51,7 @@
   _namesar:RUB,ruble/_names
 /builtin_unit
 builtin_unit name=PHP
-  _titlePhillipine Peso/_title
+  _titlePhilippine Peso/_title
   _namesar:PHP/_names
 /builtin_unit
 builtin_unit name=MYR
@@ -63,7 +63,7 @@
   _namesar:HRK/_names
 /builtin_unit
 builtin_unit name=CNY
-  _titleYuan Renmimbi (PR China)/_title
+  _titleYuan Renminbi (PR China)/_title
   _namesar:CNY/_names
 /builtin_unit
 builtin_unit name=IDR
@@ -219,7 +219,7 @@
   /base
 /unit
 unit type=alias
-  _titleDeutche Mark/_title
+  _titleDeutsche Mark/_title
   _namesar:DEM,mark/_names
   base
 unitEUR/unit


Bug#583267: data files in wrong package

2010-05-26 Thread Jonathan Riddell
Package: libqalculate

LP: #419498 and Mandriva bug: #36944 indicate that the data files
should not be installed in the qalc packge, but along the library
itself. Grepping the library source supports this theory. Hence moving
the data files.

debian/tmp/usr/share/qalculate/*.xml  should be moved to
libqalculate5.install






-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#576069: unnecessary build-depend

2010-03-31 Thread Jonathan Riddell
Package: libffado
Source: libffado
Version: 2.0.0+svn1806-1

libffado should not build-depend on pyqt-tools, this is a PyQt3
package but libffado uses PyQt4
diff -u libffado-2.0.0+svn1806/debian/changelog 
libffado-2.0.0+svn1806/debian/changelog
--- libffado-2.0.0+svn1806/debian/changelog
+++ libffado-2.0.0+svn1806/debian/changelog
@@ -1,3 +1,10 @@
+libffado (2.0.0+svn1806-2) lucid; urgency=low
+
+  * Do not build-depend on pyqt-tools, it is a PyQt3 package and
+libffado uses PyQt4
+
+ -- Jonathan Riddell jridd...@ubuntu.com  Wed, 31 Mar 2010 15:50:35 +0100
+
 libffado (2.0.0+svn1806-1) unstable; urgency=low
 
   * New upstream release (fixes FTBFS on powerpc)
diff -u libffado-2.0.0+svn1806/debian/control 
libffado-2.0.0+svn1806/debian/control
--- libffado-2.0.0+svn1806/debian/control
+++ libffado-2.0.0+svn1806/debian/control
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Multimedia Maintainers 
pkg-multimedia-maintain...@lists.alioth.debian.org
 Uploaders: Adrian Knoth a...@drcomp.erfurt.thur.de, Free Ekanayaka 
fr...@debian.org
-Build-Depends: debhelper (= 7.0), scons, libraw1394-dev (= 1.3.0), 
libxml2-dev (= 2.6.13), libiec61883-dev (= 1.1.0), cdbs, pkg-config, dbus (= 
1.0.0), python, python-dbus, python-qt4, pyqt4-dev-tools, dh-buildinfo, 
libexpat1-dev, libxml++2.6-dev, libdbus-1-dev, pyqt-tools, python-qt4-dbus, 
autotools-dev
+Build-Depends: debhelper (= 7.0), scons, libraw1394-dev (= 1.3.0), 
libxml2-dev (= 2.6.13), libiec61883-dev (= 1.1.0), cdbs, pkg-config, dbus (= 
1.0.0), python, python-dbus, python-qt4, pyqt4-dev-tools, dh-buildinfo, 
libexpat1-dev, libxml++2.6-dev, libdbus-1-dev, python-qt4-dbus, autotools-dev
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Section: libs


Bug#563954: kdesu not in $PATH

2010-01-06 Thread Jonathan Riddell
Package: ntfs-config

kdesu is not in $PATH in KDE 4, it's in /usr/lib/kde4/libexec/kdesu

This patch fixes that

See https://bugs.edge.launchpad.net/ntfs-config/+bug/503847

--- ntfs-config/ntfs-config-root.in 2010-01-05 17:30:54.0+
+++ ntfs-config/ntfs-config-root.in 2010-01-05 17:44:38.0+
@@ -53,12 +53,12 @@
 desktop = get_desktop()
 if desktop == GNOME and test_cmd(gksu) :
 auth = gksu
- elif desktop == KDE and test_cmd(kdesu) :
- auth = kdesu
+ elif desktop == KDE and test_cmd(/usr/lib/kde4/libexec/kdesu) :
+ auth = /usr/lib/kde4/libexec/kdesu
 elif test_cmd(gksu) :
 auth = gksu
- elif test_cmd(kdesu) :
- auth = kdesu
+ elif test_cmd(/usr/lib/kde4/libexec/kdesu) :
+ auth = /usr/lib/kde4/libexec/kdesu
 else :
 dialog(error, _(No authentication program founds), \
 _(ntfs-config need to be run as root, but I can't
find\n



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#550214: skim fails to build

2009-10-08 Thread Jonathan Riddell
Package: skim
Version: 1.4.5-4

skim fails to build in Kubuntu, probably the same is true in Debian,
this debdiff contains a patch (it also removes the autostart file
which you may well want to ignore).

Jonathan



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#526000: support KDE 4 in acpid

2009-04-28 Thread Jonathan Riddell
Package: acpid

This change fixes powerbtn.sh for KDE 4 support, it will be needed
when KDE 4 enters unstable.

http://launchpadlibrarian.net/26062019/acpid_1.0.6-9ubuntu4.9.04.3.debdiff



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#526067: Messages.sh build script missing

2009-04-28 Thread Jonathan Riddell
Package: ktorrent

KTorrent includes a minor licence problem, the Messages.sh file used
to create the .pot (and therefor the included .po files) is
removed by upstream when building the release tars.  Build scripts are
required to be included by the GPL.

https://bugs.kde.org/show_bug.cgi?id=190913

http://websvn.kde.org/trunk/extragear/network/ktorrent/Messages.sh?revision=944162view=markup



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#509213: qt-creator package

2009-03-02 Thread Jonathan Riddell

I have packaged this for Kubuntu.

https://edge.launchpad.net/ubuntu/+source/qt-creator



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#512029: debian/copyright file incorrect for xdgmime

2009-01-16 Thread Jonathan Riddell
Package: google-gadgets


debian/copyright says third_party/xdgmime is GPL, but it is LGPL
according to the headers.

+++ google-gadgets-0.10.3/debian/copyright  2009-01-16
15:23:32.0 +
@@ -518,7 +518,7 @@
 third_party/xdgmime/*.c:
Copyright (C) 2003,2004  Red Hat, Inc.
Copyright (C) 2003,2004  Jonathan Blandford j...@alum.mit.edu
-   GPL-2, see /usr/share/common-licenses/GPL-2 for full text
+   LGPL-2 or later, see /usr/share/common-licenses/LGPL-2 for full 
text
Or Academic Free License 2.0:



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#505974: llvm patch needed for opengtl

2008-11-17 Thread Jonathan Riddell
Package: llvm


This patch is needed for llvm to be able to compile opengtl on amd64.

Also it needs to be compiled with -fPIC.

Patch by Cyrille Berger.

Jonathan
--- a/lib/Target/X86/X86JITInfo.cpp.orig2008-07-02 09:41:02.0 
+0200
+++ b/lib/Target/X86/X86JITInfo.cpp 2008-07-02 09:41:51.0 +0200
@@ -25,8 +25,10 @@
 // Determine the platform we're running on
 #if defined (__x86_64__) || defined (_M_AMD64)
 # define X86_64_JIT
+# define ASMSUFFIX @PLT
 #elif defined(__i386__) || defined(i386) || defined(_M_IX86)
 # define X86_32_JIT
+# define ASMSUFFIX
 #endif
 
 void X86JITInfo::replaceMachineCodeForFunction(void *Old, void *New) {
@@ -112,7 +114,7 @@
 // JIT callee
 movq%rbp, %rdi\n// Pass prev frame and return address
 movq8(%rbp), %rsi\n
-call ASMPREFIX X86CompilationCallback2\n
+call ASMPREFIX X86CompilationCallback2 ASMSUFFIX \n
 // Restore all XMM arg registers
 movaps  112(%rsp), %xmm7\n
 movaps  96(%rsp), %xmm6\n
@@ -186,7 +188,7 @@
 movl4(%ebp), %eax\n // Pass prev frame and return address
 movl%eax, 4(%esp)\n
 movl%ebp, (%esp)\n
-call ASMPREFIX X86CompilationCallback2\n
+call ASMPREFIX X86CompilationCallback2 ASMSUFFIX \n
 movl%ebp, %esp\n// Restore ESP
 CFI(.cfi_def_cfa_register %esp\n)
 subl$12, %esp\n
@@ -240,7 +242,7 @@
 movl4(%ebp), %eax\n // Pass prev frame and return address
 movl%eax, 4(%esp)\n
 movl%ebp, (%esp)\n
-call ASMPREFIX X86CompilationCallback2\n
+call ASMPREFIX X86CompilationCallback2 ASMSUFFIX \n
 addl$16, %esp\n
 movaps  48(%esp), %xmm3\n
 CFI(.cfi_restore %xmm3\n)
--- debian/llvm-2.3/debian/rules2008-11-17 10:32:13.0 +
+++ llvm-2.3/debian/rules   2008-11-17 10:32:48.0 +
@@ -42,7 +42,7 @@
 confargs_gcc:= $(confargs)
 
 confargs_llvm += \
-   --prefix=$(PF)
+   --prefix=$(PF) --enable-pic --with-pic
 
 confargs_gcc  += \
--prefix=$(PF)/gcc-$(gcc_version) \


Bug#499517: Stop pauses during startup when scim isn't installed

2008-09-19 Thread Jonathan Riddell
Package: scim-bridge


Qt applications take a long time to start up when scim isn't installed
and scim-bridge-qt4 is.  This patch stop this.

Also attached is another patch to stop unnecessary console output.

Jonathan
#! /bin/sh /usr/share/dpatch/dpatch-run
## 50_check_scim_binary.dpatch by [EMAIL PROTECTED]
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes 10-20s delay in launching apps when scim-bridge-client(s) 
installed but scim is not

@DPATCH@
diff -urNad scim-bridge-0.4.14~/client-common/scim-bridge-client.c 
scim-bridge-0.4.14/client-common/scim-bridge-client.c
--- scim-bridge-0.4.14~/client-common/scim-bridge-client.c 2008-09-15 
11:43:48.0 -0230
+++ scim-bridge-0.4.14/client-common/scim-bridge-client.c  2008-09-15 
12:00:14.0 -0230
@@ -1015,6 +1015,12 @@
 scim_bridge_perrorln (The messenger has already been opend);
 return RETVAL_SUCCEEDED;
 }
+
+/* This is a quick fix. which scim should probably be defined somewhere 
instead of coded like below - RG */
+if (system (which scim) != 0) {
+scim_bridge_pdebugln (8, There is no SCIM binary);
+return RETVAL_FAILED;
+}

 int i;
 for (i = 0; i  10; ++i) {
#! /bin/sh /usr/share/dpatch/dpatch-run
## 51_quiet.dpatch by Jonathan Riddell
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes 10-20s delay in launching apps when scim-bridge-client(s) 
installed but scim is not

@DPATCH@
diff -urNad 
scim-bridge-0.4.14~/client-common/scim-bridge-client-imcontext-qt.cpp 
scim-bridge-0.4.14/client-common/scim-bridge-client-imcontext-qt.cpp
--- 
scim-bridge-0.4.14~client-qt/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp  
2007-07-07 03:30:10.0 +0100
+++ 
scim-bridge-0.4.14client-qt/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp   
2008-09-19 13:24:48.0 +0100
@@ -173,7 +173,7 @@
 #endif
 
 if (!scim_bridge_client_is_messenger_opened ()) {
-scim_bridge_perrorln (The messenger is now down);
+scim_bridge_pdebugln (1, The messenger is now down);
 } else if (scim_bridge_client_register_imcontext (this)) {
 scim_bridge_perrorln (Failed to register the IMContext);
 } else {
@@ -189,7 +189,7 @@
 if (this == focused_imcontext) focus_out ();
 
 if (!scim_bridge_client_is_messenger_opened ()) {
-scim_bridge_perrorln (The messenger is now down);
+scim_bridge_pdebugln (1, The messenger is now down);
 } else if (scim_bridge_client_deregister_imcontext (this)) {
 scim_bridge_perrorln (Failed to deregister an IMContext);
 } else {


Bug#498281: updates wrong alternative

2008-09-08 Thread Jonathan Riddell
Package: pinentry-qt

the postinst script updates the alternative to pinentry-qt, should be
pinentry-qt4.

diff -u pinentry-qt4-0.7.3+svn799201/debian/control 
pinentry-qt4-0.7.3+svn799201/debian/control
--- pinentry-qt4-0.7.3+svn799201/debian/control
+++ pinentry-qt4-0.7.3+svn799201/debian/control
@@ -1,7 +1,8 @@
 Source: pinentry-qt4
 Section: utils
 Priority: optional
-Maintainer: Peter Eisentraut [EMAIL PROTECTED]
+Maintainer: Ubuntu Core Developers [EMAIL PROTECTED]
+XSBC-Original-Maintainer: Peter Eisentraut [EMAIL PROTECTED]
 Build-Depends: cdbs (= 0.4.51), cmake, debhelper (= 6), libqt4-dev
 Standards-Version: 3.7.3
 
diff -u pinentry-qt4-0.7.3+svn799201/debian/pinentry-qt4.postinst 
pinentry-qt4-0.7.3+svn799201/debian/pinentry-qt4.postinst
--- pinentry-qt4-0.7.3+svn799201/debian/pinentry-qt4.postinst
+++ pinentry-qt4-0.7.3+svn799201/debian/pinentry-qt4.postinst
@@ -4,11 +4,11 @@
 
 if [ $1 = configure ]; then
update-alternatives --quiet \
- --install /usr/bin/pinentry pinentry /usr/bin/pinentry-qt 95 \
- --slave /usr/share/man/man1/pinentry.1.gz pinentry.1.gz 
/usr/share/man/man1/pinentry-qt.1.gz
+ --install /usr/bin/pinentry pinentry /usr/bin/pinentry-qt4 95 \
+ --slave /usr/share/man/man1/pinentry.1.gz pinentry.1.gz 
/usr/share/man/man1/pinentry-qt4.1.gz
update-alternatives --quiet \
- --install /usr/bin/pinentry-x11 pinentry-x11 /usr/bin/pinentry-qt 95 \
- --slave /usr/share/man/man1/pinentry-x11.1.gz pinentry-x11.1.gz 
/usr/share/man/man1/pinentry-qt.1.gz
+ --install /usr/bin/pinentry-x11 pinentry-x11 /usr/bin/pinentry-qt4 95 
\
+ --slave /usr/share/man/man1/pinentry-x11.1.gz pinentry-x11.1.gz 
/usr/share/man/man1/pinentry-qt4.1.gz
 fi
 
 #DEBHELPER#
diff -u pinentry-qt4-0.7.3+svn799201/debian/changelog 
pinentry-qt4-0.7.3+svn799201/debian/changelog
--- pinentry-qt4-0.7.3+svn799201/debian/changelog
+++ pinentry-qt4-0.7.3+svn799201/debian/changelog
@@ -1,3 +1,10 @@
+pinentry-qt4 (0.7.3+svn799201-1ubuntu1) intrepid; urgency=low
+
+  * Fix postinst, alternative should point to pinentry-qt4 not pinentry-qt, 
+Closes: LP: #263357
+
+ -- Jonathan Riddell [EMAIL PROTECTED]  Mon, 08 Sep 2008 18:01:15 +0100
+
 pinentry-qt4 (0.7.3+svn799201-1) experimental; urgency=low
 
   * Initial release


Bug#470482: Package contains CC licenced files

2008-03-11 Thread Jonathan Riddell

Package: elisa-plugins-bad

This package contains files under Creative Commons
Attribution-ShareAlike 2.5, which I believe is considered non-free in
Debian.




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#467023: install-css not executable

2008-02-22 Thread Jonathan Riddell

Package: kaffeine

install-css.sh is not execuatable, this is needed in debian/rules:

DEB_FIXPERMS_EXCLUDE := install-css.sh 





-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#465469: libqt4* missing symbols _ZN14QObjectPrivate15checkWindowRoleEv

2008-02-21 Thread Jonathan Riddell

That symbol is created by patch 0180-window-role.diff

Possibly you are using an unpackaged Qt without that patch.

It should be hidden anyway but is leaked to the outside world by a bug
in QtUiTools, this will be fixed in Qt 4.3.4.

Jonathan



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#455334: patch

2008-02-17 Thread Jonathan Riddell

Patch attached.

diff -Nru 
/tmp/apTDsmsFWb/libept-0.5.12ubuntu1/ept/debtags/maint/debtagsindexer.cc 
/tmp/oauLGiCZRM/libept-0.5.12ubuntu2/ept/debtags/maint/debtagsindexer.cc
--- libept-0.5.12ubuntu1/ept/debtags/maint/debtagsindexer.cc2007-12-14 
15:24:22.0 +0100
+++ libept-0.5.12ubuntu2/ept/debtags/maint/debtagsindexer.cc2008-01-31 
21:04:58.0 +0100
@@ -11,6 +11,8 @@
 
 #include wibble/exception.h
 
+#include cstring
+
 using namespace std;
 
 namespace ept {
diff -Nru /tmp/apTDsmsFWb/libept-0.5.12ubuntu1/ept/debtags/vocabulary.cc 
/tmp/oauLGiCZRM/libept-0.5.12ubuntu2/ept/debtags/vocabulary.cc
--- libept-0.5.12ubuntu1/ept/debtags/vocabulary.cc  2007-12-14 
15:24:22.0 +0100
+++ libept-0.5.12ubuntu2/ept/debtags/vocabulary.cc  2008-01-31 
21:11:19.0 +0100
@@ -25,6 +25,7 @@
 
 #include tagcoll/input/memory.h
 
+#include cstring
 #include sstream
 
 #include sys/types.h
diff -Nru 
/tmp/apTDsmsFWb/libept-0.5.12ubuntu1/ept/popcon/maint/popconindexer.cc 
/tmp/oauLGiCZRM/libept-0.5.12ubuntu2/ept/popcon/maint/popconindexer.cc
--- libept-0.5.12ubuntu1/ept/popcon/maint/popconindexer.cc  2007-12-14 
15:24:22.0 +0100
+++ libept-0.5.12ubuntu2/ept/popcon/maint/popconindexer.cc  2008-01-31 
21:13:03.0 +0100
@@ -10,6 +10,7 @@
 #include set
 #include string
 #include cstdio
+#include cstring
 
 using namespace std;
 
diff -Nru /tmp/apTDsmsFWb/libept-0.5.12ubuntu1/ept/popcon/maint/sourcedir.cc 
/tmp/oauLGiCZRM/libept-0.5.12ubuntu2/ept/popcon/maint/sourcedir.cc
--- libept-0.5.12ubuntu1/ept/popcon/maint/sourcedir.cc  2007-12-14 
15:24:22.0 +0100
+++ libept-0.5.12ubuntu2/ept/popcon/maint/sourcedir.cc  2008-01-31 
21:12:38.0 +0100
@@ -4,6 +4,8 @@
 #include tagcoll/input/zlib.h
 #include tagcoll/input/stdio.h
 
+#include cstdlib
+
 using namespace std;
 
 namespace ept {


Bug#464211: data file is non-free

2008-02-05 Thread Jonathan Riddell

Package: xtide-data

The file in xtide-data is not in a preferred modifiable form, so
should be in non-free.

Jonathan



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#450636: incompatible licence

2008-01-22 Thread Jonathan Riddell
On Sun, Jan 20, 2008 at 11:49:10PM -0600, Steve M. Robbins wrote:
 I'd like to obtain more information on why LGPL v3 is incompatible
 with other packages using this library.  Apart from Qt that you
 mentioned, which licenses are troublesome in this regard?

It contains additional restrictions making GPL 2 only code unable to
link to it.

 In addition, I note that Qt now available under GPL v3 [1].
 Surely that is compatible with LGPL v3?

Yes indeed, so this bug can be closed once Qt 3.3.8b is uploaded.

Jonathan



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#454126: GCC 4.3 Compile Errors

2007-12-03 Thread Jonathan Riddell

Package: libpqxx
Version: 2.6.9-5

libpqxx does not compile with GCC 4.3.  This patch fixes it.

diff -pruN 2.6.9-5/src/binarystring.cxx
2.6.9-5ubuntu1/src/binarystring.cxx
--- 2.6.9-5/src/binarystring.cxx2007-11-21 17:44:46.0 +
+++ 2.6.9-5ubuntu1/src/binarystring.cxx 2007-11-21 17:44:46.0
+
@@ -19,6 +19,7 @@
 #include cstring
 #include new
 #include stdexcept
+#include cstring

 #include libpq-fe.h

diff -pruN 2.6.9-5/src/connection_base.cxx
2.6.9-5ubuntu1/src/connection_base.cxx
--- 2.6.9-5/src/connection_base.cxx 2007-11-21 17:44:46.0 +
+++ 2.6.9-5ubuntu1/src/connection_base.cxx  2007-11-21
17:44:46.0 +
@@ -24,6 +24,7 @@
 #include cstring
 #include ctime
 #include stdexcept
+#include cstring

 #ifdef PQXX_HAVE_SYS_SELECT_H
 #include sys/select.h
diff -pruN 2.6.9-5/src/result.cxx 2.6.9-5ubuntu1/src/result.cxx
--- 2.6.9-5/src/result.cxx  2007-11-21 17:44:46.0 +
+++ 2.6.9-5ubuntu1/src/result.cxx   2007-11-21 17:44:46.0
 #+
@@ -20,6 +20,7 @@
 #include cstdlib
 #include cstring
 #include stdexcept
+#include cstring

 #include libpq-fe.h

diff -pruN 2.6.9-5/src/transaction_base.cxx
2.6.9-5ubuntu1/src/transaction_base.cxx
--- 2.6.9-5/src/transaction_base.cxx2007-11-21 17:44:46.0 +
+++ 2.6.9-5ubuntu1/src/transaction_base.cxx 2007-11-21
17:44:47.0 +
@@ -20,6 +20,7 @@

 #include cstring
 #include stdexcept
+#include cstring

 #include pqxx/connection_base
 #include pqxx/result



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#441597: ftbfs with g++-4.3/gcc-snapshot

2007-12-03 Thread Jonathan Riddell

A patch

diff -urNad scim-tables-0.5.7~/src/scim_generic_table.h 
scim-tables-0.5.7/src/scim_generic_table.h
--- scim-tables-0.5.7~/src/scim_generic_table.h 2006-08-23 11:25:32.0 
+0100
+++ scim-tables-0.5.7/src/scim_generic_table.h  2007-12-03 13:42:26.0 
+
@@ -32,6 +32,7 @@
 #include scim_event.h
 #include vector
 #include string
+#include cstring
 #include algorithm
 #include stdio.h



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#441599: patch for gcc 4.3

2007-11-29 Thread Jonathan Riddell

Patch for compiling with GCC 4.3

--- speedcrunch-0.8.orig/src/testhmath.cpp
+++ speedcrunch-0.8/src/testhmath.cpp
@@ -21,6 +21,7 @@

 #include iostream
 #include string.h
+#include cstdlib

 #include hmath.h

--- speedcrunch-0.8.orig/src/CMakeLists.txt
+++ speedcrunch-0.8/src/CMakeLists.txt
@@ -122,7 +122,7 @@

 # enable warnings
 if(CMAKE_COMPILER_IS_GNUCXX )
-  ADD_DEFINITIONS( -Wall -Werror )
+  ADD_DEFINITIONS( -Wall )
 endif(CMAKE_COMPILER_IS_GNUCXX )

 # setup for Qt4



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#450636: incompatible licence

2007-11-08 Thread Jonathan Riddell

Package: gmp
Version: 4.2.2+dfsg

The new version of GMP is licenced under GNU LGPL 3.  This is
incompatible with a number of the packages which use this library,
notably those using Qt.

The package needs to be reverted to an earlier version or an alternate
GPL 2 version packaged.

Jonathan



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#450637: incompatible licencing

2007-11-08 Thread Jonathan Riddell

Package: gsl
Version: 1.10

The new version of GSL is licenced under GNU GPL 3.  This is
incompatible with a number of the packages which use this library,
notably those using Qt.

The package needs to be reverted to an earlier version or an alternate
GPL 2 version packaged.

Also debian/copyright has not been updated.

Jonathan



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#441577: Build with -fpermissive

2007-11-05 Thread Jonathan Riddell

This can be fixed by putting this at the top of debian/rules

ifneq (,$(filter $(GCCVER),4.3))
CXXFLAGS += -fpermissive
endif



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#390703: ubuntu digikam no longer requires libgphoto-2-2-dev

2007-06-27 Thread Jonathan Riddell
On Tue, Jun 19, 2007 at 05:39:20PM +0100, Mark Purcell wrote:
 Luka,
 
 I see from the ubuntu changelog for digikam that you claim that you no longer 
 need the libgphoto .la files due to the difference in the way the Kubuntu KDE 
 has been built.
 
 I can confirm I am still having this problem in Debian with the 0.9.2 final 
 release package.
 
 Can you provide some details so we can get this fixed in Debian?

I've not looked into this myself, but there's nothing I know of that
Ubuntu does which should make any difference.  I asked Matthias Klose
who suggested Ubuntu might happen to have a reference to the gphoto.so
file which Debian doesn't.  I can see in /usr/lib/libdigikam.la
dependency_libs='.../usr/lib/libgphoto2.la /usr/lib/libexif.la
/usr/lib/libgphoto2_port.la...' but I have neither of those files
installed so I'm at a bit of a loss what the difference could be.

Jonathan


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#344351: Include libgs.so in Debian

2005-12-21 Thread Jonathan Riddell
Package: gs-gpl
Version: 8.15-4ubuntu1

Please include libgs.so in Debian's Ghostscript package, it is needed
for KDE's okular viewer and gsview.

Thanks

Jonathan Riddell



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]