Remove inclusion of <boost/shared_ptr.hpp> and build-dependency on Boost

I formerly used boost::shared_ptr<> to keep track of temporary files,
but have not done so since before version 1.0!

diff --git a/ChangeLog b/ChangeLog
index 5cb546ddd8fae3920878747a92e4c4908735ebc6..ae1f074acac4ba60c00c429af2e0fc5494ba5e68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+videolink (1.2.6) UNRELEASED; urgency=low
+
+  * Remove inclusion of Boost header and build-dependency on Boost as
+    these are no longer used
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 24 Feb 2009 00:28:21 +0000
+

 videolink (1.2.5) unstable; urgency=low
 
   * Added workaround for XULRunner 1.9's requirement of 16-bit wchar_t
 videolink (1.2.5) unstable; urgency=low
 
   * Added workaround for XULRunner 1.9's requirement of 16-bit wchar_t

diff --git a/INSTALL b/INSTALL
index e58abecddc2425db013a9d16110a189253707bef..f550b833100e7b1b4eae0088bb85db843d2efe03 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -4,11 +4,11 @@ Building VideoLink
 VideoLink is written in C++ and requires a recent C++ compiler
 e.g. g++ 3.3.
 
 VideoLink is written in C++ and requires a recent C++ compiler
 e.g. g++ 3.3.
 

-It requires headers and libraries for Boost, gtkmm, Mozilla or
-XULRunner, and expat.  I am currently building and testing it with
-Boost 1.33, gtkmm 2.8.8, XULRunner 1.8.0.11 and expat 1.95.8.  It may
-well work with earlier or later versions of these, but Mozilla 1.7
-and gtkmm 2.0 and 2.2 are no longer supported.
+It requires headers and libraries for gtkmm, Mozilla or XULRunner, and
+expat.  I am currently building and testing it with gtkmm 2.8.8,
+XULRunner 1.8.0.11 and expat 1.95.8.  It may well work with earlier or
+later versions of these, but Mozilla 1.7 and gtkmm 2.0 and 2.2 are no
+longer supported.

 
 I use Debian Linux and have not yet attempted to build it on other
 systems, but it should work on most modern Unix-like systems.
 
 I use Debian Linux and have not yet attempted to build it on other
 systems, but it should work on most modern Unix-like systems.

diff --git a/debian/changelog b/debian/changelog
index c2390d0d4e6bc27bad1d78070f67908009ff2b31..dab315d2fed83c969e4e68d88ac900831bd72b60 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+videolink (1.2.6-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    - Remove unnecessary build-dependency on libboost-dev
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 24 Feb 2009 00:28:21 +0000
+

 videolink (1.2.5-1) unstable; urgency=low
 
   * New upstream version
 videolink (1.2.5-1) unstable; urgency=low
 
   * New upstream version

diff --git a/debian/control b/debian/control
index e169d74a161f17fff7d30f69cc4c8f87ce9a36c2..e2e42ccee34e52b4361f8f98cb4fcf5fa2706bd1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: videolink
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: contrib/graphics
 Priority: extra
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 Section: contrib/graphics
 Priority: extra

-Build-Depends: debhelper (>=4), libboost-dev, libgtkmm-2.4-dev, xulrunner-dev, libexpat1-dev
+Build-Depends: debhelper (>=4), libgtkmm-2.4-dev, xulrunner-dev, libexpat1-dev

 Standards-Version: 3.7.2
 
 Package: videolink
 Standards-Version: 3.7.2
 
 Package: videolink

diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index e28659e1be467c225738b9044aa7c21b326eee8a..4fcad482b0d97e5f462f7debd318c5da2a460c3a 100644 (file)
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -1,6 +1,7 @@
 // Copyright 2005-8 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 // Copyright 2005-8 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 

+#include <cassert>

 #include <cerrno>
 #include <cstring>
 #include <fstream>
 #include <cerrno>
 #include <cstring>
 #include <fstream>

diff --git a/generate_dvd.hpp b/generate_dvd.hpp
index df6877560c3c1437062a7c29497af8a2b473de12..e1e3e3cf4f7f8bd6d4a3ea95e855239c89e3941b 100644 (file)
--- a/generate_dvd.hpp
+++ b/generate_dvd.hpp
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include <boost/shared_ptr.hpp>
-

 #include <glibmm/refptr.h>
 
 #include "geometry.hpp"
 #include <glibmm/refptr.h>
 
 #include "geometry.hpp"