[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

RFS: gcin (updated package)



Dear mentors,

My previous sponsor stopped his most sponsoring affair, so I am here.

I am looking for a sponsor for the new version 1.3.5-1 of my package "gcin".

It builds these binary packages:
gcin       - a GTK+ based input method platform for Chinese users
gcin-qt3-immodule - a QT input method module with gcin as backend

The upload would fix these bugs: 419366, 420504, 436914

The package can be found on mentors.debian.net:
- URL: http://mentors.debian.net/debian/pool/main/g/gcin
- Source repository: deb-src http://mentors.debian.net/debian unstable main
- dget http://mentors.debian.net/debian/pool/main/g/gcin/gcin_1.3.5-1.dsc

I would be glad if someone uploaded this package for me. :-)

Kind regards
 Wen-Yen Chuang
--- gcin-1.3.4/debian/changelog
+++ gcin-1.3.5/debian/changelog
@@ -1,3 +1,24 @@
+gcin (1.3.5-1) unstable; urgency=low
+
+  The "Hoshino Mutsuko" Release.
+
+  * New upstream release.
+  * debian/rules:
+    - auto-detect GTK+ module ABI version. Closes: #419366, #420504.
+    - enable i18n
+    - do not use -$(MAKE) so that other error messages from the clean rule will
+      still be caught.
+    - update gcin-setup.desktop categories to latest policy.
+    - add manpage link for new binary gcin-setup-tab
+  * debian/patches/10_fix-directory-structure.dpatch:
+    - refresh patches
+    - do not strip binaries in Makefile. Closes: #436914.
+    - fix README path in gcin-setup-tab
+  * debian/gcin.menu:
+    - update menu sections to latest policy.
+
+ -- Wen-Yen Chuang <caleb@calno.com>  Fri, 12 Oct 2007 23:03:21 +0800
+
 gcin (1.3.4-2) unstable; urgency=low
 
   The "Nobuta power! Cyuunyuu!" Release.
--- gcin-1.3.4/debian/gcin.menu
+++ gcin-1.3.5/debian/gcin.menu
@@ -3,7 +3,7 @@
 	title="gcin" \
 	longtitle="gcin common input method" \
 	needs="x11" \
-	section="Apps/System" \
+	section="Applications/System/Language Environment" \
 	command="/usr/bin/gcin"
 
 ?package(gcin): \
@@ -11,5 +11,5 @@
 	title="gcin-setup" \
 	longtitle="gcin-setup, for gcin input method platform" \
 	needs="x11" \
-	section="Apps/System" \
+	section="Applications/System/Language Environment" \
 	command="/usr/bin/gcin-setup"
--- gcin-1.3.4/debian/patches/10_fix-directory-structure.dpatch
+++ gcin-1.3.5/debian/patches/10_fix-directory-structure.dpatch
@@ -4,12 +4,14 @@
 ##DP Makefile: Fix icon installation path,
 ##DP           from /usr/share/icons into /usr/share/pixmaps.
 ##DP           Disable rpath.
+##DP           Do not strip binaries here. Let dh_strip do it.
 ##DP
 ##DP configure: Fix paths in configuration script, includes
 ##DP            QT3, documents, and icons.
 ##DP            Fix FTBFS on 64-bit architectures.
 ##DP
-##DP gcin-setup.c: Binary gcin-setup reads README file.
+##DP gcin-setup-tab.c and gcin-setup.c:
+##DP               These two configuration tools may read README file.
 ##DP               However, this file is written in Traditional Chinese.
 ##DP               Rename README into README.zh_TW to meet Debian style.
 ##DP
@@ -18,19 +20,19 @@
 ##DP
 
 @DPATCH@
---- gcin-1.3.4.orig/Makefile
-+++ gcin-1.3.4/Makefile
+--- gcin-1.3.5.orig/Makefile
++++ gcin-1.3.5/Makefile
 @@ -11,7 +11,8 @@
  GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
--     gcin-switch.o gcin-exec-script.o $(GCIN_SO) \
-+     gcin-switch.o gcin-exec-script.o win-sym.o intcode.o  win-int.o \
+-     gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o \
++     gcin-switch.o gcin-exec-script.o pho-play.o win-sym.o intcode.o win-int.o \
 +     phrase.o win-inmd-switch.o win-message.o pinyin.o win-pho-near.o \
