Tue Aug 9 17:28:15 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * debian/patches/series:
          Updated because of removed files

        * debian/patches/16-ace-inet-pkgconfig-files.diff:
        * debian/patches/prevent_doxygen_ace_manpages.diff:
          Removed these files, integrated into trunk

4 files changed, 9 insertions, 72 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6c2242dc4cb..96404d79cce 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Tue Aug  9 17:28:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debian/patches/series:
+          Updated because of removed files
+
+        * debian/patches/16-ace-inet-pkgconfig-files.diff:
+        * debian/patches/prevent_doxygen_ace_manpages.diff:
+          Removed these files, integrated into trunk
+
 Tue Aug  9 17:17:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/os_include/os_dlfcn.h:
diff --git a/ACE/debian/patches/16-ace-inet-pkgconfig-files.diff b/ACE/debian/patches/16-ace-inet-pkgconfig-files.diff
deleted file mode 100644
index 3af661a8306..00000000000
--- a/ACE/debian/patches/16-ace-inet-pkgconfig-files.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: generate pkg-config files for libACE_INet and libACE_INet_SSL
- They are missing upstream.
-Forwarded: needed
-Author: Pau Garcia i Quiles <pgquiles@elpauer.org>
-Last-Update: 2011-02-19
-
---- a/protocols/ace/INet/ACE_INet.pc.in
-+++ b/protocols/ace/INet/ACE_INet.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: ACE_INet
-+Description: ACE INet Client Protocols Library
-+Requires: ACE
-+Version: @VERSION@
-+Libs: -L${libdir} -lACE_INet
-+Cflags: -I${includedir}
---- a/protocols/ace/INet/ACE_INet_SSL.pc.in
-+++ b/protocols/ace/INet/ACE_INet_SSL.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: ACE_INet_SSL
-+Description: ACE INet Client Protocols With SSL Library
-+Requires: ACE_SSL
-+Version: @VERSION@
-+Libs: -L${libdir} -lACE_INet_SSL
-+Cflags: -I${includedir}
---- a/protocols/ace/INet/inet.mpc
-+++ b/protocols/ace/INet/inet.mpc
-@@ -54,6 +54,11 @@ project(INet) : acelib, ace_output, inst
-   specific {
-     install_dir = ace/INet
-   }
-+
-+  Pkgconfig_Files {
-+    ACE_INet.pc.in
-+  }
-+
- }
- 
- // This project will be generated with and without ssl=1 feature
---- a/protocols/ace/INet/inet_ssl.mpc
-+++ b/protocols/ace/INet/inet_ssl.mpc
-@@ -25,4 +25,9 @@ project(INet_SSL) : acelib, ace_output,
-   specific {
-     install_dir = ace/INet
-   }
-+
-+  Pkgconfig_Files {
-+    ACE_INet_SSL.pc.in
-+  }
-+
- }
diff --git a/ACE/debian/patches/prevent_doxygen_ace_manpages.diff b/ACE/debian/patches/prevent_doxygen_ace_manpages.diff
deleted file mode 100644
index 8669c4e9092..00000000000
--- a/ACE/debian/patches/prevent_doxygen_ace_manpages.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- pkg-ace.orig/bin/generate_doxygen.pl
-+++ pkg-ace/bin/generate_doxygen.pl
-@@ -44,7 +44,6 @@
- }
- 
- @ACE_DOCS = ('ace',
--             'ace_man',
-              'ace_rmcast',
-              'ace_ssl',
-              'ace_qos',
diff --git a/ACE/debian/patches/series b/ACE/debian/patches/series
index c016a5360a0..c64bad37c0d 100644
--- a/ACE/debian/patches/series
+++ b/ACE/debian/patches/series
@@ -1,7 +1,5 @@
 reduce-doxygen-doc.diff
-prevent_doxygen_ace_manpages.diff
 15-fix-lzo-flags.diff
-16-ace-inet-pkgconfig-files.diff
 20-versioned_libs.diff
 34-bts386713.diff
 35_disable_sslv2.diff