NMU uploaded to fix 474896 and 484418 using patches from the bts
NMU patch attached.
--
Colin Tuckley | +44(0)1903 236872 | PGP/GnuPG Key Id
Debian Developer | +44(0)7799 143369 | 0x1B3045CE
diff -u noteedit-2.8.1/configure noteedit-2.8.1/configure
--- noteedit-2.8.1/configure
+++ noteedit-2.8.1/configure
@@ -34287,7 +34287,8 @@
fi
cat >tse3vtest.cc << EOF
-#include <istream.h>
+#include <iostream>
+using namespace std;
#include <tse3/TSE3.h>
int main() {
cout << TSE3::TSE3_Version() << endl;
diff -u noteedit-2.8.1/debian/changelog noteedit-2.8.1/debian/changelog
--- noteedit-2.8.1/debian/changelog
+++ noteedit-2.8.1/debian/changelog
@@ -1,3 +1,13 @@
+noteedit (2.8.1-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix bashism in debian/rules (Closes: #484418)
+ patch from Chris Lamb
+ * Fix FTBFS TSE3 found but unable to link a simple TSE3 example
+ patch from Luca Falavigna (Closes: #474896)
+
+ -- Colin Tuckley <[EMAIL PROTECTED]> Fri, 27 Jun 2008 22:59:21 +0100
+
noteedit (2.8.1-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u noteedit-2.8.1/debian/rules noteedit-2.8.1/debian/rules
--- noteedit-2.8.1/debian/rules
+++ noteedit-2.8.1/debian/rules
@@ -91,8 +91,9 @@
cp -f /usr/share/misc/config.guess admin/config.guess
endif
# clean, better than that
- -rm -f config.{status,log}
- rm -f {po/*.gmo,tse3vtest2*,kde_qttest.o} yacctest.tab.{c,h} y.tab.h configure.files
+ -rm -f config.status config.log
+ rm -f po/*.gmo tse3vtest2* kde_qttest.o
+ rm -f yacctest.tab.c yacctest.tab.y y.tab.h configure.files
rm -f noteedit/{lexik.cc,grammar.cc,grammar.h,grammar.tab.cc,grammar.tab.hh,lyrics.ui}
rm -f doc/{noteedit,de}/index.cache.bz2
dh_clean
--- noteedit-2.8.1.orig/noteedit/musicxmlimport.h
+++ noteedit-2.8.1/noteedit/musicxmlimport.h
@@ -126,7 +126,7 @@
void handlePedal(NChord * chord);
void handleTuplet(NMusElement * elem);
void handleVoice(int staff, int voice);
- void handleVoiceDoStaff(int staff, int voice, NStaff * & staff, bool & mapped);
+ void handleVoiceDoStaff(int dostaff, int voice, NStaff * & staff, bool & mapped);
int current_max_voice_nr; /* the maximum voice number reached until now */
void handleWords();
void initStAttributes();
