Hi

Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.

The patch is against the version in unstable, not the version in NEW.

Cheers

Luk

-- 
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint:   D5AF 25FB 316B 53BB 08E7   F999 E544 DE07 9B7C 328D
reverted:
--- unicon-3.0.4/debian/README.Debian
+++ unicon-3.0.4.orig/debian/README.Debian
@@ -1,5 +0,0 @@
-unicon for Debian
-----------------------
-
-
- -- Yu Guanghui <[EMAIL PROTECTED]>, Thu, 16 Nov 2000 08:48:37 +0800
diff -u unicon-3.0.4/debian/changelog unicon-3.0.4/debian/changelog
--- unicon-3.0.4/debian/changelog
+++ unicon-3.0.4/debian/changelog
@@ -1,3 +1,20 @@
+unicon (3.0.4-9.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Splitted xlibs-dev build-dep.
+  * Fixed spelling error in short description (Closes: #125445).
+  * Removed empty README.Debian (Closes: #257665).
+  * Removed empty postrm.
+
+ -- Luk Claes <[EMAIL PROTECTED]>  Sun,  8 Jan 2006 01:13:38 +0100
+
+unicon (3.0.4-9.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * C++ ABI transition (Closes: #335955).
+
+ -- Luk Claes <[EMAIL PROTECTED]>  Mon,  2 Jan 2006 16:10:09 +0100
+
 unicon (3.0.4-9) unstable; urgency=low
 
   * Fix gcc-3.2 compile errors. (closes:Bug#188909) 
@@ -123,7 +140,7 @@
 
 unicon (3.0.2-2) unstable; urgency=low
 
-  * Removed cxterm dict build, we don't need it. (closes: #Bug96670) 
+  * Removed cxterm dict build, we don't need it. (closes: Bug#96670) 
 
  -- Yu Guanghui <[EMAIL PROTECTED]>  Tue,  8 May 2001 00:21:51 +0800
 
diff -u unicon-3.0.4/debian/copyright unicon-3.0.4/debian/copyright
--- unicon-3.0.4/debian/copyright
+++ unicon-3.0.4/debian/copyright
@@ -3,7 +3,7 @@
 
 It was downloaded from ftp.turbolinux.com.cn
 
-Upstream Author(s): Arthur Ma <[EMAIL PROTECTED]>
+Upstream Author: Arthur Ma <[EMAIL PROTECTED]>
 
 Copyright:
 
reverted:
--- unicon-3.0.4/debian/unicon-im.files
+++ unicon-3.0.4.orig/debian/unicon-im.files
@@ -1 +0,0 @@
-usr
reverted:
--- unicon-3.0.4/debian/postrm
+++ unicon-3.0.4.orig/debian/postrm
@@ -1,37 +0,0 @@
-#! /bin/sh
-# postrm script for unicon
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/doc/packaging-manual/
-
-case "$1" in
-       
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-                                # update the menu system
-#        if [ -x /usr/bin/update-menus ]; then update-menus; fi
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 0
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-
diff -u unicon-3.0.4/debian/control unicon-3.0.4/debian/control
--- unicon-3.0.4/debian/control
+++ unicon-3.0.4/debian/control
@@ -1,14 +1,16 @@
 Source: unicon
 Section: utils
-Build-Depends: debhelper (>= 2.0.72), libpth-dev, xlibs-dev
+Build-Depends: debhelper (>= 2.0.72), libpth-dev, x-dev, libx11-dev
 Priority: optional
 Maintainer: Yu Guanghui <[EMAIL PROTECTED]>
 Standards-Version: 3.5.0
 
-Package: unicon-im
+Package: unicon-imc2
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: chinput (<= 3.0.1-3)
-Description: Chinese Input Method Libaray
+Conflicts: chinput (<= 3.0.1-3), unicon-im
+Replaces: unicon-im
+Provides: unicon-im
+Description: Chinese Input Method Library
  General Chinese Input method interface and API. It is using by chinput and
  unicon now.
reverted:
--- unicon-3.0.4/debian/unicon-im.override
+++ unicon-3.0.4.orig/debian/unicon-im.override
@@ -1,3 +0,0 @@
-unicon-im: shlib-with-non-pic-code usr/lib/unicon/modules/turbo/TL_hzinput.so
-unicon-im: non-dev-pkg-with-shlib-symlink usr/lib/libimm_server.so.0.0 
usr/lib/libimm_server.so
-unicon-im: postinst-must-call-ldconfig usr/lib/libimm_server.so.0.0
diff -u unicon-3.0.4/debian/rules unicon-3.0.4/debian/rules
--- unicon-3.0.4/debian/rules
+++ unicon-3.0.4/debian/rules
@@ -46,9 +46,9 @@
        dh_clean -k
        dh_installdirs
 
-       $(MAKE) install prefix=`pwd`/debian/unicon-im/usr 
DESTDIR=`pwd`/debian/unicon-im/usr
-       $(MAKE) data-install prefix=`pwd`/debian/unicon-im/usr 
-       cp -f debian/unicon-im.override 
`pwd`/debian/unicon-im/usr/share/lintian/overrides/unicon-im
+       $(MAKE) install prefix=`pwd`/debian/unicon-imc2/usr 
DESTDIR=`pwd`/debian/unicon-imc2/usr
+       $(MAKE) data-install prefix=`pwd`/debian/unicon-imc2/usr 
+       cp -f debian/unicon-imc2.override 
`pwd`/debian/unicon-imc2/usr/share/lintian/overrides/unicon-imc2
 
 #      dh_movefiles 
 
reverted:
--- unicon-3.0.4/debian/unicon-im.docs
+++ unicon-3.0.4.orig/debian/unicon-im.docs
@@ -1,13 +0,0 @@
-BUGS
-README
-README_cn
-THANKS
-RELEASE
-RELEASE_cn
-CREDITS
-debian/TODO.Debian
-doc/faq_en.txt
-doc/smallfont.txt
-doc/tech_unicon.txt
-doc/unicon_font_header.txt
-doc/whitepaper_unicon.txt
reverted:
--- unicon-3.0.4/debian/unicon-im.dirs
+++ unicon-3.0.4.orig/debian/unicon-im.dirs
@@ -1,2 +0,0 @@
-usr/share/lintian/overrides
-usr/lib/unicon
only in patch2:
unchanged:
--- unicon-3.0.4.orig/debian/unicon-imc2.dirs
+++ unicon-3.0.4/debian/unicon-imc2.dirs
@@ -0,0 +1,2 @@
+usr/share/lintian/overrides
+usr/lib/unicon
only in patch2:
unchanged:
--- unicon-3.0.4.orig/debian/unicon-imc2.docs
+++ unicon-3.0.4/debian/unicon-imc2.docs
@@ -0,0 +1,13 @@
+BUGS
+README
+README_cn
+THANKS
+RELEASE
+RELEASE_cn
+CREDITS
+debian/TODO.Debian
+doc/faq_en.txt
+doc/smallfont.txt
+doc/tech_unicon.txt
+doc/unicon_font_header.txt
+doc/whitepaper_unicon.txt
only in patch2:
unchanged:
--- unicon-3.0.4.orig/debian/unicon-imc2.files
+++ unicon-3.0.4/debian/unicon-imc2.files
@@ -0,0 +1 @@
+usr
only in patch2:
unchanged:
--- unicon-3.0.4.orig/debian/unicon-imc2.override
+++ unicon-3.0.4/debian/unicon-imc2.override
@@ -0,0 +1,3 @@
+unicon-imc2: shlib-with-non-pic-code usr/lib/unicon/modules/turbo/TL_hzinput.so
+unicon-imc2: non-dev-pkg-with-shlib-symlink usr/lib/libimm_server.so.0.0 
usr/lib/libimm_server.so
+unicon-imc2: postinst-must-call-ldconfig usr/lib/libimm_server.so.0.0

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to