summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2019-12-29 12:41:37 +0100
committerJörg Frings-Fürst <debian@jff.email>2019-12-29 12:41:37 +0100
commit0d9f2606e676b2257d9d11c1d23058f1e3472f89 (patch)
tree1037936cb95251b53e972c8d94706172a5aade0d
parent6d050e13e9dbbeffdb45fc1c5b977b996d310981 (diff)
parent2047bc878cd296e6543591c1cf3a43fa1369d224 (diff)
Merge branch 'release/debian/0.30.7-2'debian/0.30.7-2
-rw-r--r--.gitignore2
-rw-r--r--debian/changelog10
-rw-r--r--debian/compat1
-rw-r--r--debian/control3
4 files changed, 13 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0ff0ae9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.pc
+debian/files
diff --git a/debian/changelog b/debian/changelog
index adb6c3e..0210750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+shotwell (0.30.7-2) unstable; urgency=medium
+
+ * debian/control: Remove outdated gnome-doc-utils from Build-Depends
+ (Closes: #945141, #945294).
+ * Switch to debhelper-compat:
+ - debian/control: Replace debhelper with debhelper-compat.
+ - Remove debian/compat.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sat, 28 Dec 2019 14:09:00 +0100
+
shotwell (0.30.7-1) unstable; urgency=medium
* New upstream release:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 745f9ae..1cc0b3c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,8 @@ Maintainer: Jörg Frings-Fürst <debian@jff.email>
Build-Depends:
appstream-util,
cmake,
- debhelper (>= 12),
+ debhelper-compat (= 12),
desktop-file-utils,
- gnome-doc-utils,
gnome-pkg-tools,
itstool,
libappstream-glib-dev,