[Chinese-commits] [zh-autoconvert] 05/26: Imported Debian patch 0.3.13-3
Anthony Fok
foka at debian.org
Wed Nov 18 00:26:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
foka pushed a commit to branch master
in repository zh-autoconvert.
commit ecfc5c0ade5b0d633ade15338cfd8f1f7968aefd
Merge: aeea514 1b0e55d
Author: Yu Guanghui <ygh at debian.org>
Date: Wed Jul 18 01:56:14 2001 +0800
Imported Debian patch 0.3.13-3
CVS/Entries | 22 +++++------
CVS/Entries.Log | 5 +++
ChangeLog | 17 +++++++--
LICENSE | 9 +++++
Makefile | 20 +++++-----
Thanks | 4 ++
Version | 2 +-
autogb.c | 7 ++--
contrib/CVS/Entries | 4 +-
contrib/CVS/Entries.Log | 1 +
contrib/debian-chinese-gateway.pl | 77 +++++++++++++++++++++++++--------------
contrib/xchat-plugins/CVS/Entries | 2 +-
contrib/xchat-plugins/Makefile | 6 +--
debian/changelog | 63 +++++++++++++++++++++++---------
debian/control | 25 +++++++------
debian/copyright | 9 +++++
debian/dirs | 1 +
debian/override | 3 ++
debian/rules | 6 ++-
doc/API | 6 ++-
doc/CVS/Entries | 4 +-
doc/libhz.txt | 20 +++++++++-
hzconvert/CVS/Entries | 12 +++---
hzconvert/Makefile | 16 +++++---
hzconvert/b2g.c | 15 +++++++-
hzconvert/b2u.c | 15 +++++++-
hzconvert/g2u.c | 17 ++++++++-
hzconvert/hz2gb.c | 11 +++++-
hzconvert/search.c | 23 +++++++++---
hzconvert/unicode.c | 42 +++++++++++++++++++--
include/CVS/Entries | 2 +-
include/hz.h | 15 +++-----
32 files changed, 345 insertions(+), 136 deletions(-)
diff --cc Makefile
index e424a90,258afc3..bf5bb12
--- a/Makefile
+++ b/Makefile
@@@ -28,12 -30,12 +30,12 @@@ install-home
ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
chmod 755 $(HOME)/bin/autogb
install:
-- install -m 755 autogb $(DESTDIR)/usr/bin
-- install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
- cd $(DESTDIR)/usr/lib; ln -s libhz.so.0.0 libhz.so.0
- cd $(DESTDIR)/usr/lib; ln -s libhz.so.0 libhz.so
- install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
- install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
- install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
++ install -s -m 755 autogb $(DESTDIR)/usr/bin
++ install -s -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
+ cd $(DESTDIR)/usr/lib;ln -s libhz.so.0.0 libhz.so.0
+ cd $(DESTDIR)/usr/lib;ln -s libhz.so.0 libhz.so
- install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
- install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
- install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
++ install -s -m 755 lib/libhz.a $(DESTDIR)/usr/lib
++ install -s -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
++ install -s -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
install -m 644 include/*.h $(DESTDIR)/usr/include
-- ln -s autogb $(DESTDIR)/usr/bin/autob5
++ cd $(DESTDIR)/usr/bin; ln -s autogb $(DESTDIR)/usr/bin/autob5
diff --cc debian/changelog
index 5dc886b,0000000..b714423
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,131 -1,0 +1,158 @@@
- zh-autoconvert (0.3.9-1potato1.2) stable; urgency=high
++zh-autoconvert (0.3.13-3) unstable; urgency=low
+
- * [debian/rules]: Shame on me! I did not add the proper option
- to dh_shlibdeps when building zh-autoconvert, and consequently
- libhz0 is not in the dependency list. Now we use
- "dh_shlibdeps -- -Ldebian/$(libpkg)/DEBIAN/shlibs".
- Note: We _don't_ need this option for woody because dpkg-shlibdeps
- has become much smarter!
++ * Compiled the static library without -fPIC.
+
- -- Anthony Fok <foka at debian.org> Sat, 14 Apr 2001 03:25:03 -0600
++ -- Yu Guanghui <ygh at debian.org> Wed, 18 Jul 2001 01:56:14 +0800
+
- zh-autoconvert (0.3.9-1potato1.1) stable; urgency=low
++zh-autoconvert (0.3.13-2) unstable; urgency=low
+
- * New upstream version which fixes a whole bunch of important bugs.
- * Based on 0.3.9-2 in unstable, built for potato.
- * NMU requested by maintainer/upstream author Yu Guanghui.
- * Applied a few other minor fixes which YGH hasn't put in. ;-)
++ * Fixed zh-autoconvert Depend problem.
+
- -- Anthony Fok <foka at debian.org> Fri, 23 Feb 2001 02:13:14 -0700
++ -- Yu Guanghui <ygh at debian.org> Tue, 17 Jul 2001 23:28:34 +0800
++
++zh-autoconvert (0.3.13-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Yu Guanghui <ygh at debian.org> Fri, 11 May 2001 21:22:39 +0800
++
++zh-autoconvert (0.3.12-2) unstable; urgency=low
++
++ * Change libhz0(>=$${Source-Version}) to libhz0 (>=0.3.12-2)
++
++ -- Yu Guanghui <ygh at debian.org> Tue, 1 May 2001 22:48:08 +0800
++
++zh-autoconvert (0.3.12-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Yu Guanghui <ygh at debian.org> Sat, 28 Apr 2001 09:58:08 +0800
++
++zh-autoconvert (0.3.11-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Yu Guanghui <ygh at debian.org> Mon, 23 Apr 2001 22:28:34 +0800
++
++zh-autoconvert (0.3.10-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Yu Guanghui <ygh at debian.org> Tue, 17 Apr 2001 21:24:11 +0800
++
++zh-autoconvert (0.3.9-3) unstable; urgency=low
++
++ *Added lintian overide file, make lintian happy. :)
++ *Moved libhz0 from section text to libs, libhz-dev from text to devel.
++
++ -- Yu Guanghui <ygh at debian.org> Tue, 20 Feb 2001 22:55:24 +0800
+
+zh-autoconvert (0.3.9-2) unstable; urgency=low
+
- * Changed dh_makeshlibs at debian/rule, let zh-autoconvert always
- depend lastest libhz0.
- * Compiled zh-autoconvert with shared libhz library, the old verison
- incorrectly complile zh-autoconvert with static libhz library.
++ * Changed dh_makeshlibs at debian/rule, let zh-autoconvert always depend lastest libhz0.
++ * Compiled zh-autoconvert with shared libhz library, the old verison incorrectly complile zh-autoconvert with static libhz library.
+ * Add lost link (libhz.so -> libhz.so.0) to libhz-dev.
+
+ -- Yu Guanghui <ygh at debian.org> Sun, 18 Feb 2001 21:34:18 +0800
+
+zh-autoconvert (0.3.9-1) unstable; urgency=high
+
+ * New upstream release
+
+ -- Yu Guanghui <ygh at debian.org> Tue, 6 Feb 2001 23:46:51 +0800
+
+zh-autoconvert (0.3.8-3) unstable; urgency=high
+
+ * Incorrectly close #Bug81083, should close #Bug81803. (closes:Bug#81803)
+
+ -- Yu Guanghui <ygh at debian.org> Thu, 11 Jan 2001 08:42:51 +0800
+
+zh-autoconvert (0.3.8-2) unstable; urgency=high
+
+ * Add build depend libgtk1.2-dev. (closes:Bug#81789,#81083)
+
+ -- Yu Guanghui <ygh at debian.org> Thu, 11 Jan 2001 00:00:33 +0800
+
+zh-autoconvert (0.3.8-1) unstable; urgency=high
+
+ * New upstream release
+
+ -- Yu Guanghui <ygh at debian.org> Mon, 8 Jan 2001 18:09:19 +0800
+
+zh-autoconvert (0.3.7-3) testing unstable; urgency=high
+
+ * change version number from 0.3.7-2.2 to 0.3.7-3.
+
+ -- Yu Guanghui <ygh at debian.org> Sun, 7 Jan 2001 18:50:47 +0800
+
+zh-autoconvert (0.3.7-2.2) unstable; urgency=high
+
+ * Fix utf8 conversion problem.
+
+ -- Yu Guanghui <ygh at debian.org> Sat, 6 Jan 2001 22:12:22 +0800
+
+zh-autoconvert (0.3.7-2.1) unstable; urgency=low
+
+ * Fix the translation table.(from Anthony Fok <foka at debian.org>).
+
+ -- Yu Guanghui <ygh at debian.org> Sun, 24 Dec 2000 15:16:21 -0700
+
+zh-autoconvert (0.3.7-2) unstable; urgency=low
+
+ * Install xchat-autogb.so xchat-autob5.so to /usr/share/zh-autoconvert.
+
+ -- Yu Guanghui <ygh at debian.org> Thu, 30 Nov 2000 10:27:20 +0800
+
+zh-autoconvert (0.3.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Split to three packages: zh-autoconvert,libhz0,libhz-dev
+
+ -- Yu Guanghui <ygh at debian.org> Wed, 29 Nov 2000 21:34:22 +0800
+
+zh-autoconvert (0.3.6-2) unstable; urgency=low
+
+ * Add two example files.
+
+ -- Yu Guanghui <ygh at debian.org> Wed, 25 Oct 2000 22:06:37 +0800
+
+zh-autoconvert (0.3.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Install new document "gbpercent.txt", "b5percent.txt", "400gb.txt",
+ "400b5.txt", and "percent.py".
+
+ -- Yu Guanghui <ygh at debian.org> Sat, 7 Oct 2000 12:43:05 +0800
+
+zh-autoconvert (0.3.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * [hzconvert/b2g_tables.c]: Corrected a few entries in the GB to Big5
+ table, e.g. zhi1/zhi4, zheng4, yu1, and the period (dot) vs. bullet.
+ * Install new document "libhz.txt".
+
+ -- Anthony Fok <foka at debian.org> Wed, 16 Aug 2000 00:56:41 -0600
+
+zh-autoconvert (0.3.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * New example files shed.big5 and shed.gb. :-)
+
+ -- Anthony Fok <foka at debian.org> Tue, 28 Dec 1999 00:34:44 -0700
+
+zh-autoconvert (0.3.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Standards-Version: 3.1.1--Added Build-Depends in debian/rules.
+
+ -- Anthony Fok <foka at debian.org> Wed, 22 Dec 1999 22:49:10 -0700
+
+zh-autoconvert (0.3.2-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Anthony Fok <foka at debian.org> Sun, 7 Nov 1999 16:13:06 -0700
+
+Local variables:
+mode: debian-changelog
+End:
diff --cc debian/control
index d70c43a,0000000..066f400
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,37 -1,0 +1,40 @@@
+Source: zh-autoconvert
+Build-Depends: debhelper (>= 2.0.72), libgtk1.2-dev
- Section: text
+Priority: optional
+Maintainer: Yu Guanghui <ygh at debian.org>
- Standards-Version: 3.5.0
++Standards-Version: 3.1.0
+
+Package: zh-autoconvert
+Architecture: any
++Section: text
+Depends: ${shlibs:Depends}
+Description: Chinese HZ/GB/BIG5/UNI/UTF7/UTF8 encodings auto-converter
- AutoConvert is an intelligent Chinese Encoding converter. It uses
- builtin functions to judge the Chinese encoding (GB, Big5 or HZ) of
- the input file, then converts it to other Chinese encodings that you
- want. You can use autoconvert to handle incoming mail, automatically
- converting messages to your preferred Chinese encoding.
- It can also handle Unicode/UTF7/UTF8 now.
++ AutoConvert is an intelligent Chinese Encoding converter. It uses
++ builtin functions to judge the type of the input file's Chinese
++ Encoding (such as GB/Big5/HZ), then converts the input file to any
++ type of Chinese Encoding you want. You can use autoconvert to handle
++ incoming mail, automatically converting messages to the Chinese
++ Encoding you want.
++ It can alse handle Unicode/UTF7/UTF8 now.
+ .
+ Author: Yu Guanghui <ygh at debian.org>
+
+Package: libhz-dev
+Architecture: any
++Section: devel
+Depends: libhz0 (= ${Source-Version}), libc6-dev
+Description: Headers and static libraries for zh-autoconvert
+ Contains the symlinks, headers, and object files needed to compile and
+ link programs which use the zh-autoconvert library.
+ .
+ Author: Yu Guanghui <ygh at debian.org>
+
+Package: libhz0
+Architecture: any
++Section: libs
+Depends: ${shlibs:Depends}
- Description: Chinese enconding autoconvert library
- This library provides the Chinese encoding judging function,
- and the HZ/GB/Big5/Unicode/UTF7/UTF8 conversion functions.
++Description: Chinese encoding autoconvert library
++ This library provide the Chinese encoding judge function,
++ and the HZ/GB/Big5/UNI/UTF7/UTF8 convert functions.
+ .
+ Author: Yu Guanghui <ygh at debian.org>
diff --cc debian/copyright
index 003eaf9,0000000..338336f
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,34 -1,0 +1,43 @@@
+This package (zh-autoconvert) was Debianized by Anthony Fok <foka at debian.org>
+on Sat, 30 Oct 1999 08:38:03 -0600.
+It is now maintained by its upstream author, YU Guanghui <ygh at debian.org>.
+
+(Note: This file contains Chinese characters encoded in zh_CN.GB2312.)
+
+It was downloaded from
+ ftp://ftp.dlut.edu.cn/pub/PEOPLE/saka/autoconvert-0.3.9.tar.gz
+
+Upstream Author:
+ �ڹ�� YU Guanghui <ygh at debian.org>
+
+Copyright:
+
+ AutoConvert, a Chinese HZ/GB/Big5 encodings auto-converter
+ Copyright (C) 1999-2001 �ڹ�� Yu Guanghui <ygh at debian.org>
+
+ 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 any
+ later version.
+
+ This program 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. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
++ Autoconvert has ported some hztty converting functions.
++ This is the original license of hztty.
++
++ Copyright 1992, 1995 by Yongguang Zhang
++ Permission to use, copy, modify, and redistribute is hereby
++ granted. The author disclaims all warranties with regarding to
++ this software.
++
++
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
diff --cc debian/dirs
index 293cc40,0000000..0bd2f3e
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,3 -1,0 +1,4 @@@
+usr/include
+usr/lib
+usr/share/zh-autoconvert
++usr/share/lintian/overrides
diff --cc debian/override
index 0000000,0000000..599da6a
new file mode 100644
--- /dev/null
+++ b/debian/override
@@@ -1,0 -1,0 +1,3 @@@
++zh-autoconvert: binary-without-manpage autogb
++zh-autoconvert: no-shlibs-control-file usr/share/zh-autoconvert/xchat-autogb.so
++zh-autoconvert: no-shlibs-control-file usr/share/zh-autoconvert/xchat-autob5.so
diff --cc debian/rules
index f5a2278,0000000..13f2f0d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,82 -1,0 +1,84 @@@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+
+libpkg = libhz0
+
+# shared library versions, option 1
+version=0.0
+major=0
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/bin
+
+ # Add here commands to install the package into debian/tmp.
+ $(MAKE) install DESTDIR=`pwd`/debian/tmp
++ cp -f debian/override `pwd`/debian/tmp/usr/share/lintian/overrides/zh-autoconvert
+
+ touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# dh_testversion
+ dh_testdir
+ dh_testroot
+ dh_movefiles
+# dh_installdebconf
+ dh_installdocs Readme TODO doc/libhz.txt doc/400b5.txt doc/400gb.txt doc/b5percent.txt doc/gbpercent.txt doc/percent.py
+ dh_installexamples procmailrc.example shed.uni shed.utf7 shed.utf8 shed.big5 shed.gb hz.txt contrib/convmail.pl contrib/debian-chinese-gateway.pl
+ dh_installmenu
+ dh_installmanpages
+# dh_undocumented
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
- dh_makeshlibs -p$(libpkg) -V '$(libpkg) (>= $${Source-Version})'
++# dh_makeshlibs -p$(libpkg) -V '$(libpkg) (>= $${Source-Version})'
++ dh_makeshlibs -p$(libpkg) -V '$(libpkg) (>= 0.3.12-2)'
+ dh_installdeb
+# dh_perl
- dh_shlibdeps -- -Ldebian/$(libpkg)/DEBIAN/shlibs
++ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --cc hzconvert/Makefile
index 3fe49b8,3fe49b8..d8d4d19
--- a/hzconvert/Makefile
+++ b/hzconvert/Makefile
@@@ -1,22 -1,22 +1,26 @@@
CC=gcc -I../include
--CFLAGS=-O2 -Wall -g
++CFLAGS=-O2 -Wall -g -D_REENTRANT
SHARED_LIB=libhz.so
SHARED_LIB_MAJOR=$(SHARED_LIB).0
SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o
++STATIC_OBJS=b2g.static.o b2u.static.o g2u.static.o hz2gb.static.o b2g_tables.static.o b2u_tables.static.o g2u_tables.static.o io.static.o unicode.static.o judge.static.o judge3.static.o gbpercent.static.o b5percent.static.o search.static.o
--%.o: %.c
++%.o:%.c
$(CC) -fPIC $(CFLAGS) -c $<
--all: libhzconvert
++%.static.o:%.c
++ $(CC) $(CFLAGS) -c $< -o $*.static.o
--libhzconvert: $(OBJS)
-- ar rs ../lib/libhz.a $(OBJS)
++all: share-lib static-lib
++
++share-lib: $(OBJS)
gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS) -ldl
rm -f ../lib/$(SHARED_LIB_MAJOR)
rm -f ../lib/$(SHARED_LIB)
cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)
cd ../lib;ln -s $(SHARED_LIB_MAJOR) $(SHARED_LIB)
--
++static-lib: $(STATIC_OBJS)
++ ar rs ../lib/libhz.a $(STATIC_OBJS)
clean:
rm -f *.o *~ ../lib/lib*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/zh-autoconvert.git
More information about the Chinese-commits
mailing list