From d732af302a16c78123442a18b4a3e4cd1fd74da4 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Fri, 3 May 2024 14:12:07 +0200 Subject: [PATCH] New upstream release and debhelper conversion * New upstream release * Add myself as Uploader * Replace cdbs by debhelper as the Debian build helper. --- debian/changelog | 8 ++++++++ debian/compat | 1 - debian/control | 14 ++++++-------- debian/dirs | 1 - debian/rules | 36 +++++++----------------------------- 5 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 6c3e008..728a1a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vym (2.9.22-1) UNRELEASED; urgency=medium + + * New upstream release + * Add myself as Uploader + * Replace cdbs by debhelper as the Debian build helper. + + -- Sven Hoexter Fri, 03 May 2024 13:58:54 +0200 + vym (2.6.11-3) unstable; urgency=medium * Add missing Build-Depends: qt5-qmake:native for using lrelease. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 13457c6..d4a4039 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,13 @@ Source: vym Section: kde Priority: optional Maintainer: Pierre Chifflier -Build-Depends: debhelper (>= 9), - dpkg-dev (>= 1.16.1~), - cdbs (>= 0.4.41), +Uploaders: Sven Hoexter +Build-Depends: debhelper-compat (=13), qtbase5-dev, - qttools5-dev-tools, - libqt5svg5-dev, - patchutils, - qt5-qmake:native, - quilt + qttools5-dev, + qtscript5-dev, + libdbus-1-dev, + libqt5svg5-dev Standards-Version: 4.1.4 Homepage: http://www.insilmaril.de/vym/ diff --git a/debian/dirs b/debian/dirs index 9e4d5d7..6d54665 100644 --- a/debian/dirs +++ b/debian/dirs @@ -2,6 +2,5 @@ usr/bin usr/share usr/share/doc usr/share/vym -usr/share/vym/lang usr/share/applications usr/share/pixmaps diff --git a/debian/rules b/debian/rules index e5889f7..4c0d3dd 100755 --- a/debian/rules +++ b/debian/rules @@ -2,38 +2,16 @@ DEB_COMPRESS_EXCLUDE = vym.pdf -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/quilt/quilt.make -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/qmake.mk - export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall -include /usr/share/dpkg/buildflags.mk - export QT_SELECT = 5 -DEB_QMAKE_ARGS = "DATADIR=/usr/share" - -DEB_BUILD_PARALLEL = 1 - -clean:: - rm -f lang/vym.*.qm - rm -f vym - -common-configure-arch:: - lrelease vym.pro +%: + dh $@ -$(DEB_BUILDDIR)/Makefile: - dh_auto_configure --buildsystem=qmake --builddirectory=$(DEB_BUILDDIR) -- $(DEB_QMAKE_ARGS) +override_dh_auto_configure: + dh_auto_configure -- \ + -DCMAKE_INSTALL_DATAROOTDIR="share/vym" \ + -DCMAKE_INSTALL_MANDIR="share/man/man1" \ + -DCMAKE_INSTALL_DOCDIR="share/vym" -common-install-arch:: - install -m 644 debian/vym.desktop debian/vym/usr/share/applications/vym.desktop - install -m 0644 icons/vym.png $(CURDIR)/debian/vym/usr/share/pixmaps/ - install -m 0644 lang/*.qm $(CURDIR)/debian/vym/usr/share/vym/lang/ - mv $(CURDIR)/debian/vym/usr/share/vym/demos $(CURDIR)/debian/vym/usr/share/doc/vym - chmod 644 $(CURDIR)/debian/vym/usr/share/vym/icons/vym.ico - rm -f $(CURDIR)/debian/vym/usr/share/vym/scripts/vym2txt.sh - rm -f $(CURDIR)/debian/vym/usr/share/vym/scripts/vym2html.sh - mkdir -p $(CURDIR)/debian/vym/usr/share/vym/doc/ - dh_link /usr/share/vym/icons/vym.png /usr/share/pixmaps/vym.png -- 2.39.5