Merge ~logan/ubuntu/+source/scim-chewing:merge into ~usd-import-team/ubuntu/+source/scim-chewing:debian/sid

Proposed by Logan Rosen on 2017-07-18
Status: Needs review
Proposed branch: ~logan/ubuntu/+source/scim-chewing:merge
Merge into: ~usd-import-team/ubuntu/+source/scim-chewing:debian/sid
Diff against target: 470 lines (+318/-2)
6 files modified
debian/changelog (+272/-0)
debian/control (+4/-1)
debian/im-switch/scim-chewing (+18/-0)
debian/rules (+8/-1)
debian/scim-chewing.postinst (+9/-0)
debian/scim-chewing.prerm (+7/-0)
Reviewer Review Type Date Requested Status
Ubuntu Server Dev import team 2017-07-18 Pending
Review via email: mp+327575@code.launchpad.net
To post a comment you must log in.
Scott Moser (smoser) wrote :

Hi,
It looks like this is just a import (result of running 'git ubuntu import').
If thats the case, then what we want is to add this package to
 https://git.launchpad.net/usd-importer/tree/gitubuntu/import-cron-packages.txt
so that it will continue to happen.

And I can just run 'scim-chewing' to manually update it this time.

Does that sound right?

Scott Moser (smoser) wrote :

Or were you just wanting a review of your merge before uploading to Ubuntu ?

Logan Rosen (logan) wrote :

Hey Scott,

Maybe I'm misunderstanding the merge process, as documented on this wiki page: https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow#Detailed_workflow

I deconstructed the delta and then performed a merge of the latest version from Debian. And now I'm requesting a merge of my changes back into the Git repo.

If I just upload my merge, won't I lose the work I did on deconstructing the delta?

Thanks,
Logan

Robie Basak (racb) wrote :

Hi Logan,

> If I just upload my merge, won't I lose the work I did on deconstructing the delta?

We're calling this idea "preserving rich history". The importer is designed to be able to do it, but there are a bunch of manual steps and race conditions in between us and full integration to Launchpad for this right now.

Temporarily, what needs to happen is that a member of ~usd-import-team must push an "upload tag" to the importer repository before the importer's next run picks up your upload into Launchpad. This allows the importer to "see" your rich history and incorporate it. For example, we could push the upload tag before you dput. If the tag is pushed later, then it'll still be available from the repository, but won't be integrated into the official commit graph until we re-run the importer (we're planning to re-run, mutating all commits, at least once before we make everything "final").

Does that make sense?

You can create the upload tag using "git ubuntu tag --upload", push it somewhere, and then request from somebody in ~usd-import-team that we push the tag before you upload that commit. We don't have a formal process for requesting this right now. IRC or an MP like this one is fine - but please make it clear that you'd like an upload tag pushed so we know exactly what you're requesting, since these MPs are also being used by non-uploaders to request sponsorship and for peer review between uploaders within the Canonical server team.

