diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 12 |
5 files changed, 20 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e95ad62 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.bzr +.bzrignore +.pc +debian/files diff --git a/debian/changelog b/debian/changelog index 65d2d04..f33a0b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -simple-scan (3.24.0-1) UNRELEASED; urgency=medium +simple-scan (3.25.1-1) UNRELEASED; urgency=medium * New upstream release: - Updated translations. - * Refresh debian/patches/0005-zlib.patch. * New README.source to explain the branching model used. + * Switch buildsystem to meson: + + debian/control: + - Add meson to Build-Depends. + - Remove dh-autoreconf from Build-Depends. + + debian/rules: + - Remove the --with=autoreconf parameter. + - Remove override_dh_autoreconf section. + + Remove useless debian/patches/0005-zlib.patch. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 03 Jan 2017 04:33:58 +0100 diff --git a/debian/control b/debian/control index baf7021..4f21af3 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> Standards-Version: 3.9.8 Build-Depends: debhelper (>= 10), - dh-autoreconf, gnome-pkg-tools (>= 0.10), libcairo2-dev, libcolord-dev, @@ -18,6 +17,7 @@ Build-Depends: libsane-dev, librsvg2-dev, libxml2-utils, + meson, python-scour, valac (>= 0.22), yelp-tools, diff --git a/debian/patches/series b/debian/patches/series index 74172d5..7d8faf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ #0100-typos.patch -0005-zlib.patch +#0005-zlib.patch diff --git a/debian/rules b/debian/rules index 9eec217..21b23e5 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,10 @@ # - remove gcc-6 comments # - remove override_dh_auto_build # +# 2017-07-16 Jörg Frings-Fürst <debian@jff-webhosting.net> +# +# - switch to meson + # # Hardening @@ -28,13 +32,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with=autoreconf,scour - -# Autoreconf due to 01_lpi.patch -override_dh_autoreconf: - [ -e gnome-doc-utils.make ] || \ - ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make - dh_autoreconf + dh $@ --with=scour override_dh_auto_clean: dh_auto_clean |