Package: lam Version: 7.1.1a-1 Severity: normal Tags: patch Hi,
Attached is the diff for my lam 7.1.1a-1.1 NMU. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u lam-7.1.1a/debian/control lam-7.1.1a/debian/control
--- lam-7.1.1a/debian/control
+++ lam-7.1.1a/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Camm Maguire <[EMAIL PROTECTED]>
-Build-Depends: autoconf,automake,debhelper (>=
4.1.16),g77,texinfo,autotools-dev,help2man, findutils ( >= 4.2.25-1)
+Build-Depends: autoconf,automake1.8,debhelper (>=
4.1.16),g77,texinfo,autotools-dev,help2man, findutils ( >= 4.2.25-1)
Standards-Version: 3.6.2
Package: lam-mpidoc
@@ -54,7 +54,7 @@
Conflicts: lam1-runtime,lam
Replaces: lam1-runtime,lam
Pre-Depends: dpkg (>= 1.6.8)
-Depends: ${shlibs:Depends},ssh | rsh-client,ssh | rsh-server,debconf
+Depends: ${shlibs:Depends},ssh | rsh-client,ssh | rsh-server,debconf |
debconf-2.0
Description: LAM runtime environment for executing parallel programs
LAM (Local Area Multicomputer) is an open source implementation of the
Message Passing Interface (MPI) standard.
diff -u lam-7.1.1a/debian/rules lam-7.1.1a/debian/rules
--- lam-7.1.1a/debian/rules
+++ lam-7.1.1a/debian/rules
@@ -48,6 +48,7 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
ARCHT:=$(shell echo $(DEB_HOST_GNU_TYPE) | cut -f1 -d-)
OPTFLAGS:=
@@ -162,7 +163,14 @@
mkdir tmp
cd tmp && echo $(addprefix ../,$<) | xargs -t -n 1 ar x && rm -f $(ERM)
mkdir -p $(@D)
+
+ifeq ($(DEB_HOST_GNU_SYSTEM),kfreebsd-gnu)
+# aio is enable by default on GNU/kFreeBSD, because of UFS support
+ $(CC) -shared -Wl,-soname=$(@F:.$(VER)=.$(SO)) -o $@ tmp/*.o -L$(LDIR)
-llam -lutil -lrt
+else
$(CC) -shared -Wl,-soname=$(@F:.$(VER)=.$(SO)) -o $@ tmp/*.o -L$(LDIR)
-llam -lutil
+endif
+
rm -rf tmp
$(LDIR)/liblam++.so.$(VER): $(SHLDIR)/liblammpi++.a $(LDIR)/liblam.so
diff -u lam-7.1.1a/debian/changelog lam-7.1.1a/debian/changelog
--- lam-7.1.1a/debian/changelog
+++ lam-7.1.1a/debian/changelog
@@ -1,3 +1,13 @@
+lam (7.1.1a-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Remove spurious confmodule invocation (Closes: #355245).
+ * Add debconf-2.0 alternative (Closes: #331881).
+ * Add Swedish debconf translation (Closes: #337843).
+ * Add support for GNU/kFreeBSD (Closes: #335721).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 26 Mar 2006 17:05:44 +0200
+
lam (7.1.1a-1) unstable; urgency=low
* /u+x -> -u+x per findutils guru recommendation
diff -u lam-7.1.1a/debian/lam4c2.postinst lam-7.1.1a/debian/lam4c2.postinst
--- lam-7.1.1a/debian/lam4c2.postinst
+++ lam-7.1.1a/debian/lam4c2.postinst
@@ -2,8 +2,6 @@
set -e
-. /usr/share/debconf/confmodule
-
if [ "$1" = "configure" ]; then
ldconfig
fi
only in patch2:
unchanged:
--- lam-7.1.1a.orig/romio/adio/ad_nfs/ad_nfs_wait.c
+++ lam-7.1.1a/romio/adio/ad_nfs/ad_nfs_wait.c
@@ -106,7 +106,7 @@
/* DEC, SGI IRIX 5 and 6 */
if ((*request)->queued) {
do {
- err = aio_suspend((const aiocb_t **) &((*request)->handle), 1, 0);
+ err = aio_suspend((const struct aiocb **) &((*request)->handle), 1,
0);
} while ((err == -1) && (errno == EINTR));
if (err != -1) {
only in patch2:
unchanged:
--- lam-7.1.1a.orig/romio/adio/ad_ufs/ad_ufs_wait.c
+++ lam-7.1.1a/romio/adio/ad_ufs/ad_ufs_wait.c
@@ -107,7 +107,7 @@
/* DEC, SGI IRIX 5 and 6 */
if ((*request)->queued) {
do {
- err = aio_suspend((const aiocb_t **) &((*request)->handle), 1, 0);
+ err = aio_suspend((const struct aiocb **) &((*request)->handle), 1,
0);
} while ((err == -1) && (errno == EINTR));
if (err != -1) {
only in patch2:
unchanged:
--- lam-7.1.1a.orig/romio/util/tarch
+++ lam-7.1.1a/romio/util/tarch
@@ -94,6 +94,7 @@
next) FARCH=NeXT ; break ;;
KSR1|KSR2) FARCH=ksr ; break ;;
FreeBSD) FARCH=freebsd ; break ;;
+ GNU/kFreeBSD) FARCH=freebsd ; break ;;
OpenBSD) FARCH=openbsd ; break ;;
NetBSD) FARCH=netbsd ; break ;;
i386) GARCH=ipsc2 ;;
only in patch2:
unchanged:
--- lam-7.1.1a.orig/debian/po/sv.po
+++ lam-7.1.1a/debian/po/sv.po
@@ -0,0 +1,63 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lam 7.1.1-5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 08:50-0800\n"
+"PO-Revision-Date: 2005-11-06 22:07+0100\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: swe\n"
+"X-Poedit-Country: swe\n"
+
+#. Type: note
+#. Description
+#: ../lam-runtime.templates:3
+msgid "Cannot run lam2 programs with this lam-runtime"
+msgstr "Kan inte k?ra lam2-program med denna lam-runtime"
+
+#. Type: note
+#. Description
+#: ../lam-runtime.templates:3
+msgid "LAM 6.5.x is not binary compatible with the previous series, LAM 6.3.x.
This runtime environment will only be able to execute programs statically or
dynamically linked against the lam3 shared libraries. As lam3-dev is
compile-time compatible with lam2-dev, you should simply be able to rebuild any
old programs linking against lam2 and all should work as expected."
+msgstr "LAM 6.5.x ?r inte bin?rkompatibel med den tidigare serien, LAM 6.3.x.
Denna k?rtidsmilj? kommer bara kunna exekvera program som statiskt eller
dynamiskt ?r l?nkade mot de delade biblioteken i lam4. Eftersom lam3-dev ?r
byggnationstidkompatibel med lam2-dev kan du helt enkelt bygga om alla ?ldre
program och l?nka mot lam2 och alla b?r fungera som v?ntat."
+
+#. Type: note
+#. Description
+#: ../lam-runtime.templates:3
+msgid "The lam2 shared libraries are not removed from your system by default.
This is to assist in the upgrade process. If you need to rerun old programs
linking against lam2 before rebuilding, please downgrade lam-runtime to the
latest 6.3.x version. When all is ported to lam3, you can purge lam2 and any
old packages which may depend upon it."
+msgstr "De delade biblioteken f?r lam2 tas inte bort fr?n ditt system som
standard. Detta f?r att hj?lpa till i uppgraderingsprocessen. Om du beh?ver
k?ra om l?nkningen av ?ldre program mot lam2 f?re en ombyggnation, v?nligen
nedgradera lam-runtime till den senaste 6.3.x-versionen. N?r alla ?r portade
till lam3 kan du rensa lam2 och alla gamla paket som kan vara beroende av den."
+
+#. Type: note
+#. Description
+#: ../lam-runtime.templates:19
+msgid "Cannot run lam3 programs with this lam-runtime"
+msgstr "Kan inte k?ra lam3-program med denna lam-runtime"
+
+#. Type: note
+#. Description
+#: ../lam-runtime.templates:19
+msgid "LAM 6.7.x is not binary compatible with the previous series, LAM 6.5.x.
This runtime environment will only be able to execute programs statically or
dynamically linked against the lam4 shared libraries. As lam4-dev is
compile-time compatible with lam3-dev, you should simply be able to rebuild any
old programs linking against lam3 and all should work as expected."
+msgstr "LAM 6.7.x ?r inte bin?rkompatibel med den tidigare serien, LAM 6.5.x.
Denna k?rtidsmilj? kommer bara kunna exekvera program som statiskt eller
dynamiskt ?r l?nkade mot de delade biblioteken i lam4. Eftersom lam4-dev ?r
byggnationstidkompatibel med lam3-dev kan du helt enkelt bygga om alla ?ldre
program och l?nka mot lam3 och alla b?r fungera som v?ntat."
+
+#. Type: note
+#. Description
+#: ../lam-runtime.templates:19
+msgid "The lam3 shared libraries are not removed from your system by default.
This is to assist in the upgrade process. If you need to rerun old programs
linking against lam3 before rebuilding, please downgrade lam-runtime to the
latest 6.5.x version. When all is ported to lam4, you can purge lam3 and any
old packages which may depend upon it."
+msgstr "De delade biblioteken f?r lam3 tas inte bort fr?n ditt system som
standard. Detta f?r att hj?lpa till i uppgraderingsprocessen. Om du beh?ver
k?ra om l?nkningen av ?ldre program mot lam3 f?re en ombyggnation, v?nligen
nedgradera lam-runtime till den senaste 6.5.x-versionen. N?r alla ?r portade
till lam4 kan du rensa lam3 och alla gamla paket som kan vara beroende av den."
+
signature.asc
Description: Digital signature
