diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:39:10 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:39:10 +0100 |
commit | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (patch) | |
tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 | |
parent | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (diff) | |
parent | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff) |
Merge tag '0.26.4-1' into develop
New upstream release
-rw-r--r-- | .bzrignore | 3 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 0000000..2386f62 --- /dev/null +++ b/.bzrignore @@ -0,0 +1,3 @@ +.git +**/.git +**/.pc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c6fbd72 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.bzr +.bzrignore +.pc +debian/files
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index a092bd7..ee3b059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -shotwell (0.26.4-1) UNRELEASED; urgency=medium +shotwell (0.26.4-1) unstable; urgency=medium - * New upstream release (Closes: #855681, Closes: #841859). + * New upstream release (Closes: #855681, #841859, #870027): - debian/control: Add new appstream-util, libappstream-glib-dev and libgdata-dev to Build-Depends. - debian/shotwell.install: Drop now empty directory usr/share/appdata. @@ -26,12 +26,12 @@ shotwell (0.26.4-1) UNRELEASED; urgency=medium - Remove trailing white spaces. * debian/watch: Rewrite to find only stable releases. - * Declare compliance with Debian Policy 4.1.1 (No changes needed). + * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). * Change to my new email-address: - debian/control, - debian/copyright. - -- Jörg Frings-Fürst <debian@jff.email> Wed, 22 Mar 2017 06:51:19 +0100 + -- Jörg Frings-Fürst <debian@jff.email> Fri, 15 Dec 2017 11:52:17 +0100 shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium diff --git a/debian/control b/debian/control index c99f7bb..2846a52 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), valac (>= 0.22.0) -Standards-Version: 4.1.1 +Standards-Version: 4.1.2.0 Homepage: https://wiki.gnome.org/Apps/Shotwell Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ |