Commit 08dc78e4 authored by Ming Hua's avatar Ming Hua Committed by Osamu Aoki

Imported Debian patch 0.5.0-3

parent fab993e8
scim-pinyin (0.5.0-3) unstable; urgency=low
* Adapt to scim's $(moduledir) change: (Closes: #422739)
- Bump build dependency to libscim-dev (>= 1.4.6-1).
- Drop 10scim-plugin-module-install-dir dpatch, no longer needed.
- Use /usr/lib/scim-1.0/*/ instead of /usr/lib/scim-1.0/1.4.0/ in
debian/rules and debian/scim-pinyin.install, so that scim-pinyin can be
binNMUed for the next SCIM module ABI change.
* Update debian/watch file to use qa.debian.org redirect URL for
sourceforge.net.
* Add XS-Vcs-Svn and XS-Vcs-Browser fields in debian/control.
* Upgrade to policy version 3.7.2.2, no actual changes needed.
-- Ming Hua <minghua@rice.edu> Sun, 13 May 2007 17:54:00 -0500
scim-pinyin (0.5.0-2) unstable; urgency=low
* Make scim-pinyin Replaces scim-chinese (<< 0.5.0) to provide smooth
......
......@@ -3,8 +3,10 @@ Section: utils
Priority: optional
Maintainer: Ming Hua <minghua@rice.edu>
Uploaders: Osamu Aoki <osamu@debian.org>
Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.0)
Standards-Version: 3.6.2
Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6-1)
Standards-Version: 3.7.2.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-ime/scim-pinyin/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ime/scim-pinyin/trunk/
Package: scim-pinyin
Architecture: any
......
01gcc-4.0.dpatch
10scim-plugin-module-install-dir.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01gcc-4.0.dpatch by <minghua@danube>
## 01gcc-4.0.dpatch by Andreas Jochens <aj@andaco.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Andreas Jochens <aj@andaco.de> to fix FTBFS on amd64
## DP: with gcc-4.0. See bug #297975 for details.
## DP: Patch to fix FTBFS on amd64 ## DP: with gcc-4.0. See bug #297975
## DP: for details.
@DPATCH@
diff -urNad scim-pinyin-0.5.0~/src/scim_pinyin_imengine_setup.cpp scim-pinyin-0.5.0/src/scim_pinyin_imengine_setup.cpp
......
#! /bin/sh -e
## 01_module-install-dir.dpatch by Ming Hua <minghua@rice.edu>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change the scim module installation directory from /usr/lib/scim-1.0/ to
## DP: /usr/lib/scim-1.0/1.2.0/. When 1.0.0 was released, upstream claimed
## DP: there is possibility that version 1.2.0 will change the native module
## DP: directory but keep the compatibility with the external modules. In my
## DP: opinion this is broken design, and I changed the directory from
## DP: /usr/lib/scim-1.0 to /usr/lib/scim/1.0.0 for Debian package. It turned
## DP: out that 1.2.0 indeed broke the ABI. I am happy with my judgement and
## DP: will continue to maintain a similar patch for all scim modules. I am
## DP: still not quite sure this design is technically correct or not, but it
## DP: seems GTK IM module uses a similar design. Oh well.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad scim-pinyin-0.5.0/src/Makefile.am /tmp/dpep.VgYQu0/scim-pinyin-0.5.0/src/Makefile.am
--- scim-pinyin-0.5.0/src/Makefile.am 2005-05-09 19:58:02.775549776 -0500
+++ /tmp/dpep.VgYQu0/scim-pinyin-0.5.0/src/Makefile.am 2005-05-09 20:02:32.243584408 -0500
@@ -51,7 +51,7 @@
libpinyin_la_CXXFLAGS = @SCIM_CFLAGS@
libpinyin_la_LDFLAGS = @SCIM_LIBS@
-moduledir = @SCIM_MODULEDIR@/IMEngine
+moduledir = @SCIM_MODULEDIR@/1.4.0/IMEngine
module_LTLIBRARIES = pinyin.la
pinyin_la_SOURCES = scim_pinyin_imengine.cpp
@@ -72,7 +72,7 @@
SETUP_MODULE = pinyin-imengine-setup.la
endif
-setupmoduledir = @SCIM_MODULEDIR@/SetupUI
+setupmoduledir = @SCIM_MODULEDIR@/1.4.0/SetupUI
setupmodule_LTLIBRARIES = $(SETUP_MODULE)
pinyin_imengine_setup_la_SOURCES = scim_pinyin_imengine_setup.cpp
diff -urNad scim-pinyin-0.5.0/src/Makefile.in /tmp/dpep.VgYQu0/scim-pinyin-0.5.0/src/Makefile.in
--- scim-pinyin-0.5.0/src/Makefile.in 2005-05-09 19:58:02.778549320 -0500
+++ /tmp/dpep.VgYQu0/scim-pinyin-0.5.0/src/Makefile.in 2005-05-09 20:03:16.510854760 -0500
@@ -315,7 +315,7 @@
libpinyin_la_CFLAGS = @SCIM_CFLAGS@
libpinyin_la_CXXFLAGS = @SCIM_CFLAGS@
libpinyin_la_LDFLAGS = @SCIM_LIBS@
-moduledir = @SCIM_MODULEDIR@/IMEngine
+moduledir = @SCIM_MODULEDIR@/1.4.0/IMEngine
module_LTLIBRARIES = pinyin.la
pinyin_la_SOURCES = scim_pinyin_imengine.cpp
pinyin_la_CFLAGS = @SCIM_CFLAGS@
@@ -329,7 +329,7 @@
pinyin_la_LIBADD = libpinyin.la
@SCIM_BUILD_SETUP_TRUE@SETUP_MODULE = pinyin-imengine-setup.la
-setupmoduledir = @SCIM_MODULEDIR@/SetupUI
+setupmoduledir = @SCIM_MODULEDIR@/1.4.0/SetupUI
setupmodule_LTLIBRARIES = $(SETUP_MODULE)
pinyin_imengine_setup_la_SOURCES = scim_pinyin_imengine_setup.cpp
pinyin_imengine_setup_la_CFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@
......@@ -92,7 +92,7 @@ install-stamp: build-stamp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Clean up unnecessary static libraries for modules
rm debian/tmp/usr/lib/scim-1.0/1.4.0/*/*.la
rm debian/tmp/usr/lib/scim-1.0/*/*/*.la
# Prepare files for different packages to separate directories
dh_install --sourcedir=debian/tmp --fail-missing
......
usr/lib/scim-1.0/1.4.0/IMEngine/pinyin.so
usr/lib/scim-1.0/1.4.0/SetupUI/pinyin-imengine-setup.so
usr/lib/scim-1.0/*/IMEngine/pinyin.so
usr/lib/scim-1.0/*/SetupUI/pinyin-imengine-setup.so
usr/share/scim/pinyin/*
usr/share/locale/*/LC_MESSAGES/scim-pinyin.mo
......
# watch control file for scim-pinyin
# see uscan(1)
# debian/watch file for scim
# written by Ming hua on 2007.05.12
# format version number
version=2
# SourceForge.net repository by upstream
http://prdownloads.sourceforge.net/scim/scim-pinyin-([\d\.]*)\.tar\.gz debian uupdate
version=3
# special URL parsed as qa.debian.org redirector for sourceforge
http://sf.net/scim/scim-pinyin-([\d\.]+)\.tar\.gz debian uupdate
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