If your upload is subsequently rejected (say because there's an error in debian/changelog), then ~usd-import-team has to manually delete the tag to redo it, until we fix the integration.

If the tip of your merge branch is definitely identical to what to will dput, then I can happily create and push the tag for you. Let me know.

Hope that helps!

Unmerged commits

1283173... by Logan Rosen on 2017-07-18

update-maintainer

c882a19... by Logan Rosen on 2017-07-18

reconstruct-changelog

4537ad3... by Logan Rosen on 2017-07-18

merge-changelogs

19d10ee... by Logan Rosen on 2017-07-18

debian/im-switch/scim-chewing: Provide an im-switch file.

75ec934... by Logan Rosen on 2017-07-18

debian/scim-chewing.prerm: Remove scim-chewing as an alternative input method for zh_TW.

907d77a... by Logan Rosen on 2017-07-18

debian/scim-chewing.postinst: Add scim-chewing as an alternative input method for zh_TW.

42630b9... by Logan Rosen on 2017-07-18

[Dropped] debian/patches/30_autotools_changes.patch: Fix up po/Makefile.in.in to use some judicious touch rules to avoid an infinite loop on the build daemons.

523092d... by Logan Rosen on 2017-07-18

debian/rules: Install the file for im-switch handling.

b9e26b7... by Logan Rosen on 2017-07-18

debian/rules: Add -f to the rm command for the *.la files.

f346863... by Logan Rosen on 2017-07-18

debian/rules: Configure with sysconfdir=/etc, disable-static, and disable-rpath.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index cb10103..b290c44 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,25 @@
6+scim-chewing (0.5.1-2ubuntu1) artful; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - debian/control:
10+ + Build-depend on scim-gtk-immodule.
11+ + Recommend im-switch.
12+ - debian/rules:
13+ + Configure with sysconfdir=/etc, disable-static, and disable-rpath.
14+ + Add -f to the rm command for the *.la files.
15+ + Install the file for im-switch handling.
16+ - debian/scim-chewing.postinst: Add scim-chewing as an alternative input
17+ method for zh_TW.
18+ - debian/scim-chewing.prerm: Remove scim-chewing as an alternative input
19+ method for zh_TW.
20+ - debian/im-switch/scim-chewing: Provide an im-switch file.
21+ * Dropped changes:
22+ - debian/patches/30_autotools_changes.patch: Fix up po/Makefile.in.in to
23+ use some judicious touch rules to avoid an infinite loop on the build
24+ daemons.
25+
26+ -- Logan Rosen <logan@ubuntu.com> Mon, 17 Jul 2017 20:10:57 -0700
27+
28 scim-chewing (0.5.1-2) unstable; urgency=medium
29
30 * Use automake instead of automake1.11 (Closes: #865201).
31@@ -38,6 +60,27 @@ scim-chewing (0.5.0-1) unstable; urgency=medium
32
33 -- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Wed, 11 May 2016 19:32:37 +0800
34
35+scim-chewing (0.3.5-2ubuntu1) yakkety; urgency=medium
36+
37+ * Merge from Debian unstable. Remaining changes:
38+ - debian/control:
39+ + Build-depend on scim-gtk-immodule.
40+ + Recommend im-switch.
41+ - debian/rules:
42+ + Configure with sysconfdir=/etc, disable-static, and disable-rpath.
43+ + Add -f to the rm commands for the *.a and *.la files.
44+ + Install the file for im-switch handling.
45+ - debian/30_autotools_changes.patch:
46+ + Fix up po/Makefile.in.in to use some judicious touch rules to avoid
47+ an infinite loop on the build daemons.
48+ + Make sure LIBTOOL_EXPORT_OPTIONS is exported.
49+ - debian/scim-chewing.postinst: Add scim-chewing as an alternative input
50+ method for zh_TW.
51+ - debian/scim-chewing.prerm: Remove scim-chewing as an alternative input
52+ method for zh_TW.
53+
54+ -- Logan Rosen <logan@ubuntu.com> Sat, 07 May 2016 03:20:14 -0400
55+
56 scim-chewing (0.3.5-2) unstable; urgency=medium
57
58 * Update maintainer email.
59@@ -47,6 +90,29 @@ scim-chewing (0.3.5-2) unstable; urgency=medium
60
61 -- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Mon, 21 Dec 2015 12:20:49 +0800
62
63+scim-chewing (0.3.5-1ubuntu1) wily; urgency=medium
64+
65+ * Merge from Debian unstable. Remaining changes:
66+ - debian/control:
67+ + Build-depend on scim-gtk-immodule.
68+ + Recommend im-switch.
69+ - debian/rules:
70+ + Configure with sysconfdir=/etc, disable-static, and disable-rpath.
71+ + Add -f to the rm commands for the *.a and *.la files.
72+ + Install the file for im-switch handling.
73+ - debian/30_autotools_changes.patch:
74+ + Fix up po/Makefile.in.in to use some judicious touch rules to avoid
75+ an infinite loop on the build daemons.
76+ + Make sure LIBTOOL_EXPORT_OPTIONS is exported.
77+ - debian/scim-chewing.postinst: Add scim-chewing as an alternative input
78+ method for zh_TW.
79+ - debian/scim-chewing.prerm: Remove scim-chewing as an alternative input
80+ method for zh_TW.
81+ * Refresh patch.
82+ * Remove autotools-dev usage, as we now use dh-autoreconf.
83+
84+ -- Logan Rosen <logan@ubuntu.com> Sun, 16 Aug 2015 22:46:32 -0700
85+
86 scim-chewing (0.3.5-1) unstable; urgency=medium
87
88 [ ChangZhuo Chen (陳昌倬) ]
89@@ -67,6 +133,28 @@ scim-chewing (0.3.5-1) unstable; urgency=medium
90
91 -- Andrew Lee (李健秋) <ajqlee@debian.org> Thu, 13 Aug 2015 00:00:54 +0800
92
93+scim-chewing (0.3.4-4.1ubuntu1) vivid; urgency=medium
94+
95+ * Merge from Debian unstable. Remaining changes:
96+ - debian/control:
97+ + Build-depend on scim-gtk-immodule and autotools-dev.
98+ + Recommend im-switch.
99+ - debian/rules:
100+ + Build with dh_autotools-dev.
101+ + Configure with sysconfdir=/etc, disable-static, and disable-rpath.
102+ + Add -f to the rm commands for the *.a and *.la files.
103+ + Install the file for im-switch handling.
104+ - debian/30_autotools_changes.patch:
105+ + Fix up po/Makefile.in.in to use some judicious touch rules to avoid
106+ an infinite loop on the build daemons.
107+ + Make sure LIBTOOL_EXPORT_OPTIONS is exported.
108+ - debian/scim-chewing.postinst: Add scim-chewing as an alternative input
109+ method for zh_TW.
110+ - debian/scim-chewing.prerm: Remove scim-chewing as an alternative input
111+ method for zh_TW.
112+
113+ -- Logan Rosen <logan@ubuntu.com> Sat, 13 Dec 2014 03:04:24 -0500
114+
115 scim-chewing (0.3.4-4.1) unstable; urgency=low
116
117 * Non-maintainer upload.
118@@ -78,6 +166,38 @@ scim-chewing (0.3.4-4.1) unstable; urgency=low
119
120 -- gregor herrmann <gregoa@debian.org> Sun, 27 Oct 2013 18:22:36 +0100
121
122+scim-chewing (0.3.4-4ubuntu4) utopic; urgency=medium
123+
124+ * Use autotools-dev to update config.{sub,guess} for new arches.
125+
126+ -- Logan Rosen <logan@ubuntu.com> Sun, 28 Sep 2014 13:46:05 -0400
127+
128+scim-chewing (0.3.4-4ubuntu3) saucy; urgency=low
129+
130+ * Fix checking of higher version of libchewing (LP: #1220224).
131+
132+ -- Aron Xu <happyaron@ubuntu.com> Tue, 08 Oct 2013 21:50:24 +0800
133+
134+scim-chewing (0.3.4-4ubuntu2) quantal; urgency=low
135+
136+ * Really fix the build dependency on scim-gtk-immodele.
137+
138+ -- Matthias Klose <doko@ubuntu.com> Tue, 11 Sep 2012 22:29:33 +0200
139+
140+scim-chewing (0.3.4-4ubuntu1) quantal; urgency=low
141+
142+ * Merge with Debian; remaining changes:
143+ - add a build-depend on scim-gtk-immodule.
144+ - build with disable-static, disable-rpath
145+ - debian/30_autotools_changes.patch:
146+ + Fix up po/Makefile.in.in to use some judicious touch rules to avoid
147+ an infinite loop on the build daemons.
148+ + make sure LIBTOOL_EXPORT_OPTIONS is exported.
149+ - add scim-chewing as alternative input method for zh_TW in postinst
150+ - provide im-switch file and add a dep on im-switch.
151+
152+ -- Matthias Klose <doko@ubuntu.com> Tue, 11 Sep 2012 21:56:06 +0200
153+
154 scim-chewing (0.3.4-4) unstable; urgency=low
155
156 * Added multi-arch support and update path in rules file.
157@@ -119,6 +239,26 @@ scim-chewing (0.3.4-1) unstable; urgency=low
158
159 -- Andrew Lee (李健秋) <ajqlee@debian.org> Mon, 03 Oct 2011 14:00:34 +0800
160
161+scim-chewing (0.3.3-2ubuntu2) precise; urgency=low
162+
163+ * Fix FTFBS by requesting chewing 0.3.3 from pkg-config - LP: #935435
164+
165+ -- Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Mon, 05 Mar 2012 17:24:46 +0100
166+
167+scim-chewing (0.3.3-2ubuntu1) natty; urgency=low
168+
169+ * Merge from Debian Unstable, remaining changes:
170+ - add a build-depend on scim-gtk2-immodule.
171+ - build with disable-static, disable-rpath
172+ - debian/30_autotools_changes.patch:
173+ + Fix up po/Makefile.in.in to use some judicious touch rules to avoid
174+ an infinite loop on the build daemons.
175+ + make sure LIBTOOL_EXPORT_OPTIONS is exported.
176+ - add scim-chewing as alternative input method for zh_TW in postinst
177+ - provide im-switch file and add a dep on im-switch.
178+
179+ -- Bilal Akhtar <bilalakhtar@ubuntu.com> Thu, 11 Nov 2010 09:20:24 +0300
180+
181 scim-chewing (0.3.3-2) unstable; urgency=low
182
183 * Build-depends on libltdl-dev (Closes:#590417)
184@@ -131,6 +271,18 @@ scim-chewing (0.3.3-2) unstable; urgency=low
185
186 -- Andrew Lee (李健秋) <ajqlee@debian.org> Tue, 27 Jul 2010 14:14:53 -0400
187
188+scim-chewing (0.3.3-1ubuntu1) jaunty; urgency=low
189+
190+ * Merge from debian unstable, remaining changes: LP: #308432
191+ - add a build-depend on scim-gtk2-immodule
192+ - build with disable-static, disable-rpath
193+ - Fix up po/Makefile.in.in to use some judicious touch rules to avoid
194+ an infinite loop on the build daemons (thanks to Ming Hua for the help)
195+ - add scim-chewing as alternative input method for zh_TW in postinst
196+ - provide im-switch file
197+
198+ -- Bhavani Shankar <right2bhavi@gmail.com> Tue, 16 Dec 2008 10:17:29 +0530
199+
200 scim-chewing (0.3.3-1) unstable; urgency=low
201
202 * New upstream release
203@@ -141,6 +293,18 @@ scim-chewing (0.3.3-1) unstable; urgency=low
204
205 -- Andrew Lee <andrew@linux.org.tw> Fri, 05 Dec 2008 21:15:14 +0800
206
207+scim-chewing (0.3.2-1ubuntu1) jaunty; urgency=low
208+
209+ * Merge with Debian; remaining changes:
210+ - add a build-depend on scim-gtk2-immodule
211+ - build with disable-static, disable-rpath
212+ - Fix up po/Makefile.in.in to use some judicious touch rules to avoid
213+ an infinite loop on the build daemons (thanks to Ming Hua for the help)
214+ - add scim-chewing as alternative input method for zh_TW in postinst
215+ - provide im-switch file
216+
217+ -- Matthias Klose <doko@ubuntu.com> Thu, 27 Nov 2008 15:32:08 +0100
218+
219 scim-chewing (0.3.2-1) unstable; urgency=low
220
221 * New upstream release
222@@ -159,6 +323,19 @@ scim-chewing (0.3.2-1) unstable; urgency=low
223
224 -- Andrew Lee <andrew@linux.org.tw> Wed, 12 Nov 2008 15:42:57 +0800
225
226+scim-chewing (0.3.1-3ubuntu1) intrepid; urgency=low
227+
228+ * Merge from debian unstable, remaining changes:
229+ - add a build-depend on scim-gtk2-immodule
230+ - maintainer set to ubuntu
231+ - build with disable-static, disable-rpath
232+ - Fix up po/Makefile.in.in to use some judicious touch rules to avoid
233+ an infinite loop on the build daemons (thanks to Ming Hua for the help)
234+ - add scim-chewing as alternative input method for zh_TW in postinst
235+ - provide im-switch file
236+
237+ -- Arne Goetje <arne@ubuntu.com> Thu, 24 Jun 2008 16:00:00 +0800
238+
239 scim-chewing (0.3.1-3) unstable; urgency=low
240
241 * Update README.Debian(Closes:#427629) for Dan Jacobson
242@@ -170,6 +347,31 @@ scim-chewing (0.3.1-3) unstable; urgency=low
243
244 -- Andrew Lee <andrew@linux.org.tw> Wed, 05 Mar 2008 21:41:07 +0800
245
246+scim-chewing (0.3.1-2ubuntu3) hardy; urgency=low
247+
248+ * Rebuild with recent g++ compiler version.
249+
250+ -- Matthias Klose <doko@ubuntu.com> Thu, 03 Apr 2008 11:25:04 +0000
251+
252+scim-chewing (0.3.1-2ubuntu2) gutsy; urgency=low
253+
254+ * Fix build failures with g++-4.3.
255+
256+ -- Matthias Klose <doko@ubuntu.com> Mon, 10 Sep 2007 14:05:05 +0000
257+
258+scim-chewing (0.3.1-2ubuntu1) gutsy; urgency=low
259+
260+ * Merge from debian unstable, remaining changes:
261+ - add a build-depend on scim-gtk2-immodule
262+ - maintainer set to ubuntu
263+ - build with disable-static, disable-rpath
264+ - Fix up po/Makefile.in.in to use some judicious touch rules to avoid
265+ an infinite loop on the build daemons (thanks to Ming Hua for the help)
266+ - add scim-chewing as alternative input method for zh_TW in postinst
267+ - provide im-switch file
268+
269+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 May 2007 13:09:32 +0200
270+
271 scim-chewing (0.3.1-2) unstable; urgency=low
272
273 * Dropped ttf-arphic-ukai from Recommends cause it is not suitable font
274@@ -183,6 +385,37 @@ scim-chewing (0.3.1-2) unstable; urgency=low
275
276 -- Andrew Lee <andrew@linux.org.tw> Thu, 23 Aug 2007 22:11:24 +0800
277
278+scim-chewing (0.3.1-1ubuntu4) edgy; urgency=low
279+
280+ * Fix FTBFS: add a build-depend on scim-gtk2-immodule, due to the way
281+ we split the libraries up for the sake of GTK-hating derviatives.
282+
283+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 18 Oct 2006 18:36:07 +1000
284+
285+scim-chewing (0.3.1-1ubuntu3) edgy; urgency=low
286+
287+ * Correct the scim-bridge's dir in
288+ debian/im-switch/scim-pinyin, due to the
289+ change in gtk2
290+
291+ -- Hou ZhengPeng <zhengpeng.hou@gmail.com> Wed, 16 Aug 2006 08:31:01 +0800
292+
293+scim-chewing (0.3.1-1ubuntu2) edgy; urgency=low
294+
295+ * Improve the conffile of im-switch in
296+ debian/im-switch/scim-chewing.
297+ * Use scim-chewing in scim-chewing.postinst and
298+ scim-chewing.prerm for zh_TW locale users,
299+ instead of scim-pinyin.
300+
301+ -- Hou ZhengPeng <zhengpeng.hou@gmail.com> Tue, 11 Jul 2006 13:47:22 +0800
302+
303+scim-chewing (0.3.1-1ubuntu1) edgy; urgency=low
304+
305+ * Merge from debian unstable.
306+
307+ -- Scott James Remnant <scott@ubuntu.com> Mon, 10 Jul 2006 16:33:31 +0100
308+
309 scim-chewing (0.3.1-1) unstable; urgency=low
310
311 * New upstream release
312@@ -206,6 +439,44 @@ scim-chewing (0.3.0-1) unstable; urgency=low
313
314 -- Andrew Lee <andrew@linux.org.tw> Tue, 30 May 2006 17:33:52 +0800
315
316+scim-chewing (0.2.1-2ubuntu4) dapper; urgency=low
317+
318+ * check for skim in the im-switch file and sets XIM_PROGRAM=skim if
319+ it is installed (fixes the problem that skim is not started currently
320+ automatically in kubuntu)
321+
322+ -- Hou ZhengPeng <zhengpeng.hou@gmail.com> Wed, 12 Apr 2006 15:29:44 +0800
323+
324+scim-chewing (0.2.1-2ubuntu3) dapper; urgency=low
325+
326+ * Fix up po/Makefile.in.in to use some judicious touch rules to avoid
327+ an infinite loop on the build daemons (thanks to Ming Hua for the help)
328+ * Make scripts/remove-autotool.sh stop cleaning the above file on clean.
329+ * Make both these changes directly to the diff.gz since, otherwise, the
330+ clean target in debian/rules would delete the file before dpatch ran.
331+
332+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 16 Mar 2006 15:57:55 +1100
333+
334+scim-chewing (0.2.1-2ubuntu2) dapper; urgency=low
335+
336+ * Add im-switch configure file in debian/im-switch for postinst.
337+ * Add im-switch to Recommends.
338+ * Use ttf-arphic-uming and ttf-arphic-ukai as recommend chinese fonts .
339+
340+ -- Abel Cheung <abelcheung@gmail.com> Wed, 15 Mar 2006 17:42:39 +0000
341+
342+scim-chewing (0.2.1-2ubuntu1) dapper; urgency=low
343+
344+ * Add patch for correct the configure.ac for LIBTOOL _EXPORT_OPTIONS
345+ * Add skim as an option instead of scim in the depends
346+
347+ -- Hou ZhengPeng <zhengpeng.hou@gmail.com> Tue, 28 Feb 2006 15:53:23 +0800
348+
349+scim-chewing (0.2.1-2build1) dapper; urgency=low
350+
351+ * Rebuild due to the libstdc++ allocator ABI transition.
352+
353+ -- Ming Hua <minghua@rice.edu> Sat, 17 Dec 2005 17:58:32 -0600
354
355 scim-chewing (0.2.1-2) unstable; urgency=low
356
357@@ -317,3 +588,4 @@ scim-chewing (0.0.cvs20041119-1) unstable; urgency=low
358
359 -- Andrew Lee <andrew@linux.org.tw> Sat, 20 Nov 2004 20:43:53 +0800
360
361+
362diff --git a/debian/control b/debian/control
363index 51f59f6..19a8c3c 100644
364--- a/debian/control
365+++ b/debian/control
366@@ -1,7 +1,8 @@
367 Source: scim-chewing
368 Priority: optional
369 Section: utils
370-Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org>
371+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
372+XSBC-Original-Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org>
373 Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>,
374 ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
375 Build-Depends: debhelper (>= 10),
376@@ -15,6 +16,7 @@ Build-Depends: debhelper (>= 10),
377 libltdl-dev,
378 libscim-dev (>= 1.4.6),
379 libtool,
380+ scim-gtk-immodule
381 Build-Conflicts: autoconf2.13, automake1.4
382 Standards-Version: 4.0.0
383 Homepage: http://chewing.im
384@@ -27,6 +29,7 @@ Multi-Arch: same
385 Depends: ${misc:Depends},
386 ${shlibs:Depends},
387 scim
388+Recommends: im-switch
389 Description: Chewing IM engine module for SCIM
390 SCIM (Smart Common Input Method) is an input method (IM) platform.
391 .
392diff --git a/debian/im-switch/scim-chewing b/debian/im-switch/scim-chewing
393new file mode 100644
394index 0000000..a27c95c
395--- /dev/null
396+++ b/debian/im-switch/scim-chewing
397@@ -0,0 +1,18 @@
398+XIM=SCIM
399+if [ -e /usr/bin/skim ]; then
400+ XIM_PROGRAM=/usr/bin/skim
401+else
402+ XIM_PROGRAM=/usr/bin/scim
403+fi
404+XIM_ARGS="-d"
405+if [ -e /usr/lib/gtk-2.0/2.10.0/immodules/im-scim-bridge.so ]; then
406+ GTK_IM_MODULE=scim-bridge
407+else
408+ GTK_IM_MODULE=xim
409+fi
410+if [ -e /usr/lib/qt3/plugins/inputmethods/libqscim.so ]; then
411+ QT_IM_MODULE=scim
412+else
413+ QT_IM_MODULE=xim
414+fi
415+DEPENDS="scim | skim"
416diff --git a/debian/rules b/debian/rules
417index cad3423..866a8ec 100755
418--- a/debian/rules
419+++ b/debian/rules
420@@ -7,6 +7,9 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
421 %:
422 dh $@ --with autoreconf
423
424+override_dh_auto_configure:
425+ dh_auto_configure -- --sysconfdir=/etc --disable-static --disable-rpath
426+
427 override_dh_autoreconf:
428 dh_autoreconf $(CURDIR)/autogen.sh
429
430@@ -15,7 +18,11 @@ override_dh_auto_configure:
431
432 override_dh_auto_install:
433 dh_auto_install
434- rm debian/scim-chewing/usr/lib/*/scim-1.0/*/*/*.la
435+ rm -f debian/scim-chewing/usr/lib/*/scim-1.0/*/*/*.la
436+
437+ # install file for im-switch handling
438+ install -d $(CURDIR)/debian/scim-chewing/etc/X11/xinit/xinput.d/
439+ install -m 644 debian/im-switch/scim-chewing debian/scim-chewing/etc/X11/xinit/xinput.d/
440
441 override_dh_auto_test:
442 # Disabled: Incompelete in po/
443diff --git a/debian/scim-chewing.postinst b/debian/scim-chewing.postinst
444new file mode 100644
445index 0000000..13cf8a9
446--- /dev/null
447+++ b/debian/scim-chewing.postinst
448@@ -0,0 +1,9 @@
449+#!/bin/sh
450+set -e
451+
452+update-alternatives \
453+ --install /etc/X11/xinit/xinput.d/zh_TW xinput-zh_TW \
454+ /etc/X11/xinit/xinput.d/scim-chewing 50
455+
456+#DEBHELPER#
457+
458diff --git a/debian/scim-chewing.prerm b/debian/scim-chewing.prerm
459new file mode 100644
460index 0000000..e430e48
461--- /dev/null
462+++ b/debian/scim-chewing.prerm
463@@ -0,0 +1,7 @@
464+#!/bin/sh
465+set -e
466+
467+update-alternatives --remove xinput-zh_TW /etc/X11/xinit/xinput.d/scim-chewing
468+
469+#DEBHELPER#
470+

Subscribers

People subscribed via source and target branches