[yade] 05/06: Remove patches aplied by upstream.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository yade.

commit 38389f8e9e47a916e199468638a918146b0fed57
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Jun 25 20:43:41 2014 +0200

    Remove patches aplied by upstream.
---
 debian/patches/01_fix_ipython_1.0.patch            | 16 ----------
 ...tics.patch => 01_remove_google_analytics.patch} |  6 ++--
 debian/patches/03_increase_steps_in_test.patch     | 15 ---------
 debian/patches/04_fix_libqglviewer.patch           | 37 ----------------------
 debian/patches/series                              |  5 +--
 5 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/debian/patches/01_fix_ipython_1.0.patch b/debian/patches/01_fix_ipython_1.0.patch
deleted file mode 100644
index 174f3c0..0000000
--- a/debian/patches/01_fix_ipython_1.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix version definition for IPython>1.0.0
-Author: Anton Gladky <gladk at debian.org>
-Applied-Upstream: https://github.com/yade/trunk/commit/1186442aaa0f4a9a318b82b3ce72968ba333ca81
-Last-Update: 2014-01-14
-
---- yade-1.07.0.orig/py/runtime.py
-+++ yade-1.07.0/py/runtime.py
-@@ -7,7 +7,7 @@ hasDisplay=False
- # find out about which ipython version we use -- 0.10* and 0.11 are supported, but they have different internals
- import IPython
- try: # attempt to get numerical version
--	ipython_version=int(IPython.__version__.split('.',2)[1]) ## convert '0.10' to 10, '0.11.alpha1.bzr.r1223' to 11
-+	ipython_version=int(IPython.__version__.split('.')[0])*100 + int(IPython.__version__.split('.')[1])
- except ValueError:
- 	print 'WARN: unable to extract IPython version from %s, defaulting to 10'%(IPython.__version__)
- 	ipython_version=10
diff --git a/debian/patches/02_remove_google_analytics.patch b/debian/patches/01_remove_google_analytics.patch
similarity index 77%
rename from debian/patches/02_remove_google_analytics.patch
rename to debian/patches/01_remove_google_analytics.patch
index f882c43..dc6fd35 100644
--- a/debian/patches/02_remove_google_analytics.patch
+++ b/debian/patches/01_remove_google_analytics.patch
@@ -2,8 +2,10 @@ Description: remove google analytics script
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-01-14
 
---- yade-1.07.0.orig/doc/sphinx/templates/layout.html
-+++ yade-1.07.0/doc/sphinx/templates/layout.html
+Index: yade/doc/sphinx/templates/layout.html
+===================================================================
+--- yade.orig/doc/sphinx/templates/layout.html
++++ yade/doc/sphinx/templates/layout.html
 @@ -16,19 +16,6 @@
  {% endblock %}
  
diff --git a/debian/patches/03_increase_steps_in_test.patch b/debian/patches/03_increase_steps_in_test.patch
deleted file mode 100644
index 506863d..0000000
--- a/debian/patches/03_increase_steps_in_test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Increase number of steps in checkWeight.py
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-01-19
-
---- yade-1.07.0.orig/scripts/checks-and-tests/checks/checkWeight.py
-+++ yade-1.07.0/scripts/checks-and-tests/checks/checkWeight.py
-@@ -43,7 +43,7 @@ O.engines=[
- ]
- 
- 
--O.run(25000)
-+O.run(30000)
- O.wait()
- curForce = utils.sumForces(ids=floorId,direction=Vector3(0,0,1))*(-1)
- print ("Precalculated weight %f" % sphMass)
diff --git a/debian/patches/04_fix_libqglviewer.patch b/debian/patches/04_fix_libqglviewer.patch
deleted file mode 100644
index 1ebb7bf..0000000
--- a/debian/patches/04_fix_libqglviewer.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix compilation with libqglviewer>=2.5.1 
-Author: Anton Gladky <gladk at debian.org>
-Origin: https://github.com/yade/trunk/commit/01a9bfcec29f429932a5f4b5143e577b193d3103
-Last-Update: 2014-03-14
-
---- a/gui/qt4/GLViewer.hpp
-+++ b/gui/qt4/GLViewer.hpp
-@@ -9,6 +9,7 @@
- #include<boost/date_time/posix_time/posix_time.hpp>
- #endif 
- 
-+#include<QGLViewer/manipulatedFrame.h>
- #include<QGLViewer/qglviewer.h>
- #include<QGLViewer/constraint.h>
- #include<set>
---- a/gui/qt4/GLViewerMouse.cpp
-+++ b/gui/qt4/GLViewerMouse.cpp
-@@ -36,15 +36,17 @@
- #endif
- 
- void GLViewer::mouseMovesCamera(){
--  camera()->frame()->setWheelSensitivity(-1.0f);
-   
-   setWheelBinding(Qt::ShiftModifier , FRAME, ZOOM);
-   setWheelBinding(Qt::NoModifier, CAMERA, ZOOM);
- 
- #if QGLVIEWER_VERSION>=0x020500
-+	if(manipulatedFrame()==0) setManipulatedFrame(new qglviewer::ManipulatedFrame());
-+  manipulatedFrame()->setWheelSensitivity(-1.0f);
-   setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, SELECT);
-   
--  setMouseBinding(Qt::ShiftModifier, Qt::LeftButton | Qt::RightButton, FRAME, ZOOM);
-+  setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, FRAME, ZOOM);
-+  setMouseBinding(Qt::ShiftModifier, Qt::RightButton, FRAME, ZOOM);
-   setMouseBinding(Qt::ShiftModifier, Qt::MidButton, FRAME, TRANSLATE);
-   setMouseBinding(Qt::ShiftModifier, Qt::RightButton, FRAME, ROTATE);
-     
diff --git a/debian/patches/series b/debian/patches/series
index f23c43b..b4e6505 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01_fix_ipython_1.0.patch
-02_remove_google_analytics.patch
-03_increase_steps_in_test.patch 
-04_fix_libqglviewer.patch
+01_remove_google_analytics.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git