tags 357557 + pending
thanks
I've uploaded the following NMU to delayed-5.
diff -u aptitude-0.4.1/debian/changelog aptitude-0.4.1/debian/changelog
--- aptitude-0.4.1/debian/changelog
+++ aptitude-0.4.1/debian/changelog
@@ -1,3 +1,11 @@
+aptitude (0.4.1-1.1) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * Remove extra qualifications from C++ header files, declare
+ friend functions and remove unused variable (Closes: #357557).
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]> Sat, 27 May 2006 19:59:46 +0200
+
aptitude (0.4.1-1) unstable; urgency=low
* New upstream release. In addition to fixes pulled into previous
only in patch2:
unchanged:
--- aptitude-0.4.1.orig/src/generic/util/threads.h
+++ aptitude-0.4.1/src/generic/util/threads.h
@@ -586,7 +586,7 @@
* performed.
*/
template<typename Mutator>
- void box::update(const Mutator &m);
+ void update(const Mutator &m);
};
/** A box specialized for 'void'; may make it easier to write
@@ -621,7 +621,7 @@
bool timed_put(const timespec &until);
template<typename Mutator>
- void box::update(const Mutator &m)
+ void update(const Mutator &m)
{
take();
try
only in patch2:
unchanged:
--- aptitude-0.4.1.orig/src/generic/apt/aptitudepolicy.h
+++ aptitude-0.4.1/src/generic/apt/aptitudepolicy.h
@@ -17,7 +17,7 @@
class aptitudePolicy:public pkgPolicy
{
public:
- aptitudePolicy::aptitudePolicy(pkgCache *Owner)
+ aptitudePolicy(pkgCache *Owner)
:pkgPolicy(Owner) {}
bool IsImportantDep(pkgCache::DepIterator dep);
only in patch2:
unchanged:
--- aptitude-0.4.1.orig/src/vscreen/vs_menubar.cc
+++ aptitude-0.4.1/src/vscreen/vs_menubar.cc
@@ -309,9 +309,9 @@
}
// Expand the width as needed to account for active menus.
- for(activemenulist::iterator i=active_menus.begin(), num=0;
+ for(activemenulist::iterator i=active_menus.begin();
i!=active_menus.end();
- i++, num++)
+ i++)
{
int menux=0;
@@ -345,9 +345,9 @@
int h=always_visible?1:0;
- for(activemenulist::iterator i=active_menus.begin(), num=0;
+ for(activemenulist::iterator i=active_menus.begin();
i!=active_menus.end();
- i++, num++)
+ i++)
h=max(h, 1+(*i)->height_request(w));
if(subwidget.valid())
only in patch2:
unchanged:
--- aptitude-0.4.1.orig/src/vscreen/vs_stacked.h
+++ aptitude-0.4.1/src/vscreen/vs_stacked.h
@@ -75,7 +75,7 @@
void dispatch_mouse(short id, int x, int y, int z, mmask_t bstate);
- vs_widget_ref vs_stacked::get_focus();
+ vs_widget_ref get_focus();
void show_all();
only in patch2:
unchanged:
--- aptitude-0.4.1.orig/src/vscreen/vs_table.h
+++ aptitude-0.4.1/src/vscreen/vs_table.h
@@ -123,15 +123,15 @@
*/
void get_col_contents(std::vector<std::vector<child_info *> > col_contents);
- void vs_table::alloc_ideal_widths(std::vector<int> &col_sizes);
- void vs_table::expand_widths(std::vector<int> &col_sizes, int target_w);
- void vs_table::shrink_widths(std::vector<int> &col_sizes, int target_w);
- void vs_table::alloc_ideal_heights(std::vector<int> &row_sizes,
- const std::vector<int> &col_sizes);
- void vs_table::expand_heights(std::vector<int> &row_sizes, int target_h);
- void vs_table::shrink_heights(std::vector<int> &row_sizes, int target_h);
- void vs_table::alloc_child_sizes(const std::vector<int> &col_sizes,
- const std::vector<int> &row_sizes);
+ void alloc_ideal_widths(std::vector<int> &col_sizes);
+ void expand_widths(std::vector<int> &col_sizes, int target_w);
+ void shrink_widths(std::vector<int> &col_sizes, int target_w);
+ void alloc_ideal_heights(std::vector<int> &row_sizes,
+ const std::vector<int> &col_sizes);
+ void expand_heights(std::vector<int> &row_sizes, int target_h);
+ void shrink_heights(std::vector<int> &row_sizes, int target_h);
+ void alloc_child_sizes(const std::vector<int> &col_sizes,
+ const std::vector<int> &row_sizes);
only in patch2:
unchanged:
--- aptitude-0.4.1.orig/src/vscreen/vs_tree.h
+++ aptitude-0.4.1/src/vscreen/vs_tree.h
@@ -141,8 +141,8 @@
*/
int height_request(int w);
- bool vs_tree::get_cursorvisible();
- point vs_tree::get_cursorloc();
+ bool get_cursorvisible();
+ point get_cursorloc();
virtual bool focus_me() {return true;}
virtual void paint(const style &st);
virtual void dispatch_mouse(short id, int x, int y, int z, mmask_t bstate);
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
