tags 625102 + pending
thanks

Dear maintainer,

I've prepared an NMU for aplus-fsf (versioned as 4.22.1-4.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    NP: Element Of Crime: Alle vier Minuten
diff -u aplus-fsf-4.22.1/debian/changelog aplus-fsf-4.22.1/debian/changelog
--- aplus-fsf-4.22.1/debian/changelog
+++ aplus-fsf-4.22.1/debian/changelog
@@ -1,3 +1,16 @@
+aplus-fsf (4.22.1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: ../MSTypes/MSTypeData.H:54:23: error: declaration of
+    'operator new' as non-function": add patch from Ubuntu / Andreas Moog:
+    - src/main/Makefile.am/in: Fix order of arguments to allow building 
+      with --as-needed.
+    - src/MSGUI/Makefile.am/in: Include X11 libs when linking
+    - src/MSTypes/MSTypeData.H: Add <cstddef> to headers (LP: #766003)
+    (Closes: #625102)
+
+ -- gregor herrmann <gre...@debian.org>  Thu, 08 Dec 2011 14:56:21 +0100
+
 aplus-fsf (4.22.1-4) unstable; urgency=low
 
   * Fix FTBFS with changes to MSFloat.C and MSUtil.C. (Closes: #560446).
diff -u aplus-fsf-4.22.1/src/main/Makefile.in aplus-fsf-4.22.1/src/main/Makefile.in
--- aplus-fsf-4.22.1/src/main/Makefile.in
+++ aplus-fsf-4.22.1/src/main/Makefile.in
@@ -122,7 +122,8 @@
 	$(top_srcdir)/src/dap/libdap.la \
 	$(top_srcdir)/src/MSGUI/libMSGUI.la \
 	$(top_srcdir)/src/MSIPC/libMSIPC.la \
-	$(top_srcdir)/src/MSTypes/libMSTypes.la 
+	$(top_srcdir)/src/MSTypes/libMSTypes.la \
+	$(X_LIBS) $(LIBS)
 
 
 aplus_LDFLAGS = \
@@ -137,8 +138,7 @@
 	-L$(top_srcdir)/src/dap \
 	-L$(top_srcdir)/src/MSGUI \
 	-L$(top_srcdir)/src/MSIPC \
-	-L$(top_srcdir)/src/MSTypes \
-	$(X_LIBS) $(LIBS)
+	-L$(top_srcdir)/src/MSTypes
 
 subdir = src/main
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
only in patch2:
unchanged:
--- aplus-fsf-4.22.1.orig/src/MSGUI/Makefile.in
+++ aplus-fsf-4.22.1/src/MSGUI/Makefile.in
@@ -466,6 +466,7 @@
 	MSWidgetView.H\
 	MSWindow.H
 
+libMSGUI_la_LIBADD = $(X_LIBS)
 
 EXTRA_DIST = \
 	MSArrayViewInlines.C\
only in patch2:
unchanged:
--- aplus-fsf-4.22.1.orig/src/MSGUI/Makefile.am
+++ aplus-fsf-4.22.1/src/MSGUI/Makefile.am
@@ -382,6 +382,8 @@
 	MSWidgetView.H\
 	MSWindow.H
 
+libMSGUI_la_LIBADD = $(X_LIBS)
+
 EXTRA_DIST = \
 	MSArrayViewInlines.C\
 	MSCompositeTextInlines.C\
only in patch2:
unchanged:
--- aplus-fsf-4.22.1.orig/src/main/Makefile.am
+++ aplus-fsf-4.22.1/src/main/Makefile.am
@@ -37,7 +37,8 @@
 	$(top_srcdir)/src/dap/libdap.la \
 	$(top_srcdir)/src/MSGUI/libMSGUI.la \
 	$(top_srcdir)/src/MSIPC/libMSIPC.la \
-	$(top_srcdir)/src/MSTypes/libMSTypes.la 
+	$(top_srcdir)/src/MSTypes/libMSTypes.la \
+	$(X_LIBS) $(LIBS)
 
 aplus_LDFLAGS = \
 	-L$(top_srcdir)/src/IPC \
@@ -51,8 +52,7 @@
 	-L$(top_srcdir)/src/dap \
 	-L$(top_srcdir)/src/MSGUI \
 	-L$(top_srcdir)/src/MSIPC \
-	-L$(top_srcdir)/src/MSTypes \
-	$(X_LIBS) $(LIBS)
+	-L$(top_srcdir)/src/MSTypes
 
 install-exec-hook:
 	mv $(DESTDIR)$(bindir)/aplus $(DESTDIR)$(bindir)/a+
only in patch2:
unchanged:
--- aplus-fsf-4.22.1.orig/src/MSTypes/MSTypeData.H
+++ aplus-fsf-4.22.1/src/MSTypes/MSTypeData.H
@@ -9,6 +9,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <cstddef>
 
 #ifndef MSDefinesHEADER
 #include <MSTypes/MSDefines.H>

Attachment: signature.asc
Description: Digital signature

Reply via email to