[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-55-g5a53c50

Guo Yixuan culu.gyx at gmail.com
Sat Sep 22 16:09:27 UTC 2012


The following commit has been merged in the master branch:
commit 5a53c5024a4f6910cdcea68968b98ec214d985e8
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sun Sep 23 00:11:43 2012 +0800

    remove wxWidgets_observations.patch

diff --git a/debian/changelog b/debian/changelog
index 1fd0186..38bae18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.36+dfsg-2) UNRELEASED; urgency=low
+
+  * Removed some old patches (those not in series anymore).
+
+ -- Guo Yixuan <culu.gyx at gmail.com>  Sun, 23 Sep 2012 00:10:12 +0800
+
 boinc (7.0.36+dfsg-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/series b/debian/patches/series
index 7423651..fae66d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,7 +50,6 @@ some_extra_clang_warnings.patch
 dTotalGlobalMem.patch
 nvidia_mem_display_simplification.patch
 api_NULL_not_defined.patch
-#convinceRom#wxWidgets_observations.patch
 unlink_undefined.patch
 0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
 0002-re-enable-X11-screensaver-build.patch
diff --git a/debian/patches/wxWidgets_observations.patch b/debian/patches/wxWidgets_observations.patch
deleted file mode 100644
index d306630..0000000
--- a/debian/patches/wxWidgets_observations.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boinc/clientgui/BOINCGUIApp.h
-===================================================================
---- boinc.orig/clientgui/BOINCGUIApp.h	2012-05-07 00:45:29.061521189 +0200
-+++ boinc/clientgui/BOINCGUIApp.h	2012-05-07 00:46:34.000000000 +0200
-@@ -117,7 +117,7 @@
- 
- public:
- 
--    bool                OnInit();
-+    virtual bool        OnInit();
- 
-     wxLocale*           GetLocale()                 { return m_pLocale; }
-     CSkinManager*       GetSkinManager()            { return m_pSkinManager; }

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list