misc fixes

Author: koppi

debian/compat

@@ -1 +1 @@
-10
+12

debian/control

@@ -2,9 +2,8 @@ Source: qgcoder
 Section: misc
 Priority: optional
 Maintainer: Jakob Flierl <jakob.flierl@gmail.com>
-Uploaders: Jakob Flierl <jakob.flierl@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), automake, libtool, qt5-qmake, qtbase5-dev, libqglviewer-dev-qt5, freeglut3-dev, libglew-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 12~), automake, libtool, qt5-qmake, qtbase5-dev, libqglviewer-dev-qt5, freeglut3-dev, libglew-dev, libqgcodeeditor-qt5-dev
+Standards-Version: 4.6.0
 Homepage: https://github.com/QGCoder
 Vcs-Git: git://github.com/QGCoder/qgcoder
 Vcs-Browser: https://github.com/QGCoder/qgcoder

debian/rules

@@ -36,7 +36,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/qgcoder install
@@ -55,10 +55,10 @@ binary-indep: build install
 	dh_testdir
 	dh_testroot
 #	dh_installchangelogs ChangeLog
-	dh_installdocs -i
-	dh_install -i
-	dh_installman -i
-	dh_compress -i --exclude=.cpp --exclude=.pri
+	dh_installdocs
+	dh_install
+	dh_installman
+	dh_compress --exclude=.cpp --exclude=.pri
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol
@@ -70,14 +70,12 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installchangelogs ChangeLog
-	dh_installdocs -s README.md
-	dh_install -s --sourcedir=$(CURDIR)/debian/tmp
-#	dh_installman qgcoder.1
+	dh_installdocs README.md
 	dh_installmime
 	dh_installmenu
 	dh_link
 	dh_strip
-	dh_compress -s
+	dh_compress
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb

debian/source/format

@@ -0,0 +1 @@
+1.0

qgcoder.pro

@@ -14,12 +14,14 @@ MOC_DIR = .moc
 UI_DIR = .ui
 RCC_DIR = .rcc
 
-CONFIG += qgcodeeditor
+#CONFIG += qgcodeeditor
 CONFIG += qglviewer
 
 INCLUDEPATH += g2m
 INCLUDEPATH += /usr/include/QGCodeEditor
 
+#LIBS += -lQGCodeEditor
+
 HEADERS     = \
     mainwin.h \
     view.h \
@@ -62,10 +64,13 @@ link_pkgconfig {
       LIBS += -lQGLViewer-qt5 -lGLEW -lGLU -lGL -lglut
     }
     contains(LSB_RELEASE_REL, 24.04) : {
-      LIBS += -lQGLViewer-qt5 -lGLEW -lGLU -lGL -lglut
+      LIBS += -lQGLViewer-qt5 -lGLEW -lGLU -lGL -lglut -lqgcodeeditor_qt5
+    }
+    contains(LSB_RELEASE_REL, 26.04) : {
+      LIBS += -lQGLViewer-qt5 -lGLEW -lGLU -lGL -lglut -lqgcodeeditor_qt5
     }
   } else {
-    LIBS += -lQGLViewer-qt5 -lGLEW -lGLU -lGL -lglut
+    LIBS += -lQGLViewer-qt5 -lGLEW -lGLU -lGL -lglut -lqgcodeeditor_qt5
   }
 }
 

view.cpp

@@ -134,7 +134,7 @@ void View::init() {
     setFPSIsDisplayed();
     setAxisIsDrawn();
 
-    setMouseBinding(Qt::AltModifier, Qt::RightButton, SHOW_ENTIRE_SCENE, true, Qt::MidButton);
+    setMouseBinding(Qt::AltModifier, Qt::RightButton, SHOW_ENTIRE_SCENE, true, Qt::MiddleButton);
 
     clear();