--- skim-1.4.5.orig/debian/libskim0.install +++ skim-1.4.5/debian/libskim0.install @@ -0,0 +1,2 @@ +usr/lib/libscim-kdeutils.so.* +usr/lib/libskim.so.* --- skim-1.4.5.orig/debian/skim.postinst +++ skim-1.4.5/debian/skim.postinst @@ -0,0 +1,42 @@ +#! /bin/sh +# postinst script for skim +# stole from scim's :) + +set -e + +ua_inst () { + update-alternatives \ + --install /etc/X11/xinit/xinput.d/$1 xinput-$1 \ + /etc/X11/xinit/xinput.d/$2 $3 ; +} + +case "$1" in + configure) + # Set up default + ua_inst all_ALL skim 0 + ua_inst ja_JP skim 50 + ua_inst ko_KR skim 50 + ua_inst zh_CN skim 50 + ua_inst zh_TW skim 50 + ua_inst zh_HK skim 50 + ua_inst zh_SG skim 50 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- skim-1.4.5.orig/debian/scim-panel-kde.1 +++ skim-1.4.5/debian/scim-panel-kde.1 @@ -0,0 +1 @@ +.so man1/skim.1 --- skim-1.4.5.orig/debian/skim.install +++ skim-1.4.5/debian/skim.install @@ -0,0 +1,45 @@ +usr/bin/skim +usr/bin/scim-panel-kde + +etc/X11/xinit/xinput.d/skim + +usr/lib/kde3/*.la +usr/lib/kde3/*.so +usr/lib/pkgconfig/*.pc +usr/lib/scim-1.0/*/Config/*.la +usr/lib/scim-1.0/*/Config/*.so + +usr/share/applnk/Utilities/*.desktop + +usr/share/apps/skim/mainwindowui.rc +usr/share/apps/skim/pics/*.png +usr/share/apps/kicker/applets/*.desktop + +usr/share/autostart/*.desktop + +usr/share/config.kcfg/*.kcfg + +usr/share/doc/kde/HTML/de/skim/index.cache.bz2 +usr/share/doc/kde/HTML/de/skim/*.docbook +usr/share/doc/kde/HTML/de/skim/*.png +usr/share/doc/kde/HTML/en/skim/index.cache.bz2 +usr/share/doc/kde/HTML/en/skim/*.docbook +usr/share/doc/kde/HTML/en/skim/*.png + +usr/share/icons/crystalsvg/32x32/apps/*.png +usr/share/icons/crystalsvg/scalable/apps/*.svgz + +usr/share/locale/*/LC_MESSAGES/*.mo + +usr/share/services/skimconfiguredialog/*.desktop +usr/share/services/skimplugin_compmgrclient.desktop +usr/share/services/skimplugin_inputwindow.desktop +usr/share/services/skimplugin_mainwindow.desktop +usr/share/services/skimplugin_scim.desktop +usr/share/services/skimplugin_setupwindow.desktop +usr/share/services/skimplugin_systemtray.desktop +usr/share/services/skimsetupdir_frontend.desktop +usr/share/services/skimsetupdir_imengines.desktop +usr/share/services/skimsetupdir_panel.desktop + +usr/share/servicetypes/*.desktop --- skim-1.4.5.orig/debian/changelog +++ skim-1.4.5/debian/changelog @@ -0,0 +1,82 @@ +skim (1.4.5-4.1fakesync1) maverick; urgency=low + + * Fake sync due to mismatching orig tarball (LP: #609679). + + -- Bilal Akhtar Sun, 01 Aug 2010 19:36:18 +0200 + +skim (1.4.5-4.1) unstable; urgency=low + + * Non maintainer upload. + * Add patch from Michael Schutte to fix FTBFS. Closes: + bug#534040, bug#550214. + + -- Aurelien Jarno Sun, 31 Jan 2010 18:20:36 +0100 + +skim (1.4.5-4) unstable; urgency=low + + [ Zhengpeng Hou ] + * polish the conffile of im-switch, make it work + with both qt3 and qt4. + + [ Jaldhar H. Vyas ] + * Add homepage and vcs fields to debian/control + + + -- Zhengpeng Hou Sun, 24 Feb 2008 20:57:43 +0800 + +skim (1.4.5-3) unstable; urgency=low + + * Add 07_fix_FTBFS.dpatch. Closes: #456855 + * Add conffile for im-switch, make skim can be + used easily. + * Changed maintainer name to better reflect who is maintaining this package. + + -- Zhengpeng Hou Fri, 22 Feb 2008 02:37:37 +0000 + +skim (1.4.5-2) unstable; urgency=low + + * Make skim build-dep libscim-dev (>= 1.4.6-1). + * Use usr/lib/scim-1.0/*/Config/*.so in skim.install + to install the scim module. + * Add scim-pinyin to skim's Suggests packages, and drop scim-chinese. + + -- ZhengPeng Hou Tue, 15 May 2007 13:46:19 +0000 + +skim (1.4.5-1) unstable; urgency=low + + * New upstream release + + -- William J Beksi Sat, 6 Jan 2007 15:09:05 -0500 + +skim (1.4.4-2) unstable; urgency=high + + * fix up scons so the package can build again. Thanks Mark Brown. + (Closes: #367882) + * Patched skim.pc so headers are placed correctly. (Closes: #356981) + * Disable starting up automatically on starting KDE. + * fix desktop file for XDG. Thanks Hou ZhengPeng for these three patches. + * Some small config changes. + * Made jaldhar-skim@debian.org maintainer. + + -- Jaldhar H. Vyas Sun, 4 Jun 2006 07:45:59 -0400 + +skim (1.4.4-1) unstable; urgency=low + + * Handling maintainer duties while William is away. + * New upstream version (Closes: #350941) + * Acknowledge NMU. Thanks Aurelian. (Closes: #349426) + + -- Jaldhar H. Vyas Thu, 16 Feb 2006 10:03:39 -0500 + +skim (1.4.3-1.1) unstable; urgency=low + + * 0-day NMU to fix a RC bug. + * Create a binary-indep and a binary-arch target (closes: bug#349426). + + -- Aurelien Jarno Mon, 6 Feb 2006 20:50:30 +0100 + +skim (1.4.3-1) unstable; urgency=low + + * Initial release Closes: #309857 + + -- William J Beksi Sun, 5 June 2005 14:17:59 +0800 --- skim-1.4.5.orig/debian/libskim-dev.install +++ skim-1.4.5/debian/libskim-dev.install @@ -0,0 +1,7 @@ +usr/lib/lib*.la +usr/lib/libskim.so +usr/lib/libscim-kdeutils.so + +usr/include/skim/*.h +usr/include/skim/utils/*.h + --- skim-1.4.5.orig/debian/control +++ skim-1.4.5/debian/control @@ -0,0 +1,36 @@ +Source: skim +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: skim maintainers +Uploaders: Jaldhar H. Vyas , William J Beksi , Zhengpeng Hou +Build-Depends: dpatch, debhelper (>= 4.0.0), scons (>= 0.96), libscim-dev (>= 1.4.6), kdelibs4-dev (>= 3.4.2-4), libqt3-mt-dev (>= 3.3.5), libart-2.0-dev (>= 2.3.17), libidn11-dev (>= 0.5.18) +Standards-Version: 3.7.3 +Homepage: http://www.scim-im.org/projects/skim +Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/skim/ +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/skim/ + +Package: skim +Architecture: any +Depends: ${shlibs:Depends} +Suggests: scim-chewing, scim-pinyin, scim-hangul, scim-m17n, scim-tables-additional, scim-tables-ja, scim-tables-ko, scim-tables-zh, scim-uim +Description: smart common input method platform for KDE + skim is KDE frontend for the SCIM input method platform. + It provides a GUI panel and a KConfig module. It has its + own plugin system that supports on demand loadable actions. + +Package: libskim0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: skim runtime library + This package provides the necessary runtime libraries for skim. + For more details about skim, please see the skim package. + +Package: libskim-dev +Section: libdevel +Architecture: any +Depends: libskim0 (= ${binary:Version}) +Description: skim development library + This package provides the development library for skim. + It includes header files and static libraries. --- skim-1.4.5.orig/debian/skim.manpages +++ skim-1.4.5/debian/skim.manpages @@ -0,0 +1,2 @@ +debian/skim.1 +debian/scim-panel-kde.1 --- skim-1.4.5.orig/debian/skim.1 +++ skim-1.4.5/debian/skim.1 @@ -0,0 +1,96 @@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Ip \" List item +.br +.ie \\n(.$>=3 .ne \\$3 +.el .ne 3 +.IP "\\$1" \\$2 +.. +.TH "SKIM" 1 "June 5, 2005" "" "" +.SH NAME +skim, scim-panel-kde \- smart common input method platform for KDE +.SH "SYNOPSIS" +.ad l +.hy 0 +.HP 5 +\fBskim\fR [\fIoptions\fR] [\fIoption\-arguments\fR] +.ad +.hy + +.SH "DESCRIPTION" + +.PP +\fBskim\fR is a KDE frontend for the SCIM input method platform\&. It provides a GUI panel and KConfig module\&. It has its own plugin system that supports on demand loadable actions\&. + +.SH "OPTIONS" + +.PP +The following options are provided by \fBskim\fR: + +.TP +\fB\-d\fR +Start as a daemon + +.TP +\fB\-l\fR +List all available \fBskim\fR plugins + +.TP +\fB\-c\fR \fBname\fR +name = the specified Config module + +.TP +\fB\-p\fR \fBenable plugins\fR +enable plugins = plugin 1, plugin 2, \&.\&.\&. + +.TP +\fB\-np\fR \fBdisable plugins\fR +disable plugins = plugin 1, plugin 2, \&.\&.\&. + +.TP +\fB\-no\-stay\fR +Quit if there is no connected client + +.TP +\fB\-verbose level\fR +If level > 0, enable debug information + +.TP +\fB\-V\fR +Print out the current version of \fBskim\fR + +.TP +\fB\-o file\fR +file = name of debug output file + +.TP +\fB\-f\fR +Force start even if the scim panel socket cannot be established + +.SH "SEE ALSO" + +.PP +scim (1)\&. + +.SH "AUTHOR" + +.PP +\fBskim\fR was written by liucougar (liuspider) + +.PP +This manual page was written by William J Beksi for the Debian system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation\&. + +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&. + --- skim-1.4.5.orig/debian/copyright +++ skim-1.4.5/debian/copyright @@ -0,0 +1,49 @@ +This package was debianized by William J Beksi on +Sun, 5 Jun 2005 14:17:59 +0800. + +It was downloaded from http://prdownloads.sourceforge.net/scim + +Copyright Holder: liucougar (liuspider) + +License: + +pkg.py and libscim.py may be redistributed under the terms +of the BSD license: + +Copyright (C) 2003-2005 +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. 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. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + +Everything else may be redistributed under the terms of the GNU GPL +Version 2 or later: + +Copyright (C) 2003-2005 by liuspider +liuspider@users.sourceforge.net +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +On Debian systems, the complete text of the GNU General Public License +can be found in the file '/usr/share/common-licenses/GPL'. --- skim-1.4.5.orig/debian/rules +++ skim-1.4.5/debian/rules @@ -0,0 +1,80 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# +# Modified for skim package by +# William J Beksi 2005 + +SCONS=-scons --no-cache -Q + +config.status: patch configure + dh_testdir + $(SCONS) configure prefix=$(DEB_DESTDIR)/usr + +build: build-stamp +build-stamp: config.status + $(SCONS) + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + + -$(SCONS) -c && rm -rf cache + -mkdir cache + -rm -rf scons-local-0.96.1 + -rm -f bksys/*.pyc + -rm -f po/*.gmo + -rm config.log + -rm -rf .sconf_temp + dh_clean + +patch: patch-stamp +patch-stamp: + dpatch apply-all + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +install: install-stamp +install-stamp: build-stamp + $(SCONS) install DESTDIR=$(CURDIR)/debian/tmp + install -m 644 -D \ + $(CURDIR)/debian/im-switch/skim \ + $(CURDIR)/debian/tmp/etc/X11/xinit/xinput.d/skim + #rm $(CURDIR)/debian/tmp/usr/share/autostart/skim.desktop + # Prepare files for different packages to seperate directories. + dh_install --sourcedir=debian/tmp --fail-missing + chmod 644 $(CURDIR)/debian/skim/usr/share/servicetypes/* + chmod 644 $(CURDIR)/debian/skim/usr/share/services/skimconfiguredialog/* + chmod 644 $(CURDIR)/debian/skim/usr/share/icons/crystalsvg/32x32/apps/skim.png + touch install-stamp + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs ABOUT-NLS AUTHORS NEWS README TODO + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -X usr/lib/kde3 -X usr/lib/scim-1.0/1.4.0 + dh_installdeb + dh_shlibdeps -L libskim0 -l debian/libskim0/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install + --- skim-1.4.5.orig/debian/watch +++ skim-1.4.5/debian/watch @@ -0,0 +1,10 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Sourceforge respository +http://sf.net/scim/skim-(.*)\.tar\.bz2 --- skim-1.4.5.orig/debian/compat +++ skim-1.4.5/debian/compat @@ -0,0 +1 @@ +4 --- skim-1.4.5.orig/debian/skim.prerm +++ skim-1.4.5/debian/skim.prerm @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +ua_remove () { + update-alternatives \ + --remove xinput-$1 \ + /etc/X11/xinit/xinput.d/$2 ; +} + +case "$1" in + remove|upgrade|deconfigure) + ua_remove all_ALL skim + ua_remove ja_JP skim + ua_remove ko_KR skim + ua_remove zh_CN skim + ua_remove zh_TW skim + ua_remove zh_HK skim + ua_remove zh_SG skim + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- skim-1.4.5.orig/debian/im-switch/skim +++ skim-1.4.5/debian/im-switch/skim @@ -0,0 +1,19 @@ +XIM=SCIM +XIM_PROGRAM=" " +if [ -e /usr/lib/gtk-2.0/*/immodules/im-scim-bridge.so ]; then + GTK_IM_MODULE=scim-bridge +elif [ -e /usr/lib/gtk-2.0/*/immodules/im-scim.so ]; then + GTK_IM_MODULE=scim +else + GTK_IM_MODULE=xim +fi +if [ -e /usr/lib/qt3/plugins/inputmethods/im-scim-bridge.so ] || [ -e /usr/lib/qt4/plugins/inputmethods/im-scim-bridge.so ]; then + QT_IM_MODULE=scim-bridge +elif [ -e /usr/lib/qt3/plugins/inputmethods/libqscim.so ]; then + QT_IM_MODULE=scim +else + QT_IM_MODULE=xim +fi + +DEPENDS="skim, scim-bridge-client-gtk | scim-bridge-client-qt | scim-bridge-client-qt4 | scim-gtk2-immodule | scim-qtimm" + --- skim-1.4.5.orig/debian/patches/05_fix_desktop_file.dpatch +++ skim-1.4.5/debian/patches/05_fix_desktop_file.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## kubuntu_03_fix_desktop_file.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable skim start up defaultly + +@DPATCH@ + +diff -ruNad skim~-1.4.4/src/skim.desktop skim-1.4.4/src/skim.desktop +--- skim~-1.4.4/src/skim.desktop 2006-01-30 14:45:26.000000000 +0100 ++++ skim-1.4.4/src/skim.desktop 2006-05-14 13:39:03.000000000 +0200 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=skim ++Name=Skim + Name[ko]=스킴 + Name[pa]=ਸਕਿਮ + Exec=skim +@@ -16,7 +16,8 @@ + Comment[pa]=ਇਪੁੱਟ ਢੰਗ ਪਲੇਟਫਾਰਮ + Comment[zh_CN]=输入法平台 + Comment[zh_TW]=輸入法平台 +- ++GenericName=Input method platform ++GenericName[fr]=Méthode de saisie de texte + X-DCOP-ServiceType=Unique + X-KDE-StartupNotify=false + X-KDE-autostart-condition=skimrc:General:Autostart:true --- skim-1.4.5.orig/debian/patches/00list +++ skim-1.4.5/debian/patches/00list @@ -0,0 +1,7 @@ +01_disable_rpath.dpatch +02_scons.dpatch +03_correct_includedir_in_skim-pc.dpatch +05_fix_desktop_file.dpatch +06_skim_config.dpatch +07_fix_FTBFS.dpatch +08_scons_FTBFS.dpatch --- skim-1.4.5.orig/debian/patches/03_correct_includedir_in_skim-pc.dpatch +++ skim-1.4.5/debian/patches/03_correct_includedir_in_skim-pc.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_correct_includedir_in_skim-pc.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: correct the inludedir in skim.pc + +@DPATCH@ +diff -ruNad skim-1.4.4-orig/skim.pc.in skim-1.4.4/skim.pc.in +--- skim-1.4.4-orig/skim.pc.in 2006-02-28 21:05:06.000000000 +0800 ++++ skim-1.4.4/skim.pc.in 2006-02-28 21:05:42.000000000 +0800 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=/usr/include + localedir=@datadir@/locale + datadir=@datadir@ + sysconfdir=@sysconfdir@ --- skim-1.4.5.orig/debian/patches/07_fix_FTBFS.dpatch +++ skim-1.4.5/debian/patches/07_fix_FTBFS.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_fix_FTBFS.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix to prevent FTBS from latest scons. + +@DPATCH@ +--- skim-1.4.5/bksys/generic.py~ 2008-02-22 10:25:24.000000000 +0800 ++++ skim-1.4.5/bksys/generic.py 2008-02-22 10:29:43.000000000 +0800 +@@ -287,7 +287,8 @@ + ret=self.env.Program(self.p_localtarget, self.p_localsource) + if not self.env.has_key('NOAUTOINSTALL'): + ins=self.env.bksys_install(self.instdir, ret) +- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms)) ++ if ins and self.perms: ++ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms)) + elif self.type=='staticlib' or self.type=='convenience': + ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource) + +@@ -513,7 +514,8 @@ + if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files)) + elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files)) + else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files)) +- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms)) ++ if perms and install_list: ++ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms)) + env.Alias('install', install_list) + return install_list + --- skim-1.4.5.orig/debian/patches/04_disable_autostart.dpatch +++ skim-1.4.5/debian/patches/04_disable_autostart.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## kubuntu_02_disable_autostart.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable skim start up defaultly + +@DPATCH@ + +diff -ruNad skim-1.4.4-orig/utils/scimkdeconfig.kcfg skim-1.4.4/utils/scimkdeconfig.kcfg +--- skim-1.4.4-orig/utils/scimkdeconfig.kcfg 2006-01-30 13:45:26.000000000 +0000 ++++ skim-1.4.4/utils/scimkdeconfig.kcfg 2006-03-11 07:11:37.000000000 +0000 +@@ -6,7 +6,7 @@ + + + Whether to start skim automatically when KDE starts. +- true ++ false + + + --- skim-1.4.5.orig/debian/patches/02_scons.dpatch +++ skim-1.4.5/debian/patches/02_scons.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_scons.dpatch by Mark Brown +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changing Add_define in bysys/libscim.py to append a list rather than a +## DP: string. + +@DPATCH@ +diff -ruN skim-1.4.4.orig/bksys/libscim.py skim-1.4.4/bksys/libscim.py +--- skim-1.4.4.orig/bksys/libscim.py 2006-06-04 01:41:16.000000000 -0400 ++++ skim-1.4.4/bksys/libscim.py 2006-06-04 02:24:42.000000000 -0400 +@@ -68,7 +68,7 @@ + + def Add_define(env, name): + if env.has_key(name): +- env.AppendUnique(CCFLAGS = '-D' + name + '=\\"' + env[name] + '\\"' ) ++ env.AppendUnique(CCFLAGS = ['-D' + name + '=\\"' + env[name] + '\\"'] ) + return + + # these are our options --- skim-1.4.5.orig/debian/patches/01_disable_rpath.dpatch +++ skim-1.4.5/debian/patches/01_disable_rpath.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_disable_rpath.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable rpath in Sconstruct + +@DPATCH@ + +diff -Nru skim-1.4.3.orig/SConstruct skim-1.4.3/SConstruct +--- skim-1.4.3.orig/SConstruct 2005-10-31 07:43:17.000000000 +0800 ++++ skim-1.4.3/SConstruct 2005-12-02 17:56:11.000000000 +0800 +@@ -118,7 +118,8 @@ + + env.AppendUnique(CCFLAGS = '-DNO_CONFIG_H') + +-env.KDEuse("environ rpath thread") ++#env.KDEuse("environ rpath thread") ++env.KDEuse("environ thread") + + #env.KDEuse("environ rpath lang_qt thread nohelp") + --- skim-1.4.5.orig/debian/patches/06_skim_config.dpatch +++ skim-1.4.5/debian/patches/06_skim_config.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_skim_config.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Some improvements to the skim KDE config. + +@DPATCH@ +diff -urNad skim-1.4.4~/utils/scimkdeconfig.kcfg skim-1.4.4/utils/scimkdeconfig.kcfg +--- skim-1.4.4~/utils/scimkdeconfig.kcfg 2006-01-30 14:45:26.000000000 +0100 ++++ skim-1.4.4/utils/scimkdeconfig.kcfg 2006-04-03 12:56:27.000000000 +0200 +@@ -142,7 +142,7 @@ + + + If enabled, all the applications always use the same input method. +- false ++ true + + + +@@ -157,7 +157,7 @@ + + This can speed up the key event response, especially in remote X11 enviro + nment. But skim may become unstable. +- true ++ false + + + +@@ -188,7 +188,7 @@ + + + Toggle Input Method On/Off. +- Control+space ++ Control+space,Shift+space,Zenkaku_Hankaku,Hangul + + + --- skim-1.4.5.orig/debian/patches/08_scons_FTBFS.dpatch +++ skim-1.4.5/debian/patches/08_scons_FTBFS.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_scons_FTBFS.dpatch by Michael Schutte +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix to prevent FTBS from latest scons. + +@DPATCH@ +--- a/bksys/generic.py ++++ b/bksys/generic.py +@@ -492,7 +492,7 @@ + + def string_la_file(target, source, env): + print "building '%s' from '%s'" % (target[0].name, source[0].name) +- la_file = env.Action(build_la_file, string_la_file, ['BKSYS_VNUM', 'BKSYS_DESTDIR']) ++ la_file = env.Action(build_la_file, string_la_file, 'BKSYS_VNUM', 'BKSYS_DESTDIR') + env['BUILDERS']['LaFile'] = env.Builder(action=la_file,suffix='.la',src_suffix=env['SHLIBSUFFIX']) + + ## Function for building shared libraries --- skim-1.4.5.orig/cache/generic.cache.py +++ skim-1.4.5/cache/generic.cache.py @@ -0,0 +1,4 @@ +GENCCFLAGS = ['-g', '-O2'] +GENCXXFLAGS = ['-g', '-O2', '-DNDEBUG', '-DNO_DEBUG'] +EXTRAINCLUDES = None +ISCONFIGURED = 1