--- synaptic-0.36.orig/common/rpackagecache.cc
+++ synaptic-0.36/common/rpackagecache.cc
@@ -33,7 +33,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
-
+#include <cassert>
 
 bool RPackageCache::open(OpProgress &progress)
 {
--- synaptic-0.36.orig/common/rpackagelister.cc
+++ synaptic-0.36/common/rpackagelister.cc
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 #include <stdlib.h>
 #include <unistd.h>
 #include <map>
--- synaptic-0.36.orig/gtk/gtkpkgtree.cc
+++ synaptic-0.36/gtk/gtkpkgtree.cc
@@ -566,7 +566,7 @@
 //   tree<RPackageLister::pkgPair> *pkgTree;
 //   pkgTree = pkg_tree->_lister->getTreeOrganizer();
   
-  cout << "void gtk_pkg_tree_refresh(GtkPkgTree *pkg_tree)"<<endl;
+  //cout << "void gtk_pkg_tree_refresh(GtkPkgTree *pkg_tree)"<<endl;
 
 //   gtk_tree_model_foreach(GTK_TREE_MODEL(pkg_tree), 
 // 			 gtk_pkg_tree_changed, 
--- synaptic-0.36.orig/gtk/rgmainwindow.cc
+++ synaptic-0.36/gtk/rgmainwindow.cc
@@ -30,7 +30,7 @@
 #include "i18n.h"
 
 
-#include <assert.h>
+#include <cassert>
 #include <stdio.h>
 #include <ctype.h>
 #include <glade/glade.h>
--- synaptic-0.36.orig/gtk/rgsrcwindow.cc
+++ synaptic-0.36/gtk/rgsrcwindow.cc
@@ -1,5 +1,6 @@
 /* $Id: rgsrcwindow.cc,v 1.15 2003/01/23 13:29:49 mvogt Exp $ */
 #include <apt-pkg/error.h>
+#include <cassert>
 #include "rgsrcwindow.h"
 #include "config.h"
 #include "i18n.h"
--- synaptic-0.36.orig/gtk/rgvendorswindow.cc
+++ synaptic-0.36/gtk/rgvendorswindow.cc
@@ -1,4 +1,5 @@
 /* $Id: rgvendorswindow.cc,v 1.4 2002/12/06 08:16:40 mvogt Exp $ */
+#include <cassert>
 #include "rgvendorswindow.h"
 #include "rgsrcwindow.h"
 #include "config.h"
--- synaptic-0.36.orig/gtk/rgwindow.cc
+++ synaptic-0.36/gtk/rgwindow.cc
@@ -22,6 +22,7 @@
 
 
 #include<apt-pkg/fileutl.h>
+#include<cassert>
 #include "config.h"
 #include "i18n.h"
 #include "rgwindow.h"
--- synaptic-0.36.orig/data/Makefile.in
+++ synaptic-0.36/data/Makefile.in
@@ -105,7 +105,7 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-desktopdir = $(datadir)/gnome/apps/System
+desktopdir = $(datadir)/applications
 desktop_in_files = synaptic.desktop
 desktop_DATA = $(desktop_in_files)
 
--- synaptic-0.36.orig/data/Makefile.am
+++ synaptic-0.36/data/Makefile.am
@@ -1,4 +1,4 @@
-desktopdir       = $(datadir)/gnome/apps/System
+desktopdir       = $(datadir)/applications
 desktop_in_files = synaptic.desktop
 desktop_DATA     = $(desktop_in_files)
 
--- synaptic-0.36.orig/data/synaptic.desktop
+++ synaptic-0.36/data/synaptic.desktop
@@ -12,3 +12,4 @@
 Terminal=false
 MultipleArgs=false
 Type=Application
+Categories=GNOME;Application;System;