Package: xpp Version: 1.5-cvs20050828-1.1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for xpp (versioned as 1.5-cvs20050828-1.2) and uploaded it to DELAYED/2. The NMU diff is attached. Cheers, Julien
diff -u xpp-1.5-cvs20050828/cupshelper.cxx xpp-1.5-cvs20050828/cupshelper.cxx --- xpp-1.5-cvs20050828/cupshelper.cxx +++ xpp-1.5-cvs20050828/cupshelper.cxx @@ -36,6 +36,7 @@ #include "passworddialog.h" #include <stdlib.h> +#include <stdio.h> #include <cups/language.h> //******************************************************* diff -u xpp-1.5-cvs20050828/mainwindow.fl xpp-1.5-cvs20050828/mainwindow.fl --- xpp-1.5-cvs20050828/mainwindow.fl +++ xpp-1.5-cvs20050828/mainwindow.fl @@ -1427,7 +1427,7 @@ } else { sprintf(buffer,"Do you really want to delete default instance of the queue \\"%s\\"?",s); } - if (!fl_ask(buffer)) return; + if (!fl_ask("%s", buffer)) return; } val=instancelist->value(); if ((copybutton->value()) || (renamebutton->value())) { diff -u xpp-1.5-cvs20050828/xpp.cxx xpp-1.5-cvs20050828/xpp.cxx --- xpp-1.5-cvs20050828/xpp.cxx +++ xpp-1.5-cvs20050828/xpp.cxx @@ -317,7 +317,7 @@ ipp_t *request = CupsHelper::newIppRequest(); char buf[1024]; - char *state = NULL, *type = NULL, *location = NULL, *comment = NULL; + const char *state = NULL, *type = NULL, *location = NULL, *comment = NULL; sprintf(buf,"ipp://%s:%d/printers/%s",CupsHelper::host(), CupsHelper::port(),dests[i].name); ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI,"printer-uri",NULL,buf); diff -u xpp-1.5-cvs20050828/xpp.h xpp-1.5-cvs20050828/xpp.h --- xpp-1.5-cvs20050828/xpp.h +++ xpp-1.5-cvs20050828/xpp.h @@ -38,6 +38,7 @@ #include <cups/cups.h> #include <cups/ipp.h> #include <cups/language.h> +#include <cups/ppd.h> #include <FL/Fl.H> #include <FL/Fl_Window.H> #include <FL/Fl_Box.H> diff -u xpp-1.5-cvs20050828/debian/changelog xpp-1.5-cvs20050828/debian/changelog --- xpp-1.5-cvs20050828/debian/changelog +++ xpp-1.5-cvs20050828/debian/changelog @@ -1,3 +1,16 @@ +xpp (1.5-cvs20050828-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Update debian/watch to report upstream versions properly (closes: #449710). + Thanks, Raphael Geissert! + * Fix FTBFS due to missing includes and format string error, with patch from + peter green (closes: #639033). + * Drop modification of mainwindow.cxx with sed in debian/rules, looks like + the right change was applied in mainwindow.fl already. + * Fix a few -Wwrite-strings warnings in xpp.cxx. + + -- Julien Cristau <jcris...@debian.org> Fri, 30 Dec 2011 16:04:16 +0100 + xpp (1.5-cvs20050828-1.1) unstable; urgency=low * Non-maintainer upload. diff -u xpp-1.5-cvs20050828/debian/watch xpp-1.5-cvs20050828/debian/watch --- xpp-1.5-cvs20050828/debian/watch +++ xpp-1.5-cvs20050828/debian/watch @@ -2 +2,2 @@ -http://sf.net/cups/ (?:.*/)?xpp-(.*)\.tar\.(?:gz|bz2) debian false +opts=dversionmangle=s/\-cvs(.*)// \ +http://sf.net/cups/xpp-(.*)\.tar\.(?:gz|bz2) debian false diff -u xpp-1.5-cvs20050828/debian/rules xpp-1.5-cvs20050828/debian/rules --- xpp-1.5-cvs20050828/debian/rules +++ xpp-1.5-cvs20050828/debian/rules @@ -51,9 +51,6 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) mainwindow.cxx - sed 's/color(\([0-9]\+\))/color((Fl_Color)\1)/g' <mainwindow.cxx >mainwindow.cxx.fixed - mv mainwindow.cxx.fixed mainwindow.cxx $(MAKE) #/usr/bin/docbook-to-man debian/xpp.sgml > xpp.1
signature.asc
Description: Digital signature