Upgrading to GitLab 12.0.2.

Commit 3d5eea51 authored by Ming Hua's avatar Ming Hua Committed by Osamu Aoki

Imported Debian patch 0.5.0-4

parent 08dc78e4
scim-pinyin (0.5.0-4) unstable; urgency=low
* Rewrite debian/rules, using debian/rules from scim-tables as template.
- Use the platform detection code recommended by autotools-dev.
- Remove binary-common target and separate binary-arch and binary-indep
targets completely.
- Remove all the cruft introduced by dh_make.
* Introduce 10_missing-header dpatch, adding missing <cstring> header in a
few files and fixing FTBFS with GCC 4.3. (Closes: #441594)
* Use "dpkg-query -W" in scim-chinese's preinst script to check conffiles
instead of parsing /var/lib/dpkg/status directly.
* Put upstream homepage into the Homepage field of the source package
instead of the Description field of the binary package.
* Rename XS-Vcs-* fields to Vcs-* as they are officially supported now.
* Add "dpkg-dev (>= 1.14.6)" in build dependency, due to the above usage of
Homepage and Vcs-* fields.
* Upgrade policy version to 3.7.3.
* Change maintainer's email address.
-- Ming Hua <minghua-guest@users.alioth.debian.org> Sat, 02 Feb 2008 12:05:33 -0600
scim-pinyin (0.5.0-3) unstable; urgency=low
* Adapt to scim's $(moduledir) change: (Closes: #422739)
......
Source: scim-pinyin
Section: utils
Priority: optional
Maintainer: Ming Hua <minghua@rice.edu>
Maintainer: Ming Hua <minghua-guest@users.alioth.debian.org>
Uploaders: Osamu Aoki <osamu@debian.org>
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/
Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 4.0.0), dpatch, autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6-1)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-ime/scim-pinyin/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ime/scim-pinyin/trunk/
Homepage: http://www.scim-im.org/
Package: scim-pinyin
Architecture: any
......@@ -19,8 +20,6 @@ Description: smart pinyin IM engine for SCIM platform
This package provides smart pinyin IM engine for SCIM. It includes the
plugin modules and the data files. With this module you can use the
smart pinyin input method for Chinese.
.
Homepage: http://www.scim-im.org/
.
For details about SCIM, please see the description of package scim.
......
01gcc-4.0.dpatch
10_missing-header.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_missing-header.dpatch by Ming Hua <minghua-guest@users.alioth.debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
##
## DP: Add missing header to fix FTBFS with GCC 4.3.
@DPATCH@
diff -urNad scim-pinyin-0.5.0~/src/scim_phrase.cpp scim-pinyin-0.5.0/src/scim_phrase.cpp
--- scim-pinyin-0.5.0~/src/scim_phrase.cpp 2005-01-06 07:30:58.000000000 -0600
+++ scim-pinyin-0.5.0/src/scim_phrase.cpp 2007-09-21 20:31:30.000000000 -0500
@@ -18,6 +18,7 @@
#define Uses_STL_UTILITY
#define Uses_STL_IOMANIP
#define Uses_C_STDIO
+#define Uses_C_STRING
#define Uses_SCIM_UTILITY
#define Uses_SCIM_SERVER
#define Uses_SCIM_ICONV
diff -urNad scim-pinyin-0.5.0~/src/scim_pinyin.cpp scim-pinyin-0.5.0/src/scim_pinyin.cpp
--- scim-pinyin-0.5.0~/src/scim_pinyin.cpp 2005-01-06 07:30:58.000000000 -0600
+++ scim-pinyin-0.5.0/src/scim_pinyin.cpp 2007-09-21 20:31:30.000000000 -0500
@@ -21,6 +21,7 @@
#define Uses_STL_UTILITY
#define Uses_STL_IOMANIP
#define Uses_C_STDIO
+#define Uses_C_STRING
#define Uses_SCIM_UTILITY
#define Uses_SCIM_SERVER
#define Uses_SCIM_ICONV
diff -urNad scim-pinyin-0.5.0~/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.0/src/scim_pinyin_phrase.cpp
--- scim-pinyin-0.5.0~/src/scim_pinyin_phrase.cpp 2005-01-06 07:30:58.000000000 -0600
+++ scim-pinyin-0.5.0/src/scim_pinyin_phrase.cpp 2007-09-21 20:31:30.000000000 -0500
@@ -19,6 +19,7 @@
#define Uses_STL_UTILITY
#define Uses_STL_IOMANIP
#define Uses_C_STDIO
+#define Uses_C_STRING
#define Uses_SCIM_UTILITY
#define Uses_SCIM_SERVER
#define Uses_SCIM_ICONV
diff -urNad scim-pinyin-0.5.0~/src/scim_special_table.cpp scim-pinyin-0.5.0/src/scim_special_table.cpp
--- scim-pinyin-0.5.0~/src/scim_special_table.cpp 2005-01-06 07:31:02.000000000 -0600
+++ scim-pinyin-0.5.0/src/scim_special_table.cpp 2007-09-21 20:31:30.000000000 -0500
@@ -18,7 +18,7 @@
#define Uses_STL_MAP
#define Uses_STL_UTILITY
#define Uses_STL_IOMANIP
-#define Uscs_C_STRING
+#define Uses_C_STRING
#include <time.h>
#include <scim.h>
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
#
# Modified to make a template file for a multi-binary package with separated
# build-arch and build-indep targets by Bill Allombert 2001
# debian/rules for scim-pinyin package
# Copyright Ming Hua <minghua@rice.edu>, 2006,2007
#
# Modified for package scim-pinyin by Ming Hua 2004. Some modification
# comes from Anthony Fok.
# This file is distributed under the same license as scim-pinyin.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# uncomment this to turn on verbose mode
#export DH_VERBOSE = 1
# This has to be exported to make some magic below work.
export DH_OPTIONS
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# Setting compiling flags
CFLAGS = -W -g
CXXFLAGS = -W -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
CXXFLAGS += -O0
# set the platform for configure script, especially useful for cross-compiling
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_HOST_GNU_TYPE), $(DEB_BUILD_GNU_TYPE))
CONFFLAGS += --build=$(DEB_BUILD_GNU_TYPE)
else
CFLAGS += -O2
CXXFLAGS += -O2
CONFFLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
# for more information, see /usr/share/doc/autotools-dev/README.Debian.gz
# set compiler flags, enable warning and debug
CFLAGS += -W -g
CXXFLAGS += -W -g
# set optimization level
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O
CXXFLAGS += -O
else
CFLAGS += -O0
CXXFLAGS += -O0
endif
config.status: patch-stamp configure
dh_testdir
ln -s /usr/share/misc/config.guess config.guess
ln -s /usr/share/misc/config.sub config.sub
rm -f config.cache
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--sysconfdir=/etc \
--disable-static
build: build-stamp
build-stamp: config.status
# Add here commands to compile the package.
$(MAKE)
touch build-stamp
clean: clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
rm -f build-stamp
# only run "make distclean" if a Makefile exists
[ ! -f Makefile ] || $(MAKE) distclean
# remove existent config.{guess,sub} as we use the ones from
# autotools-dev package
rm -f config.guess config.sub
# Add here commands to clean up after the build process.
-$(MAKE) distclean
dh_clean
dh_clean
patch: patch-stamp
patch-stamp:
dh_testdir
dpatch apply-all
touch patch-stamp
# put information about applied patches in the stamp file
dpatch cat-all -nd >$@
unpatch:
dh_testdir
dpatch deapply-all
rm -rf patch-stamp debian/patched
rm -rf debian/patched
rm -f patch-stamp
install: install-stamp
install-stamp: build-stamp
config.status: patch-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# link config.{guess,sub} from autotools-dev package
ln -sf /usr/share/misc/config.guess config.guess
ln -sf /usr/share/misc/config.sub config.sub
rm -f config.cache
# run configure with all necessary definitions and options
./configure \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
$(CONFFLAGS) \
--prefix=/usr \
--disable-static
# Use the upstream makefile to install everything into
# debian/tmp
build: build-stamp
build-stamp: config.status
dh_testdir
dh_clean
$(MAKE)
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Clean up unnecessary static libraries for modules
# clean up unnecessary library files for modules
rm debian/tmp/usr/lib/scim-1.0/*/*/*.la
# Prepare files for different packages to separate directories
# distribute files to different binary packages
dh_install --sourcedir=debian/tmp --fail-missing
touch $@
touch install-stamp
binary: binary-arch binary-indep
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
binary-common:
binary-arch: build
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
# dh_perl
# dh_python
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
# Build architecture independant packages using the common target.
binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
binary-arch: build install
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
binary: binary-arch binary-indep
dh_installchangelogs -a ChangeLog
dh_installdocs -a
dh_strip -a
dh_compress -a
dh_fixperms -a
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
binary-indep: build
dh_testdir
dh_testroot
dh_installchangelogs -i ChangeLog
dh_installdocs -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
.SUFFIXES:
.PHONY: build clean clean-patched install binary-indep binary-arch binary patch unpatch
.PHONY: clean build binary binary-arch binary-indep clean-patched patch unpatch
# vim:textwidth=0:
......@@ -2,14 +2,14 @@
set -e
# Clean up old conffile
# using example from http://www.dpkg.org/ConffileHandling
# (using the example from http://wiki.debian.org/DpkgConffileHandling)
OLDCONFFILE="/etc/gconf/schemas/scim-chinese.schemas"
case "$1" in
"install" | "upgrade" )
if dpkg --compare-versions "$2" lt "0.5.0"; then
if dpkg --compare-versions "$2" lt-nl "0.5.0"; then
if [ -e "$OLDCONFFILE" ]; then
MD5SUM=`md5sum "$OLDCONFFILE" | sed -e "s/ .*//"`
OLDMD5SUM=`sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $OLDCONFFILE'{s/.* //;p}}" /var/lib/dpkg/status`
OLDMD5SUM=`dpkg-query -W -f '${Conffiles}' scim-chinese | sed -n -e "\\' $OLDCONFFILE'{s/obsolete$//;s/.* //;p}"`
if [ "$MD5SUM" = "$OLDMD5SUM" ]; then
echo -n "Removing obsolete conffile $OLDCONFFILE"
rm -f "$OLDCONFFILE"
......
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