diff --git a/.gitignore b/.gitignore index d0f731ed..7aca3f2a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,12 @@ build* # ignore mac temporal files .DS_Store .idea -cmake-build*/ \ No newline at end of file +cmake-build*/ +*.substvars +debian/tmp +debian/files +debian/stamp* +debian/stamp* +debian/.debhelper +debian/libopenmesh* +obj-x86_64-linux-gnu diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 871ee8a8..a23585cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1034,4 +1034,17 @@ trigger_openmesh-python-rebuild: script: - "curl -X POST -F token=b63ed804ada51d7d1ffe5d6ea0dfa2 -F ref=track-OM-master https://www.graphics.rwth-aachen.de:9000/api/v4/projects/1024/trigger/pipeline" +Debian: + stage: deploy + only: + - master + script: dpkg-buildpackage + tags: + - Linux + - stretch + dependencies: [] + artifacts: + paths: + - libopenmesh*.deb + diff --git a/CI/gitlab-ci/ci-master.yml b/CI/gitlab-ci/ci-master.yml index d107ca40..388e7571 100644 --- a/CI/gitlab-ci/ci-master.yml +++ b/CI/gitlab-ci/ci-master.yml @@ -45,3 +45,16 @@ trigger_openmesh-python-rebuild: script: - "curl -X POST -F token=b63ed804ada51d7d1ffe5d6ea0dfa2 -F ref=track-OM-master https://www.graphics.rwth-aachen.de:9000/api/v4/projects/1024/trigger/pipeline" +Debian: + stage: deploy + only: + - master + script: dpkg-buildpackage + tags: + - Linux + - stretch + dependencies: [] + artifacts: + paths: + - libopenmesh*.deb + diff --git a/debian/changelog b/debian/changelog index 0dd1d85a..0512ff16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openmesh (9.1) bullseye; urgency=medium + + * New uppstream version + + -- Jan Moebius Mon, 11 Apr 2022 09:47:33 +0200 + openmesh (2.0-0~ppa1~maverick1) maverick; urgency=low * First maverick version of the official openmesh v2 release. diff --git a/debian/compat b/debian/compat index 7f8f011e..f599e28b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/control b/debian/control index 3e08a5e6..b8e73ddf 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openmesh Section: libs Priority: optional Maintainer: Jean Pierre Charalambos -Build-Depends: cdbs, debhelper (>= 7), cmake, libqt4-dev, libqt4-opengl-dev, freeglut3-dev, libfreetype6-dev, libgomp1, doxygen +Build-Depends: cdbs, debhelper (>= 7), cmake, libqt5opengl5-dev, freeglut3-dev, libfreetype6-dev, libgomp1, doxygen Standards-Version: 3.9.1 Homepage: http://www.openmesh.org @@ -23,8 +23,8 @@ Description: OpenMesh is a generic and efficient data structure for representing Package: libopenmesh-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmesh (= ${binary:Version}), libqt4-dev, libqt4-opengl-dev, freeglut3-dev, libfreetype6-dev -Suggests: qt4-designer(>= 4.5), qt4-dev-tools (>= 4.5), libopenmesh-doc, libopenmesh-apps +Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmesh (= ${binary:Version}), libqt5opengl5-dev, freeglut3-dev, libfreetype6-dev +Suggests: libopenmesh-doc, libopenmesh-apps Description: OpenMesh is a generic and efficient data structure for representing and manipulating polygonal meshes. OpenMesh provides the following features: . diff --git a/debian/rules b/debian/rules index 4bc4bb6f..0f839415 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,11 @@ build/libopenmesh-doc:: cp -r $(DEB_BUILDDIR)/Build/share/OpenMesh/Doc/html debian/tmp/usr/share/doc/OpenMesh install/libopenmesh:: - ln -sf libOpenMeshCore.so.2.0 debian/tmp/usr/lib/OpenMesh/libOpenMeshCore.so.2 - ln -sf libOpenMeshTools.so.2.0 debian/tmp/usr/lib/OpenMesh/libOpenMeshTools.so.2 - dh_install -plibopenmesh debian/tmp/usr/lib/OpenMesh/lib*.so.* /usr/lib/ + dh_install -plibopenmesh debian/tmp/usr/lib/lib*.so.* /usr/lib/ install/libopenmesh-dev:: - dh_install -plibopenmesh-dev debian/tmp/usr/lib/OpenMesh/lib*.so /usr/lib/ - dh_install -plibopenmesh-dev debian/tmp/usr/lib/OpenMesh/lib*.a /usr/lib/ + dh_install -plibopenmesh-dev debian/tmp/usr/lib/lib*.so /usr/lib/ + dh_install -plibopenmesh-dev debian/tmp/usr/lib/lib*.a /usr/lib/ dh_install -plibopenmesh-dev --autodest debian/tmp/usr/include/OpenMesh install/libopenmesh-apps::