Thanks for the NMU, Sorry for not doing this myself. I'm quite busy currently.
Gaudenz On Fri, May 26, 2006 at 09:29:58PM +0200, Martin Michlmayr wrote: > tags 358075 + pending > thanks > > I've uploaded the following NMU to delayed-2. > > > diff -u passepartout-0.6/debian/patches/00list > passepartout-0.6/debian/patches/00list > --- passepartout-0.6/debian/patches/00list > +++ passepartout-0.6/debian/patches/00list > @@ -6,2 +6,3 @@ > 06_freetype_makefile > +07_gcc-4.1.dpatch > 99_autotools > diff -u passepartout-0.6/debian/changelog passepartout-0.6/debian/changelog > --- passepartout-0.6/debian/changelog > +++ passepartout-0.6/debian/changelog > @@ -1,3 +1,11 @@ > +passepartout (0.6-3.1) unstable; urgency=low > + > + * NMU as part of the GCC 4.1 transition. > + * patches/07_gcc-4.1.dpatch: Remove extra qualification from C++ header > + file (Closes: #358075) > + > + -- Martin Michlmayr <[EMAIL PROTECTED]> Fri, 26 May 2006 20:05:18 +0200 > + > passepartout (0.6-3) unstable; urgency=low > > * "The kudos to vorlon release!" > --- passepartout-0.6.orig/debian/patches/07_gcc-4.1.dpatch > +++ passepartout-0.6/debian/patches/07_gcc-4.1.dpatch > @@ -0,0 +1,50 @@ > +#! /bin/sh /usr/share/dpatch/dpatch-run > +## 07_gcc-4.1.dpatch by [EMAIL PROTECTED] > +## > +## All lines beginning with `## DP:' are a description of the patch. > +## DP: build with gcc-4.1 > + > [EMAIL PROTECTED]@ > +--- a/src/pptout/document/group.h~ 2006-03-21 03:19:51.000000000 +0000 > ++++ b/src/pptout/document/group.h 2006-03-21 03:20:02.000000000 +0000 > +@@ -30,7 +30,7 @@ > + void set_flow_around(bool); > + bool get_flow_around() const; > + Boundary get_obstacle_boundary() const; > +- BoundaryVect Group::obstacle_list() const; > ++ BoundaryVect obstacle_list() const; > + > + void add(Pagent* obj); > + Pagent* ungroup(Pagent* obj); > +@@ -55,7 +55,7 @@ > + /** Raised on direct changes to the group (i.e. new / ungrouped member) */ > + sigc::signal<void, Pagent*> group_changed_signal; > + private: > +- Boundary Group::get_untransformed_box() const; > ++ Boundary get_untransformed_box() const; > + > + ChildVec childs; > + }; > +--- a/src/pptout/propertiesdialog.h~ 2006-03-21 03:24:23.000000000 +0000 > ++++ b/src/pptout/propertiesdialog.h 2006-03-21 03:24:28.000000000 +0000 > +@@ -39,7 +39,7 @@ > + // no destructor > + ~PropertiesDialog(); > + > +- void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index); > ++ void show_page_contents(GtkNotebookPage*, guint index); > + > + Gtk::Notebook book; > + std::vector<PropBase*> pages; > +--- a/src/xml2ps/canvas.hh~ 2006-03-21 03:09:36.000000000 +0000 > ++++ b/src/xml2ps/canvas.hh 2006-03-21 03:10:43.000000000 +0000 > +@@ -52,7 +52,7 @@ > + HBox hbox(bool span, float margin_left, float margin_right, > + float ascender, float descender); > + > +- virtual void xml2ps::Canvas::addRelObstacle > ++ virtual void addRelObstacle > + (const float left, const float bottom, const float right, const float > top); > + > + // Check where the current column starts. > + > > -- > Martin Michlmayr > http://www.cyrius.com/ > -- Ever tried. Ever failed. No matter. Try again. Fail again. Fail better. ~ Samuel Beckett ~ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
