From 21e3d6f00df510b6559248a0943b4701f7523d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 19 Mar 2018 20:51:02 +0100 Subject: Migrate to debhelper 11 --- .pc/.quilt_patches | 1 + .pc/.quilt_series | 1 + .pc/.version | 1 + debian/changelog | 5 ++++- debian/compat | 2 +- debian/control | 6 +++--- debian/patches/series | 2 +- debian/xtrkcad.install | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 .pc/.quilt_patches create mode 100644 .pc/.quilt_series create mode 100644 .pc/.version diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches new file mode 100644 index 0000000..6857a8d --- /dev/null +++ b/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series new file mode 100644 index 0000000..c206706 --- /dev/null +++ b/.pc/.quilt_series @@ -0,0 +1 @@ +series diff --git a/.pc/.version b/.pc/.version new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/.pc/.version @@ -0,0 +1 @@ +2 diff --git a/debian/changelog b/debian/changelog index 06bee36..49eba98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xtrkcad (1:4.3.0-1) unstable; urgency=medium +xtrkcad (1:5.1.0-1) unstable; urgency=medium [ Jörg Frings-Fürst ] * New upstream release. @@ -16,6 +16,9 @@ xtrkcad (1:4.3.0-1) unstable; urgency=medium * Declare compliance with Debian Policy 4.0.0. (No changes needed). * New debian/patches/0001-webkit.patch (Closes: #790221): - Change from outdated libwebkitgtk-1.0-0 to libwebkitgtk-3.0-0. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Sun, 02 Jul 2017 17:36:42 +0200 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 2c1f89d..4abe221 100644 --- a/debian/control +++ b/debian/control @@ -7,9 +7,9 @@ Uploaders: Jörg Frings-Fürst Build-Depends: cmake, - debhelper (>= 10), - libgtk-3-dev, -# libwebkitgtk-3.0-dev + debhelper (>= 11), + libgtk2.0-dev, +#libwebkitgtk-3.0-dev Standards-Version: 4.0.0 Homepage: http://xtrkcad.org/ Vcs-Git: git://anonscm.debian.org/collab-maint/xtrkcad.git diff --git a/debian/patches/series b/debian/patches/series index 73eb1c8..85c4b65 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ #1.diff -0100-gtk.patch +#0100-gtk.patch #0001-webkit.patch diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install index fd092b8..37d3df4 100644 --- a/debian/xtrkcad.install +++ b/debian/xtrkcad.install @@ -1,4 +1,4 @@ debian/xtrkcad.desktop usr/share/applications -usr/share/xtrkcad/Readme.txt usr/share/doc/xtrkcad +#usr/share/xtrkcad/Readme.txt usr/share/doc/xtrkcad usr/share/xtrkcad/logo.bmp usr/share/doc/xtrkcad usr/bin/* -- cgit v1.2.3