Update debian from Li Daobing's repository

4 files changed, 95 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index 2239297..84da45f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,66 @@
-ibus-pinyin (1.2.99.20090929-1~ppa2) karmic; urgency=low
+ibus-pinyin (1.3.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Peng Huang <shawn.p.huang@gmail.com>  Fri, 16 Apr 2010 12:23:00 +0800
+
+ibus-pinyin (1.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- LI Daobing <lidaobing@debian.org>  Sat, 10 Apr 2010 15:32:18 +0800
+
+ibus-pinyin (1.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/source/format: 3.0.
+
+ -- LI Daobing <lidaobing@debian.org>  Sat, 03 Apr 2010 21:22:28 +0800
+
+ibus-pinyin (1.2.99.20100318-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: bump standards version to 3.8.4.
+  * debian/control: switch to ibus 1.3.
+  * debian/control: build depends on libsigc++-2.0-dev. 
+  * debian/control: fix debhelper-but-no-misc-depends.
+  * debian/rules: remove config.log 
+
+ -- LI Daobing <lidaobing@debian.org>  Sun, 21 Mar 2010 19:22:14 +0800
+
+ibus-pinyin (1.2.99.20091211-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: add build depends on intltool 
+
+ -- LI Daobing <lidaobing@debian.org>  Sat, 12 Dec 2009 22:43:01 +0800
+
+ibus-pinyin (1.2.99.20091009-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/control: rename package ibus-pinyin-db-google to
+    ibus-pinyin-db-android.
+  * debian/rules: updated. 
+
+ -- LI Daobing <lidaobing@debian.org>  Sun, 11 Oct 2009 12:58:12 +0800
+
+ibus-pinyin (1.2.99.20091007-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/control: remove package ibus-pinyin-data, add packages
+    ibus-pinyin-db-open-phrase and ibus-pinyin-db-google.
+  * debian/rules: updated.
+
+ -- LI Daobing <lidaobing@debian.org>  Thu, 08 Oct 2009 12:39:25 +0800
+
+ibus-pinyin (1.2.99.20090930-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/control: update build depends.
+
+ -- LI Daobing <lidaobing@debian.org>  Wed, 30 Sep 2009 22:44:05 +0800
+
+ibus-pinyin (1.2.99.20090929-1) unstable; urgency=low
 
   * new upstream release.
   * debian/watch: updated. 
@@ -8,7 +70,7 @@ ibus-pinyin (1.2.99.20090929-1~ppa2) karmic; urgency=low
   * debian/rules: updated. 
   * debian/README.Debian: no longer needed. 
 
- -- LI Daobing <lidaobing@debian.org>  Tue, 29 Sep 2009 23:00:34 +0800
+ -- LI Daobing <lidaobing@debian.org>  Tue, 29 Sep 2009 22:33:06 +0800
 
 ibus-pinyin (1.2.99.20090923+1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8a32e6e..32850b3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: utils
 Priority: optional
 Maintainer: LI Daobing <lidaobing@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, swig, pkg-config,
- libibus-dev (>= 1.2), libsqlite3-dev, sqlite3, uuid-dev, python-support,
- pinyin-database (>= 1.2.99-2~), pinyin-database (<< 1.2.100), lsb-release
-Standards-Version: 3.8.3
+ libibus-dev (>= 1.2.99), libsqlite3-dev (>= 3.6), sqlite3, uuid-dev,
+ python-support, intltool (>= 0.35.0), libsigc++-2.0-dev
+Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/ibus
 Vcs-Bzr: lp:~lidaobing/ibus/ibus-pinyin
 Vcs-Browser: https://code.launchpad.net/~lidaobing/ibus/ibus-pinyin
 
 Package: ibus-pinyin
 Architecture: any
-Depends: ibus-pinyin-data (=${source:Version}), ${python:Depends},
- ${shlibs:Depends}, ${misc:Depends}, ibus (>= 1.2)
+Depends: ibus-pinyin-db-open-phrase (=${source:Version}) | ibus-pinyin-db-android (=${source:Version}),
+ ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, ibus (>= 1.2.99)
 Description: pinyin engine for ibus
  ibus-pinyin is a im engine for Chinese, based on ibus.
  .
@@ -23,13 +23,10 @@ Description: pinyin engine for ibus
  for more information on pinyin input method, check
  http://en.wikipedia.org/wiki/Pinyin_method .
 
-Package: ibus-pinyin-data
+Package: ibus-pinyin-db-open-phrase
 Architecture: all
-Conflicts: ibus-pinyin (<< 1.2.99.20090929)
-Replaces: ibus-pinyin (<< 1.2.99.20090929)
-Pre-Depends: dpkg (>= 1.13.25)
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: pinyin engine for ibus (data package)
+Depends: ${misc:Depends}, pinyin-database (>= 1.2.99-3~), pinyin-database (<< 1.2.100)
+Description: pinyin engine for ibus, open-phrase database
  ibus-pinyin is a im engine for Chinese, based on ibus.
  .
  this package provide one input method:
@@ -38,5 +35,18 @@ Description: pinyin engine for ibus (data package)
  for more information on pinyin input method, check
  http://en.wikipedia.org/wiki/Pinyin_method .
  .
- This package contains the data files used by ibus-pinyin.
+ This package contains the open-phrase data files used by ibus-pinyin.
 
+Package: ibus-pinyin-db-android
+Architecture: all
+Depends: ${misc:Depends}
+Description: pinyin engine for ibus, android database
+ ibus-pinyin is a im engine for Chinese, based on ibus.
+ .
+ this package provide one input method:
+   * pinyin: pinyin input method.
+ .
+ for more information on pinyin input method, check
+ http://en.wikipedia.org/wiki/Pinyin_method .
+ .
+ This package contains the android data files used by ibus-pinyin.
diff --git a/debian/rules b/debian/rules
index 91ecf63..54e9f22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DIST=$(shell lsb_release -i -s)
-
-ifeq "$(DIST)" "Ubuntu"
-	DEB_DH_BUILDDEB_ARGS := -- -Zlzma
-else
-	DEB_DH_BUILDDEB_ARGS := -- -Zbzip2
-endif
-
 DEBIAN_VERSION = $(shell dpkg-parsechangelog | egrep '^Version: ' | sed s/"Version: "//)
 UPSTREAM_VERSION = $(shell echo $(DEBIAN_VERSION) | sed s/+.-.*//)
 
@@ -46,7 +38,6 @@ build: build-stamp
 
 build-stamp:  config.status 
 	dh_testdir
-	cp /usr/share/pinyin-database/pinyin-database-1.2.99.tar.bz2 data/
 	$(MAKE)
 	touch $@
 
@@ -57,8 +48,8 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-	rm -rf data/db
+	rm -f config.sub config.guess config.log
+	rm -f data/db/android/*.pyc
 
 	dh_clean 
 
@@ -71,8 +62,11 @@ install-stamp: build
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/ibus-pinyin install
 	rm -f $(CURDIR)/debian/ibus-pinyin/usr/share/ibus-pinyin/db/COPYING
-	mkdir -p $(CURDIR)/debian/ibus-pinyin-data/usr/share/ibus-pinyin/
-	mv $(CURDIR)/debian/ibus-pinyin/usr/share/ibus-pinyin/db $(CURDIR)/debian/ibus-pinyin-data/usr/share/ibus-pinyin/
+	mkdir -p $(CURDIR)/debian/ibus-pinyin-db-android/usr/share/ibus-pinyin/
+	mv $(CURDIR)/debian/ibus-pinyin/usr/share/ibus-pinyin/db $(CURDIR)/debian/ibus-pinyin-db-android/usr/share/ibus-pinyin/
+	rm -f $(CURDIR)/debian/ibus-pinyin-db-android/usr/share/ibus-pinyin/db/create_index.sql
+	mkdir -p $(CURDIR)/debian/ibus-pinyin-db-open-phrase/usr/share/ibus-pinyin/db
+	ln -s /usr/share/pinyin-database/main.db $(CURDIR)/debian/ibus-pinyin-db-open-phrase/usr/share/ibus-pinyin/db/open-phrase.db
 	touch $@
 
 # Build architecture-independent files here.
@@ -110,7 +104,7 @@ binary-indep: install
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
-	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
+	dh_builddeb -i
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)