Hello,

I'm doing an NMU of aranym to fix #317305 and #353112; diff attached.

Thanks,

Matej
diff -u aranym-0.9.0final/debian/changelog aranym-0.9.0final/debian/changelog
--- aranym-0.9.0final/debian/changelog
+++ aranym-0.9.0final/debian/changelog
@@ -1,3 +1,16 @@
+aranym (0.9.0final-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * src/Unix/Makefile.in: Fix build failure with make 3.81+.
+    Thanks to Matt Kraai for the patch.  Closes: #353112.
+  * Automatically update config.{sub,guess} from autotools-dev.
+    Closes: #317305.
+  * debian/aranym-jit.1, debian/aranym-mmu.1, debian/aratapif.1:
+    Fix groff warnings by using named characters.
+  * debian/aranym-jit.substvars: Remove cruft.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Mon, 27 Feb 2006 11:12:55 +0100
+
 aranym (0.9.0final-1) unstable; urgency=low
 
   * New upstream release
diff -u aranym-0.9.0final/src/Unix/Makefile.in 
aranym-0.9.0final/src/Unix/Makefile.in
--- aranym-0.9.0final/src/Unix/Makefile.in
+++ aranym-0.9.0final/src/Unix/Makefile.in
@@ -150,7 +150,7 @@
 
 install: $(APP) $(TAPIF) $(APP).1.gz installdirs
        $(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP)
-       if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then\
+       if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
        $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\
        fi
        $(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz
@@ -196,7 +196,7 @@
 
 uninstall:
        rm -f $(DESTDIR)$(bindir)/$(APP)
-       if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then\
+       if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
        rm -f $(DESTDIR)$(bindir)/$(APP_IFC);\
        fi
        rm -f $(DESTDIR)$(man1dir)/$(APP).1.gz
@@ -269,7 +269,7 @@
 
 bindist: $(APP) $(TAPIF) $(APP).1.gz bindistdirs
        $(INSTALL_PROGRAM) $(APP) tmpdist$(bindir)/$(APP)
-       if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then\
+       if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
        $(INSTALL_PROGRAM) $(APP_IFC) tmpdist$(bindir)/$(APP_IFC);\
        fi
        $(INSTALL_DATA) $(APP).1.gz tmpdist$(man1dir)/$(APP).1.gz
diff -u aranym-0.9.0final/debian/aranym-jit.1 
aranym-0.9.0final/debian/aranym-jit.1
--- aranym-0.9.0final/debian/aranym-jit.1
+++ aranym-0.9.0final/debian/aranym-jit.1
@@ -27,3 +27,3 @@
 .SH AUTHOR
-This manual page was written by Antonín Král <[EMAIL PROTECTED]>,
+This manual page was written by Anton\['i]n Kr\['a]l <[EMAIL PROTECTED]>,
 for the Debian GNU/Linux system (but may be used by others).
diff -u aranym-0.9.0final/debian/aranym-mmu.1 
aranym-0.9.0final/debian/aranym-mmu.1
--- aranym-0.9.0final/debian/aranym-mmu.1
+++ aranym-0.9.0final/debian/aranym-mmu.1
@@ -27,3 +27,3 @@
 .SH AUTHOR
-This manual page was written by Antonín Král <[EMAIL PROTECTED]>,
+This manual page was written by Anton\['i]n Kr\['a]l <[EMAIL PROTECTED]>,
 for the Debian GNU/Linux system (but may be used by others).
reverted:
--- aranym-0.9.0final/debian/aranym-jit.substvars
+++ aranym-0.9.0final.orig/debian/aranym-jit.substvars
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.1-1), libgcc1 (>= 1:3.2.1-1), libsdl1.2debian (>> 
1.2.3), libstdc++5 (>= 1:3.2.1-1)
diff -u aranym-0.9.0final/debian/aratapif.1 aranym-0.9.0final/debian/aratapif.1
--- aranym-0.9.0final/debian/aratapif.1
+++ aranym-0.9.0final/debian/aratapif.1
@@ -33,3 +33,3 @@
 .SH AUTHOR
-This manual page was written by Antonín Král <[EMAIL PROTECTED]>,
+This manual page was written by Anton\['i]n Kr\['a]l <[EMAIL PROTECTED]>,
 for the Debian GNU/Linux system (but may be used by others).
diff -u aranym-0.9.0final/debian/control aranym-0.9.0final/debian/control
--- aranym-0.9.0final/debian/control
+++ aranym-0.9.0final/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Antonin Kral <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: debhelper, bzip2, libsdl1.2-dev, libsdl-image1.2-dev
+Build-Depends: debhelper, autotools-dev, bzip2, libsdl1.2-dev, 
libsdl-image1.2-dev
 
 Package: aranym
 Architecture: any
diff -u aranym-0.9.0final/debian/rules aranym-0.9.0final/debian/rules
--- aranym-0.9.0final/debian/rules
+++ aranym-0.9.0final/debian/rules
@@ -17,6 +17,8 @@
 build-stamp:
        dh_testdir
 
+       ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess src/Unix
+
        (cd src/Unix && [ ! -f Makefile ] || $(MAKE) distclean)
        (cd src/Unix && ./configure --prefix=/usr --mandir=/usr/share/man 
--enable-addressing=direct --enable-nfjpeg && $(MAKE))
        (cd src/Unix && $(MAKE) install DESTDIR=`pwd`/../../debian/tmp )
@@ -47,6 +49,8 @@
 
        (cd src/Unix && [ ! -f Makefile ] || $(MAKE) distclean)
 
+       rm -f src/Unix/config.sub src/Unix/config.guess
+
        dh_clean
 
 install: build

Reply via email to