[SCM] analitza packaging branch, master, updated. debian/4.12.2-2
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Apr 29 14:20:02 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/analitza.git;a=commitdiff;h=739e792
The following commit has been merged in the master branch:
commit 739e792904648e07559224c5281e685637f2a4b3
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri Feb 7 00:31:49 2014 +0100
Remove patch: analitzaplot-armhf, applid by upstream
---
debian/changelog | 1 +
debian/patches/analitzaplot-armhf.patch | 48 ---------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ee37897..497363f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
analitza (4:4.12.2-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove patch: analitzaplot-armhf, applid by upstream
-- Maximiliano Curia <maxy at debian.org> Tue, 04 Feb 2014 19:23:48 +0100
diff --git a/debian/patches/analitzaplot-armhf.patch b/debian/patches/analitzaplot-armhf.patch
deleted file mode 100644
index 1d91cf0..0000000
--- a/debian/patches/analitzaplot-armhf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: analitza/analitzaplot/plotter3d.cpp
-===================================================================
---- analitza.orig/analitzaplot/plotter3d.cpp 2013-07-14 12:51:10.799543998 +0200
-+++ analitza/analitzaplot/plotter3d.cpp 2013-07-14 12:52:46.291730057 +0200
-@@ -142,6 +142,12 @@
- renderGL();
- }
-
-+// add overloaded functions which call the underlying OpenGL function
-+inline void glMultMatrix(const GLfloat *m) { glMultMatrixf(m); }
-+inline void glMultMatrix(const GLdouble *m) { glMultMatrixd(m); }
-+
-+inline void glMultMatrix(const QMatrix4x4 &m) { glMultMatrix(m.constData()); }
-+
- void Plotter3D::drawPlots()
- {
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-@@ -152,7 +158,7 @@
-
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
-- glMultMatrixd(m_rot.data());
-+ glMultMatrix(m_rot);
-
- // Object Drawing :
- glCallList(m_sceneObjects.value(Axes));
-@@ -396,6 +402,9 @@
- renderGL();
- }
-
-+inline void glGetModelMatrix(float *matrix) { glGetFloatv(GL_MODELVIEW_MATRIX, matrix); }
-+inline void glGetModelMatrix(double *matrix) { glGetDoublev(GL_MODELVIEW_MATRIX, matrix); }
-+
- void Plotter3D::rotate(int dx, int dy)
- {
- GLdouble ax = -dy;
-@@ -410,9 +419,9 @@
- m_rot.rotate(angle, m_rotFixed.normalized());
- renderGL();
- } else {
-- GLdouble matrix[16] = {0}; // model view matrix from current OpenGL state
-+ qreal matrix[16] = {0}; // model view matrix from current OpenGL state
-
-- glGetDoublev(GL_MODELVIEW_MATRIX, matrix);
-+ glGetModelMatrix(matrix);
-
- QMatrix4x4 matrix4(matrix);
- bool couldInvert;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index abca12f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-analitzaplot-armhf.patch
--
analitza packaging
More information about the pkg-kde-commits
mailing list