-      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+      $(gcin_pho_o) $(gcin_gtab_o) gcin-common.o
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -82,7 +83,6 @@
+@@ -93,7 +94,6 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -38,7 +40,7 @@
  	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
  	rm -f core.*
  	ln -sf $@ $@.test
-@@ -167,14 +167,11 @@
+@@ -182,14 +182,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -55,15 +57,24 @@
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.3.4.orig/configure
-+++ gcin-1.3.4/configure
+@@ -204,7 +201,7 @@
+ 	else \
+ 	   install -d $(DOC_DIR_i); \
+ 	   install -m 644 README Changelog $(DOC_DIR_i); \
+-	   install -s $(PROGS) $(bindir); \
++	   install $(PROGS) $(bindir); \
+ 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ 	fi
+ 	$(MAKE) -C scripts install
+--- gcin-1.3.5.orig/configure
++++ gcin-1.3.5/configure
 @@ -1,4 +1,4 @@
 -##!/bin/bash
 +#!/bin/bash
  
  if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then
      echo "** valid options:"
-@@ -103,14 +103,11 @@
+@@ -107,14 +107,11 @@
  fi
  
  LIB='lib'
@@ -79,7 +90,7 @@
    echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
    if [ -d  $QT_IM_DIR ]; then
      QT_IM='Y'
-@@ -179,11 +176,11 @@
+@@ -184,11 +181,11 @@
  echo "GCIN_SCRIPT_DIR=\$(datadir_r)/gcin/script" >> config.mak
  echo "GCIN_SCRIPT_DIR_i=\$(datadir)/gcin/script" >> config.mak
  echo "OPTFLAGS=$OPTFLAGS" >> config.mak
@@ -96,6 +107,17 @@
  echo "GCIN_BIN_DIR=\$(bindir_r)" >> config.mak
  echo "FREEBSD=$FREEBSD" >> config.mak
  echo "QT_IM=$QT_IM" >> config.mak
+--- gcin-1.3.5.orig/gcin-setup-tab.c
++++ gcin-1.3.5/gcin-setup-tab.c
+@@ -893,7 +893,7 @@
+ 
+ static void cb_help()
+ {
+-  utf8_editor(DOC_DIR"/README");
++  utf8_editor(DOC_DIR"/README.zh_TW");
+ }
+ 
+ 
 --- gcin-1.3.4.orig/gcin-setup.c
 +++ gcin-1.3.4/gcin-setup.c
 @@ -207,7 +207,7 @@
--- gcin-1.3.4/debian/rules
+++ gcin-1.3.5/debian/rules
@@ -18,13 +18,15 @@
 	CFLAGS += -O2
 endif
 
-	GTKVER = 2.10.0
+	GTKVER = $(shell pkg-config --variable=gtk_binary_version gtk+-2.0)
 
 configure: patch
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --new_gtk_im=Y
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+	--new_gtk_im=Y \
+	--use_i18n=Y
 
 
 build: build-stamp
@@ -43,7 +45,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-	-$(MAKE) clean
+	touch .depend
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f .depend
 	dh_clean	--exclude ./IMdkit/Xi18n_sample/README.orig \
 			--exclude ./IMdkit/lib/IMConn.c~ \
@@ -77,6 +80,7 @@
 	mkdir -p debian/gcin/usr/lib/gtk-2.0/$(GTKVER)/immodules
 	mv debian/gcin/usr/lib/gtk-2.0/immodules/* debian/gcin/usr/lib/gtk-2.0/$(GTKVER)/immodules/
 	rmdir debian/gcin/usr/lib/gtk-2.0/immodules 
+	sed 's/Applications;//' menu/gcin-setup.desktop > debian/gcin/usr/share/applications/gcin-setup.desktop
 
 binary-indep: build install
 binary-arch: build install
@@ -88,6 +92,7 @@
 	LD_LIBRARY_PATH=debian/gcin/usr/lib:$(LD_LIBRARY_PATH) dh_gtkmodules
 	dh_installmenu
 	dh_link usr/share/man/man1/gcin.1.gz usr/share/man/man1/gcin-setup.1.gz \
+		usr/share/man/man1/gcin.1.gz usr/share/man/man1/gcin-setup-tab.1.gz \
 		usr/share/man/man1/gcin2tab.1.gz usr/share/man/man1/phoa2d.1.gz \
 		usr/share/man/man1/gcin2tab.1.gz usr/share/man/man1/phod2a.1.gz \
 		usr/share/man/man1/gcin2tab.1.gz usr/share/man/man1/tsd2a32.1.gz \

Reply to: