summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules8
-rw-r--r--debian/shotwell.docs2
4 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 6c4074e..d664696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
shotwell (0.30.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ - Switch to buildsystem meson:
+ + debian/control: Add gnome-pkg-tools, meson and ninja-build to
+ Build-Depends.
+ + debian/rules: Add --buildsystem=meson --with gnome,
+ remove override_dh_auto_configure and add override_dh_gnome_clean.
+ - debian/shotwell.docs: change README to README.md.
-- Jörg Frings-Fürst <debian@jff.email> Sun, 30 Sep 2018 14:09:47 +0200
diff --git a/debian/control b/debian/control
index 14f05b8..4edf5b5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
debhelper (>= 11),
desktop-file-utils,
gnome-doc-utils,
+ gnome-pkg-tools,
itstool,
libappstream-glib-dev,
libexif-dev (>= 0.6.16),
@@ -28,6 +29,8 @@ Build-Depends:
libsqlite3-dev (>= 3.5.9),
libwebkit2gtk-4.0-dev,
libxml2 (>= 2.6.32),
+ meson,
+ ninja-build,
valac (>= 0.22.0)
Standards-Version: 4.1.5
Homepage: https://wiki.gnome.org/Apps/Shotwell
diff --git a/debian/rules b/debian/rules
index 7b659ca..1a0e71d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,10 @@ export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)")
%:
- dh $@
+ dh $@ --buildsystem=meson --with gnome
-override_dh_auto_configure:
- dh_auto_configure -- --prefix=/usr \
- --libexec=/usr/lib \
- --disable-schemas-compile
+override_dh_gnome_clean:
+ dh_gnome_clean --no-control
override_dh_install:
dh_install
diff --git a/debian/shotwell.docs b/debian/shotwell.docs
index abd24b0..b718ec9 100644
--- a/debian/shotwell.docs
+++ b/debian/shotwell.docs
@@ -1,3 +1,3 @@
-README
+README.md
THANKS
NEWS