Package: ibus-anthy Version: 1.2.6-1 Severity: normal Tags: patch X-Debbugs-CC: Barry Warsaw <[email protected]>
See attached patch against the 1.2.6-1 package. This does followings: For "3.0 (quilt)" format source, you do not need to specify "--with quilt" for dh. This is fixed. This does new python2 packaging scheme but I could not get to make python2.7 links and build was failing. So I used "dh_python2 --no-guessing-versions" as work around. It is always good idea to use new files provided by autotools-dev than one in the package. Thus --with autotools-dev was used. *.la files are better not to be included. Thus I removed them from package. There may be more elegant way to do this. DEP-3 for patch tagging is a good thing and implimented. Autogenerated setup/anthyprefs.py does not need to be diffed for package (for multiple build from the source. Clean target removes this.) Also, for git archive, quilt patches are better not to be applied after debuild clean. If you apply this to your git repo, generated package will not have debian/source/local-options , making it to behave normally as patches appled after clean. This is for easier build. We can always do "git reset --hard; git clean -f" to get clean source so this is just a non-critical cosmetic thing. -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (500, 'testing'), (50, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages ibus-anthy depends on: ii anthy 9100h-9 input method for Japanese - backen ii ibus 1.3.9-2 New input method framework using d ii libanthy0 9100h-9 input method for Japanese - runtim ii libc6 2.13-10 Embedded GNU C Library: Shared lib ii libpython2.6 2.6.7-1 Shared Python runtime library (ver ii python 2.6.6-14 interactive high-level object-orie ii python2.6 2.6.7-1 An interactive high-level object-o ibus-anthy recommends no packages. ibus-anthy suggests no packages. -- no debconf information
diff -Nru ibus-anthy-1.2.6-orig/debian/changelog ibus-anthy-1.2.6/debian/changelog --- ibus-anthy-1.2.6-orig/debian/changelog 2011-05-29 14:19:42.000000000 +0900 +++ ibus-anthy-1.2.6/debian/changelog 2011-07-24 22:06:47.000000000 +0900 @@ -1,3 +1,11 @@ +ibus-anthy (1.2.6-2) unstable; urgency=low + + * Use "dh $@ --with python2 --with autotools-dev" + * Remove *.la files. + * DEP-3 patch. + + -- Osamu Aoki <[email protected]> Sun, 24 Jul 2011 19:40:28 +0900 + ibus-anthy (1.2.6-1) unstable; urgency=low * New upstream release diff -Nru ibus-anthy-1.2.6-orig/debian/control ibus-anthy-1.2.6/debian/control --- ibus-anthy-1.2.6-orig/debian/control 2011-05-29 14:05:25.000000000 +0900 +++ ibus-anthy-1.2.6/debian/control 2011-07-24 21:06:37.000000000 +0900 @@ -4,11 +4,11 @@ Maintainer: IME Packaging Team <[email protected]> Uploaders: LI Daobing <[email protected]>, Asias He <[email protected]> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7), autotools-dev, swig, python-dev (>= 2.5), - pkg-config, libanthy-dev, python-support, intltool, quilt (>= 0.46-7~) +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, swig, python-dev (>= 2.6.6-3~), + pkg-config, libanthy-dev, intltool Standards-Version: 3.9.2 Homepage: http://code.google.com/p/ibus -XS-Python-Version: >= 2.5 +X-Python-Version: >= 2.5 Vcs-Git: git://git.debian.org/git/pkg-ime/ibus-anthy.git Vcs-Browser: http://git.debian.org/?p=pkg-ime/ibus-anthy.git @@ -16,7 +16,6 @@ Package: ibus-anthy Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, ibus (>= 1.2), anthy -XB-Python-Version: ${python:Versions} Description: anthy engine for IBus IBus is an Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. diff -Nru ibus-anthy-1.2.6-orig/debian/patches/fix-pythonpath-env.patch ibus-anthy-1.2.6/debian/patches/fix-pythonpath-env.patch --- ibus-anthy-1.2.6-orig/debian/patches/fix-pythonpath-env.patch 2011-05-29 14:08:49.000000000 +0900 +++ ibus-anthy-1.2.6/debian/patches/fix-pythonpath-env.patch 2011-07-24 20:41:15.000000000 +0900 @@ -1,3 +1,6 @@ +Author: Sandro Tosi <[email protected]> +Description: Use of PYTHONPATH env var in an insecure way +Bug-Debian: http://bugs.debian.org/605171 --- a/engine/ibus-engine-anthy.in +++ b/engine/ibus-engine-anthy.in @@ -26,7 +26,6 @@ diff -Nru ibus-anthy-1.2.6-orig/debian/rules ibus-anthy-1.2.6/debian/rules --- ibus-anthy-1.2.6-orig/debian/rules 2011-05-29 14:04:34.000000000 +0900 +++ ibus-anthy-1.2.6/debian/rules 2011-07-24 22:03:22.000000000 +0900 @@ -1,3 +1,12 @@ #!/usr/bin/make -f %: - dh $@ --with quilt + dh $@ --with python2 --with autotools-dev + +override_dh_python2: + dh_python2 --no-guessing-versions + # without --no-guessing-versions, build fails + +override_dh_strip: + dh_strip + rm $(CURDIR)/debian/ibus-anthy/usr/share/pyshared/*.la + rm $(CURDIR)/debian/ibus-anthy/usr/lib/python2.*/dist-packages/*.la diff -Nru ibus-anthy-1.2.6-orig/debian/source/local-options ibus-anthy-1.2.6/debian/source/local-options --- ibus-anthy-1.2.6-orig/debian/source/local-options 1970-01-01 09:00:00.000000000 +0900 +++ ibus-anthy-1.2.6/debian/source/local-options 2011-07-22 23:22:33.000000000 +0900 @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes diff -Nru ibus-anthy-1.2.6-orig/debian/source/options ibus-anthy-1.2.6/debian/source/options --- ibus-anthy-1.2.6-orig/debian/source/options 1970-01-01 09:00:00.000000000 +0900 +++ ibus-anthy-1.2.6/debian/source/options 2011-07-24 22:19:48.000000000 +0900 @@ -0,0 +1 @@ +extend-diff-ignore = "^setup/*.py$"
