Hi.
I propose to make to attached NMU to make amaya installable in unstable
again (and fix some other build related issues on the way). If there are
no objections I will upload it in the next days.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur amaya-8.5.bak/debian/changelog amaya-8.5/debian/changelog
--- amaya-8.5.bak/debian/changelog 2005-10-15 18:57:51.000000000 +0200
+++ amaya-8.5/debian/changelog 2005-10-15 19:18:59.000000000 +0200
@@ -1,3 +1,16 @@
+amaya (8.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Change build-depends on libpng2-dev to libpng12-dev
+ (Closes: #207756, #328338, #331082)
+ * Fix debian/rules to make the package buildable on non-linux archs
+ (Closes: #300606)
+ * Remove conflict of the package on itself
+ * Fix debian/patches/ia64.diff to be actually applied and debian/rules
+ to actually fail the build if a patch can't be applied
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 15 Oct 2005 19:06:46 +0200
+
amaya (8.5-1) unstable; urgency=low
* New upstream release. Closes: #246924
diff -Naur amaya-8.5.bak/debian/control amaya-8.5/debian/control
--- amaya-8.5.bak/debian/control 2005-10-15 18:57:51.000000000 +0200
+++ amaya-8.5/debian/control 2005-10-15 18:58:52.000000000 +0200
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Steve Dunham <[EMAIL PROTECTED]>
Standards-Version: 3.5.8
-Build-Depends: bison, flex, autoconf, automake1.6, debhelper (>= 4.1.34),
libtool, libjpeg62-dev, libpng2-dev, zlib1g-dev, libgtk1.2-dev, gdk-imlib1-dev,
perl, libungif4-dev, autotools-dev
+Build-Depends: bison, flex, autoconf, automake1.6, debhelper (>= 4.1.34),
libtool, libjpeg62-dev, libpng12-dev, zlib1g-dev, libgtk1.2-dev,
gdk-imlib1-dev, perl, libungif4-dev, autotools-dev
Package: amaya
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: amaya, amaya-dict-de, amaya-dict-en, amaya-dict-fr, amaya-dict-it,
amaya-dict-ne, amaya-dict-se
+Conflicts: amaya-dict-de, amaya-dict-en, amaya-dict-fr, amaya-dict-it,
amaya-dict-ne, amaya-dict-se
Replaces: amaya-dict-de, amaya-dict-en, amaya-dict-fr, amaya-dict-it,
amaya-dict-ne, amaya-dict-se, amaya-common
Provides: www-browser
Description: Web Browser, HTML Editor and Testbed for Draft W3C standards
diff -Naur amaya-8.5.bak/debian/patches/ia64.diff
amaya-8.5/debian/patches/ia64.diff
--- amaya-8.5.bak/debian/patches/ia64.diff 2005-10-15 18:57:51.000000000
+0200
+++ amaya-8.5/debian/patches/ia64.diff 2005-10-15 19:25:19.000000000 +0200
@@ -44,15 +44,14 @@
AC_C_CONST
AC_C_INLINE
AC_TYPE_MODE_T
-diff -Nru Amaya.orig/thotlib/base/fileaccess.c Amaya/thotlib/base/fileaccess.c
---- Amaya.orig/thotlib/base/fileaccess.c 2003-07-04 05:35:35.000000000
-0700
-+++ Amaya/thotlib/base/fileaccess.c 2003-08-25 14:05:10.000000000 -0700
-@@ -268,35 +268,15 @@
+--- Amaya/thotlib/base/fileaccess.c.orig 2004-04-27 15:16:24.000000000
+0200
++++ Amaya/thotlib/base/fileaccess.c 2005-10-15 19:23:43.000000000 +0200
+@@ -264,33 +264,15 @@
float f;
/* This is the IEEE 754 float-precision format. */
struct {
-#ifdef _WINDOWS
-- unsigned int negative:1;
+- unsigned int negative:1;
- unsigned int exponent:8;
- unsigned int mantissa:23;
-#else /*_WINDOWS*/
@@ -61,26 +60,24 @@
- unsigned int negative:1;
- unsigned int exponent:8;
- unsigned int mantissa:23;
--#endif
--#if __BYTE_ORDER == __LITTLE_ENDIAN
+-#else
- unsigned int mantissa:23;
- unsigned int exponent:8;
- unsigned int negative:1;
-#endif
--#else
+-#else /* i386 || __i386 */
-#if defined(_BIG_ENDIAN)
+#if defined(WORDS_BIGENDIAN)
unsigned int negative:1;
unsigned int exponent:8;
unsigned int mantissa:23;
--#endif
--#if defined(_LITTLE_ENDIAN)
+-#else
+#else /*WORDS_BIGENDIAN*/
unsigned int mantissa:23;
unsigned int exponent:8;
unsigned int negative:1;
-#endif
--#endif
+-#endif /* i386 || __i386 */
-#endif /*_WINDOWS*/
+#endif /*WORDS_BIGENDIAN*/
} ieee;
diff -Naur amaya-8.5.bak/debian/rules amaya-8.5/debian/rules
--- amaya-8.5.bak/debian/rules 2005-10-15 18:57:51.000000000 +0200
+++ amaya-8.5/debian/rules 2005-10-15 19:17:27.000000000 +0200
@@ -6,6 +6,9 @@
SOURCE:=amaya-src-8.5.tgz
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
build: build-stamp
build-stamp: patch-stamp
dh_testdir
@@ -28,7 +31,7 @@
-mkdir Amaya/BUILD
cd Amaya/BUILD && ../configure --prefix=/usr --datadir=/usr/lib \
--without-graphic-libs --with-dav --with-gtk \
- `dpkg --print-architecture`-linux
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
cd Amaya/BUILD && make CFLAGS="-O2 -g -Wall" all amaya
touch build-stamp
@@ -36,7 +39,7 @@
patch: patch-stamp
patch-stamp: source-stamp
if [ -d debian/patches ]; then \
- for i in debian/patches/*; do \
+ set -e; for i in debian/patches/*; do \
patch -p0 -s < $$i; \
done; fi
