[Chinese-commits] [zh-autoconvert] 06/26: Imported Debian patch 0.3.14-2

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 06acdd2bdd42fe5161d781c5abdeee9909ff72cf
Merge: ecfc5c0 ca7e690
Author: Yu Guanghui <ygh at debian.org>
Date:   Sat Aug 7 23:20:59 2004 +0800

    Imported Debian patch 0.3.14-2

 ChangeLog                            |  5 +++++
 autogb.c                             | 11 +----------
 contrib/xchat-plugins/xchat-autob5.c |  2 --
 contrib/xchat-plugins/xchat-autogb.c |  2 --
 debian/changelog                     | 18 +++++++++++++++++
 debian/patch/gcc-3.4.patch           | 38 ++++++++++++++++++++++++++++++++++++
 debian/rules                         |  2 +-
 7 files changed, 63 insertions(+), 15 deletions(-)

diff --cc contrib/xchat-plugins/xchat-autob5.c
index 7112e7a,7112e7a..20145fd
--- a/contrib/xchat-plugins/xchat-autob5.c
+++ b/contrib/xchat-plugins/xchat-autob5.c
@@@ -88,7 -88,7 +88,6 @@@ int	autob5_chanmsg (struct server *serv
  			PrintText(sess," Big\n");
  #endif
  			break;
--		default:
  	}
  
  	XP_CALLNEXT(chanmsg_next, serv, channel, from, text, a, c);
@@@ -126,7 -126,7 +125,6 @@@ int	autob5_privmsg (struct server *serv
  			PrintText(sess," Big\n");
  #endif
  			break;
--		default:
  	}
  
  	XP_CALLNEXT(privmsg_next, serv, from, ip, text, a, c);
diff --cc contrib/xchat-plugins/xchat-autogb.c
index 75a23b9,75a23b9..cbdf7fb
--- a/contrib/xchat-plugins/xchat-autogb.c
+++ b/contrib/xchat-plugins/xchat-autogb.c
@@@ -88,7 -88,7 +88,6 @@@ int	autogb_chanmsg (struct server *serv
  			PrintText(sess," Big\n");
  #endif
  			break;
--		default:
  	}
  
  	XP_CALLNEXT(chanmsg_next, serv, channel, from, text, a, c);
@@@ -126,7 -126,7 +125,6 @@@ int	autogb_privmsg (struct server *serv
  			PrintText(sess," Big\n");
  #endif
  			break;
--		default:
  	}
  
  	XP_CALLNEXT(privmsg_next, serv, from, ip, text, a, c);
diff --cc debian/changelog
index b714423,0000000..f795217
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,158 -1,0 +1,176 @@@
++zh-autoconvert (0.3.14-2) unstable; urgency=low
++
++  * patch for gcc-3.4. (closes:Bug#264156) 
++
++ -- Yu Guanghui <ygh at debian.org>  Sat,  7 Aug 2004 23:20:59 +0800
++
++zh-autoconvert (0.3.14-1) unstable; urgency=low
++
++  * New upstream release
++
++ -- Yu Guanghui <ygh at debian.org>  Fri, 12 Dec 2003 21:15:42 +0800
++
++zh-autoconvert (0.3.13-4) unstable; urgency=low
++
++  * compiled with gcc-3.3. (closes:Bug#196469) 
++
++ -- Yu Guanghui <ygh at debian.org>  Sat,  7 Jun 2003 20:45:35 +0800
++
 +zh-autoconvert (0.3.13-3) unstable; urgency=low
 +
 +  * Compiled the static library without  -fPIC.
 +
 + -- Yu Guanghui <ygh at debian.org>  Wed, 18 Jul 2001 01:56:14 +0800
 +
 +zh-autoconvert (0.3.13-2) unstable; urgency=low
 +
 +  * Fixed zh-autoconvert Depend problem. 
 +
 + -- 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.
 +  * 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/patch/gcc-3.4.patch
index 0000000,0000000..4ec82eb
new file mode 100644
--- /dev/null
+++ b/debian/patch/gcc-3.4.patch
@@@ -1,0 -1,0 +1,38 @@@
++diff -urN ../tmp-orig/zh-autoconvert-0.3.14/contrib/xchat-plugins/xchat-autob5.c ./contrib/xchat-plugins/xchat-autob5.c
++--- ../tmp-orig/zh-autoconvert-0.3.14/contrib/xchat-plugins/xchat-autob5.c	2000-11-27 17:16:33.000000000 +0100
+++++ ./contrib/xchat-plugins/xchat-autob5.c	2004-08-07 12:54:56.551380619 +0200
++@@ -88,7 +88,6 @@
++ 			PrintText(sess," Big\n");
++ #endif
++ 			break;
++-		default:
++ 	}
++ 
++ 	XP_CALLNEXT(chanmsg_next, serv, channel, from, text, a, c);
++@@ -126,7 +125,6 @@
++ 			PrintText(sess," Big\n");
++ #endif
++ 			break;
++-		default:
++ 	}
++ 
++ 	XP_CALLNEXT(privmsg_next, serv, from, ip, text, a, c);
++diff -urN ../tmp-orig/zh-autoconvert-0.3.14/contrib/xchat-plugins/xchat-autogb.c ./contrib/xchat-plugins/xchat-autogb.c
++--- ../tmp-orig/zh-autoconvert-0.3.14/contrib/xchat-plugins/xchat-autogb.c	2000-11-27 17:16:33.000000000 +0100
+++++ ./contrib/xchat-plugins/xchat-autogb.c	2004-08-07 12:54:39.782630830 +0200
++@@ -88,7 +88,6 @@
++ 			PrintText(sess," Big\n");
++ #endif
++ 			break;
++-		default:
++ 	}
++ 
++ 	XP_CALLNEXT(chanmsg_next, serv, channel, from, text, a, c);
++@@ -126,7 +125,6 @@
++ 			PrintText(sess," Big\n");
++ #endif
++ 			break;
++-		default:
++ 	}
++ 
++ 	XP_CALLNEXT(privmsg_next, serv, from, ip, text, a, c);
diff --cc debian/rules
index 13f2f0d,0000000..a389498
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,84 -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) (>= 0.3.12-2)'
++	dh_makeshlibs -p$(libpkg) -V '$(libpkg) (>= 0.3.14-1)'
 +	dh_installdeb
 +#      dh_perl
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install

-- 
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