[Pkg-ace-commits] [pkg-ace] r734 - in trunk/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2010-12-30 20:31:19 +0000 (Thu, 30 Dec 2010)
New Revision: 734

Added:
   trunk/debian/patches/13-add-QtReactor_export.h.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/patches/11-promote-QtResource-to-qt4.dpatch
Log:
drop support for Qt3. Add missing header file for libace-qtreactor-dev


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-12-29 21:59:01 UTC (rev 733)
+++ trunk/debian/changelog	2010-12-30 20:31:19 UTC (rev 734)
@@ -31,10 +31,12 @@
       - 90-patch-mpc-basedir.dpatch
     o new patches or scripts:
       - 12-add-DESTDIR-to-MPC.dpatch, to add and use DESTDIR in make install
+      - 13-add-QtReactor_export.h.dpatch, to add a missing header in
+        libace-qtreactor-dev package.
       - fix_doxygen.sh, to regenerate the patch for Doxygen reduction.
   * Bump Standards-Version: to 3.9.1.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 21 Dec 2010 21:30:38 +0100
+ -- Thomas Girard <thomas.g.girard at free.fr>  Thu, 30 Dec 2010 20:56:08 +0100
 
 ace (5.7.7-4) unstable; urgency=high
   [ Marek Brudka ]

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2010-12-29 21:59:01 UTC (rev 733)
+++ trunk/debian/patches/00list	2010-12-30 20:31:19 UTC (rev 734)
@@ -1,5 +1,6 @@
 11-promote-QtResource-to-qt4.dpatch
 12-add-DESTDIR-to-MPC.dpatch
+13-add-QtReactor_export.h.dpatch
 14-fix-tcl-flags.dpatch
 15-fix-lzo-flags.dpatch
 20-versioned_libs.dpatch

Modified: trunk/debian/patches/11-promote-QtResource-to-qt4.dpatch
===================================================================
--- trunk/debian/patches/11-promote-QtResource-to-qt4.dpatch	2010-12-29 21:59:01 UTC (rev 733)
+++ trunk/debian/patches/11-promote-QtResource-to-qt4.dpatch	2010-12-30 20:31:19 UTC (rev 734)
@@ -15,3 +15,33 @@
    sharedname   = TAO_QtResource
    dynamicflags += TAO_QTRESOURCE_BUILD_DLL
  
+--- ACE_wrappers/ace/QtReactor/ace_qt3reactor.mpc	2010-09-17 22:16:53.000000000 +0200
++++ /dev/null	2010-12-30 21:38:16.809455563 +0100
+@@ -1,27 +0,0 @@
+-//  -*- MPC -*- now wouldn't this be cool...
+-// $Id: ace_qt3reactor.mpc 91839 2010-09-17 20:16:53Z mitza $
+-
+-project(ACE_Qt3Reactor_moc) : acedefaults, ace_qt3 {
+-  custom_only = 1
+-  MOC_Files {
+-    QtReactor.h
+-  }
+-}
+-
+-project(ACE_Qt3Reactor) : acedefaults, install, acelib, ace_output, ace_qt3 {
+-  after       += ACE_Qt3Reactor_moc
+-  sharedname   = ACE_QtReactor
+-  dynamicflags += ACE_QTREACTOR_BUILD_DLL
+-
+-  MOC_Files {
+-  }
+-
+-  Source_Files {
+-    QtReactor_moc.cpp
+-    QtReactor.cpp
+-  }
+-
+-  specific {
+-    install_dir = ace/QtReactor
+-  }
+-}

Added: trunk/debian/patches/13-add-QtReactor_export.h.dpatch
===================================================================
--- trunk/debian/patches/13-add-QtReactor_export.h.dpatch	                        (rev 0)
+++ trunk/debian/patches/13-add-QtReactor_export.h.dpatch	2010-12-30 20:31:19 UTC (rev 734)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-add-QtReactor_export.h.dpatch
+##
+## DP: add missing header to libace-qtreactor-dev.
+
+ at DPATCH@
+--- ACE_wrappers.orig/ace/QtReactor/ace_qt4reactor.mpc	2010-09-17 22:16:53.000000000 +0200
++++ ACE_wrappers/ace/QtReactor/ace_qt4reactor.mpc	2010-12-30 20:49:42.598080555 +0100
+@@ -16,6 +16,10 @@
+   MOC_Files {
+   }
+ 
++  Header_Files {
++    ACE_QtReactor_export.h
++  }
++
+   Source_Files {
+     QtReactor_moc.cpp
+     QtReactor.cpp