tags 508207 + patch
tags 541029 + patch
thanks
This nmudiff is mostly to post the diff to the various involved bug
logs, letting them know that they've been dealt with. The upload
orphaned the package as requested by MIA team, so there is no real
maintainer to inform anymore.
Cheers.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u im-sdk-12.3.91/debian/rules im-sdk-12.3.91/debian/rules
--- im-sdk-12.3.91/debian/rules
+++ im-sdk-12.3.91/debian/rules
@@ -176,6 +176,7 @@
dh_installdocs -i
dh_installchangelogs -i
dh_installemacsen -i
+ dh_lintian -i
dh_link -i
dh_compress -i
dh_fixperms -i
@@ -191,6 +192,7 @@
dh_installdocs -a
dh_installinit -a --no-restart-on-upgrade
dh_installchangelogs -a
+ dh_lintian -a
dh_link -a
dh_scrollkeeper -a
dh_gconf -a
diff -u im-sdk-12.3.91/debian/changelog im-sdk-12.3.91/debian/changelog
--- im-sdk-12.3.91/debian/changelog
+++ im-sdk-12.3.91/debian/changelog
@@ -1,3 +1,17 @@
+im-sdk (12.3.91-6.5) unstable; urgency=low
+
+ * Orphaning package, as requested by the MIA team.
+ (Closes: #508207, #541029)
+ * Rename debian/README.build to README.source, as requested by policy
+ * New patch 063_kfreebsd.patch to fix build on kFreeBSD; thanks to Cyril
+ Brulebois (Closes: #550294)
+ * New patch 067_gcc-4.4.patch to fix build w/ gcc 4.4; thanks to Martin
+ Michlmayr (Closes: #504873)
+ * Add lintian override for no-shlibs-control-file on the -server package
+ (rationale: the lib is private)
+
+ -- Stefano Zacchiroli <[email protected]> Sat, 26 Dec 2009 18:04:26 +0100
+
im-sdk (12.3.91-6.4) unstable; urgency=low
* Non-maintainer upload.
diff -u im-sdk-12.3.91/debian/control im-sdk-12.3.91/debian/control
--- im-sdk-12.3.91/debian/control
+++ im-sdk-12.3.91/debian/control
@@ -1,9 +1,8 @@
Source: im-sdk
Section: text
Priority: optional
-Maintainer: Roger So <[email protected]>
+Maintainer: Debian QA Group <[email protected]>
Build-Depends: autotools-dev, libtool, dbs, debhelper (>= 5), libwrap0-dev (>= 7.6.dbs-3), libx11-dev, libice-dev, libsm-dev, libxt-dev, libpam0g-dev, libcanna1g-dev, libgtk2.0-dev (>= 2.10.1-1), flex, intltool, libxml2-dev, libgconf2-dev, libgnomeui-dev, libpanel-applet2-dev, scrollkeeper, libchewing3-dev, docbook-xml, docbook-xsl, xsltproc, libglade2-dev
-Uploaders: Roger So <[email protected]>, Akira TAGOH <[email protected]>
Standards-Version: 3.8.0
Package: iiimf
reverted:
--- im-sdk-12.3.91/debian/README.build
+++ im-sdk-12.3.91.orig/debian/README.build
@@ -1,20 +0,0 @@
-This package uses a build system called DBS (Doogie's Build System).
-To extract the upstream source, run "debian/rules setup". This will
-extract the pristine source in build-tree/, and apply patches from
-debian/patches/.
-
-Note that source modifications in build-tree/ will not be preserved
-after the "clean" target is run.
-
-To create patches for the source, remember the following steps: There
-are two targets for handling source. The "unpacked" target will
-simply unpack the tarball(s) into build-tree/; the "patched" target
-will apply all patches from debian/patches/. If you make any changes,
-you can generate a new patch using the "make_patch" target. This will
-move your current sources under build-tree/, unpack the source+patches
-again, and then generate a diff between the two. Note that you should
-run the "clean" target in the build-tree/ source before doing this to
-get a clean patch.
-
-Tollef Fog Heen
-(modified by Colin Walters <[email protected]>)
only in patch2:
unchanged:
--- im-sdk-12.3.91.orig/debian/iiimf-server.lintian-overrides
+++ im-sdk-12.3.91/debian/iiimf-server.lintian-overrides
@@ -0,0 +1 @@
+iiimf-server binary: no-shlibs-control-file
only in patch2:
unchanged:
--- im-sdk-12.3.91.orig/debian/README.source
+++ im-sdk-12.3.91/debian/README.source
@@ -0,0 +1,20 @@
+This package uses a build system called DBS (Doogie's Build System).
+To extract the upstream source, run "debian/rules setup". This will
+extract the pristine source in build-tree/, and apply patches from
+debian/patches/.
+
+Note that source modifications in build-tree/ will not be preserved
+after the "clean" target is run.
+
+To create patches for the source, remember the following steps: There
+are two targets for handling source. The "unpacked" target will
+simply unpack the tarball(s) into build-tree/; the "patched" target
+will apply all patches from debian/patches/. If you make any changes,
+you can generate a new patch using the "make_patch" target. This will
+move your current sources under build-tree/, unpack the source+patches
+again, and then generate a diff between the two. Note that you should
+run the "clean" target in the build-tree/ source before doing this to
+get a clean patch.
+
+Tollef Fog Heen
+(modified by Colin Walters <[email protected]>)
only in patch2:
unchanged:
--- im-sdk-12.3.91.orig/debian/patches/067_gcc-4.4.patch
+++ im-sdk-12.3.91/debian/patches/067_gcc-4.4.patch
@@ -0,0 +1,11 @@
+diff -Nru ../build-tree.old/iiimf-12.3.91-svn2814/iiimsf/src/basictype.hh ./iiimf-12.3.91-svn2814/iiimsf/src/basictype.hh
+--- ../build-tree.old/iiimf-12.3.91-svn2814/iiimsf/src/basictype.hh 2004-12-07 06:34:59.000000000 +0100
++++ ./iiimf-12.3.91-svn2814/iiimsf/src/basictype.hh 2009-12-26 18:15:52.745967806 +0100
+@@ -4,6 +4,7 @@
+ #ifndef BASICTYPE_HH_
+ #define BASICTYPE_HH_
+ #include <config.h>
++#include <cstdio>
+ #include <string>
+ #include <utility>
+ #include <functional>
only in patch2:
unchanged:
--- im-sdk-12.3.91.orig/debian/patches/063_kfreebsd.patch
+++ im-sdk-12.3.91/debian/patches/063_kfreebsd.patch
@@ -0,0 +1,66 @@
+diff -Nru ../build-tree.old/iiimf-12.3.91-svn2814/include/iiimp/iiimp-data.h ./iiimf-12.3.91-svn2814/include/iiimp/iiimp-data.h
+--- ../build-tree.old/iiimf-12.3.91-svn2814/include/iiimp/iiimp-data.h 2005-08-11 05:56:30.000000000 +0200
++++ ./iiimf-12.3.91-svn2814/include/iiimp/iiimp-data.h 2009-12-26 18:11:15.861934969 +0100
+@@ -13,7 +13,7 @@
+ #include <stdint.h>
+ #endif
+
+-#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__GLIBC__)
+ typedef unsigned char uchar_t;
+ typedef unsigned int uint_t;
+ #endif /* linux || freebsd */
+diff -Nru ../build-tree.old/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.c ./iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.c
+--- ../build-tree.old/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.c 2009-12-26 18:11:39.030933160 +0100
++++ ./iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.c 2009-12-26 18:11:10.465956075 +0100
+@@ -841,7 +841,7 @@
+ return;
+ }
+
+-#ifdef linux
++#if defined(linux) || defined(__GLIBC__)
+ pid = fork();
+ #else
+ pid = fork1();
+diff -Nru ../build-tree.old/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.h ./iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.h
+--- ../build-tree.old/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.h 2009-12-26 18:11:39.030933160 +0100
++++ ./iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.h 2009-12-26 18:11:10.465956075 +0100
+@@ -80,7 +80,7 @@
+ extern Bool xaux_ext_Draw(xaux_class_t *, aux_ext_data_t *);
+ extern Bool xaux_ext_Done(xaux_class_t *, aux_ext_data_t *);
+
+-#ifndef linux
++#if !defined(linux) && !defined(__GLIBC__)
+ #include <Xm/Xm.h>
+ #endif
+
+diff -Nru ../build-tree.old/iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c ./iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c
+--- ../build-tree.old/iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c 2009-12-26 18:11:39.229932564 +0100
++++ ./iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c 2009-12-26 18:10:53.057932408 +0100
+@@ -134,7 +134,7 @@
+ return F_WRLCK;
+ case IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLCK:
+ return F_UNLCK;
+-#if !defined(__linux__)
++#if !defined(__linux__) && !defined(__GLIBC__)
+ case IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLKSYS:
+ return F_UNLKSYS;
+ #endif
+@@ -155,7 +155,7 @@
+ return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_WRLCK;
+ case F_UNLCK:
+ return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLCK;
+-#if !defined(__linux__)
++#if !defined(__linux__) && !defined(__GLIBC__)
+ case F_UNLKSYS:
+ return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLKSYS;
+ #endif
+@@ -7323,7 +7323,7 @@
+ return "F_WRLCK";
+ case F_UNLCK:
+ return "F_UNLCK";
+-#if !defined(__linux__)
++#if !defined(__linux__) && !defined(__GLIBC__)
+ case F_UNLKSYS:
+ return "F_UNLKSYS";
+ #endif
