From 7f089b452a308f8b18712061d877e44407b3aa93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jun 2017 09:06:10 +0200 Subject: New debian/DEVELOP.debian --- debian/DEVELOP.Debian | 18 ++++++++++++++++++ debian/changelog | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 debian/DEVELOP.Debian (limited to 'debian') diff --git a/debian/DEVELOP.Debian b/debian/DEVELOP.Debian new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/DEVELOP.Debian @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 04c7b1f..99fa248 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -shotwell (0.26.1-1) UNRELEASED; urgency=medium +shotwell (0.26.2-1) UNRELEASED; urgency=medium * New upstream release (Closes: #855681). - debian/control: Add new appstream-util, libappstream-glib-dev and libgdata-dev to Build-Depends. + * New debian/DEVELOP.debian. -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 -- cgit v1.2.3 From 2f07126a7a7fe65f61dfc93ce7fa6457671c0ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jun 2017 10:28:47 +0200 Subject: Use the automatic debug symbol packages --- debian/changelog | 3 +++ debian/control | 18 ------------------ debian/rules | 13 +------------ 3 files changed, 4 insertions(+), 30 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 99fa248..25a73d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium - debian/control: Add new appstream-util, libappstream-glib-dev and libgdata-dev to Build-Depends. * New debian/DEVELOP.debian. + * Use the automatic debug symbol packages: + - Remove shotwell-dbg section from debian/control. + - Remove override_dh_strip and some lines on dh_install from debian/rules. -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/control b/debian/control index 02d320a..84843fb 100644 --- a/debian/control +++ b/debian/control @@ -69,21 +69,3 @@ Description: digital photo organizer - common files to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. . This package provides image files and documentation for Shotwell. - -Package: shotwell-dbg -Priority: extra -Section: debug -Architecture: linux-any -Depends: ${misc:Depends}, - shotwell (= ${binary:Version}) -Description: digital photo organizer - debugging symbols - Shotwell is a digital photo organizer designed for the GNOME desktop - environment. It allows you to import photos, pictures, images and videos - from disk or camera. Shotwell can organize them in collections and in other - various ways. The viewer shows them in full-window or fullscreen mode and - presents them as galleries or slideshows. The integrated editor can rotate, - flip, crop and tag the photos, adjust the colors und remove red eyes. Export - is possible to facebook, Flickr or Youtube to share with others. It is able - to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. - . - This package contains the debugging symbols for Shotwell. diff --git a/debian/rules b/debian/rules index f8d940b..4b0e1b1 100755 --- a/debian/rules +++ b/debian/rules @@ -10,18 +10,10 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") dh $@ override_dh_auto_configure: - ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile + ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile override_dh_install: dh_install - # Touch the generated C files with mtime of debian/changelog, - # find -type f -name '*.c' -exec touch -r $(CURDIR)/debian/changelog {} \; - # then install these C files required for debugging into the shotwell-dbg package. - mkdir -p debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source - find -type f -name '*.c' -exec cp --parent '{}' debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source/ ';' - cd debian/shotwell-dbg/usr/share/doc/shotwell-dbg && \ - tar --mode=go=rX,u+rw,a-s --mtime="$(B_DATE)" -cJf temp-source.tar.xz temp-source - rm -fr debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source # Remove unwanted la files rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la rm -f debian/shotwell/usr/lib/*.la @@ -29,9 +21,6 @@ override_dh_install: override_dh_installchangelogs: dh_installchangelogs NEWS -override_dh_strip: - dh_strip --dbg-package=shotwell-dbg - override_dh_compress: dh_compress -X.tar.xz -- cgit v1.2.3 From dd658f644920cb305f6090cd441d5cbc3e2609a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jun 2017 12:22:07 +0200 Subject: Use the upstream ChangeLog as changelog and add NEWS to docs --- debian/changelog | 5 ++++- debian/rules | 10 ---------- debian/shotwell-dbg.README.Debian | 8 -------- debian/shotwell.docs | 1 + 4 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 debian/shotwell-dbg.README.Debian (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 25a73d7..ef3e4f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,10 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium * New debian/DEVELOP.debian. * Use the automatic debug symbol packages: - Remove shotwell-dbg section from debian/control. - - Remove override_dh_strip and some lines on dh_install from debian/rules. + - Remove override_dh_strip, override_dh_compress and some lines + on dh_install from debian/rules. + - Remove debian/shotwell-dbg.README.Debian. + * Use the upstream ChangeLog as changelog and add NEWS to docs. -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/rules b/debian/rules index 4b0e1b1..9c1d293 100755 --- a/debian/rules +++ b/debian/rules @@ -17,13 +17,3 @@ override_dh_install: # Remove unwanted la files rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la rm -f debian/shotwell/usr/lib/*.la - -override_dh_installchangelogs: - dh_installchangelogs NEWS - -override_dh_compress: - dh_compress -X.tar.xz - -override_dh_installman: - dh_installman - rm -fr debian/shotwell-common/usr/share/man diff --git a/debian/shotwell-dbg.README.Debian b/debian/shotwell-dbg.README.Debian deleted file mode 100644 index dba87b5..0000000 --- a/debian/shotwell-dbg.README.Debian +++ /dev/null @@ -1,8 +0,0 @@ - -For debugging you can copy the files from temp-source.tar.xz into -your source directory (//usr/src/shotwell-VERSION) or you can -set the dircetory for gdb with the commandline parameter --directory=DIR. - -For other debugger please read the docs. - - -- Jörg Frings-Fürst Fri, 03 Apr 2015 13:16:32 +0200 diff --git a/debian/shotwell.docs b/debian/shotwell.docs index e4cf55f..abd24b0 100644 --- a/debian/shotwell.docs +++ b/debian/shotwell.docs @@ -1,2 +1,3 @@ README THANKS +NEWS -- cgit v1.2.3 From 477f7811b5eededf130fba097ea4c63b6cb43e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jun 2017 13:22:08 +0200 Subject: Remove debian/shotwell.1 to use the upstream man page --- debian/changelog | 2 ++ debian/shotwell-common.install | 7 ++++++- debian/shotwell.1 | 14 -------------- 3 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 debian/shotwell.1 (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ef3e4f7..556747b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium on dh_install from debian/rules. - Remove debian/shotwell-dbg.README.Debian. * Use the upstream ChangeLog as changelog and add NEWS to docs. + * Remove debian/shotwell.1 to use the upstream man page. + * Don't install man page at shotwell-common. -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/shotwell-common.install b/debian/shotwell-common.install index dd222db..cd7f004 100644 --- a/debian/shotwell-common.install +++ b/debian/shotwell-common.install @@ -1 +1,6 @@ -usr/share +usr/share/appdata +usr/share/applications +usr/share/glib-2.0 +usr/share/help +usr/share/icons +usr/share/locale diff --git a/debian/shotwell.1 b/debian/shotwell.1 deleted file mode 100644 index e68bcc2..0000000 --- a/debian/shotwell.1 +++ /dev/null @@ -1,14 +0,0 @@ -.TH shotwell 1 "December 30, 2009" -.SH NAME -shotwell \- a digital photo organizer -.SH DESCRIPTION -.B shotwell -is a digital photo organizer designed for the GNOME desktop environment. It -allows you to import photos from disk or camera, organize them in various ways, -view them in full-window or fullscreen mode, and export them to share with -others. -.SH AUTHOR -shotwell was written by Jim Nelson, Lucas Beeler and Allison Barlow. -.PP -This manual page was written by Devid Antonio Filoni , -for the Debian project (and may be used by others). -- cgit v1.2.3 From 5a45ac2b70909f7d0b0c5bcc2f2583e4b3135fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 4 Jun 2017 10:02:17 +0200 Subject: Move .desktop and appstream metadata from shotwell-common to shotwell --- debian/changelog | 3 +++ debian/control | 3 +++ debian/shotwell-common.install | 2 -- debian/shotwell.install | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 556747b..e44807b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium * Use the upstream ChangeLog as changelog and add NEWS to docs. * Remove debian/shotwell.1 to use the upstream man page. * Don't install man page at shotwell-common. + * Some packaging improvements (Closes:# 856708): + - Move .desktop and appstream metadata from shotwell-common to shotwell. + - Thanks to Jeremy Bicha -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/control b/debian/control index 84843fb..ed8e593 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,8 @@ Depends: dconf-cli, default-dbus-session-bus | dbus-session-bus, librsvg2-common +Breaks: shotwell-common (<< 0.26.2-1) +Replaces: shotwell-common (<< 0.26.2-1) Description: digital photo organizer Shotwell is a digital photo organizer designed for the GNOME desktop environment. It allows you to import photos, pictures, images and videos @@ -58,6 +60,7 @@ Package: shotwell-common Architecture: all Depends: ${misc:Depends} Recommends: shotwell +Breaks: shotwell (<< 0.26.2-1) Description: digital photo organizer - common files Shotwell is a digital photo organizer designed for the GNOME desktop environment. It allows you to import photos, pictures, images and videos diff --git a/debian/shotwell-common.install b/debian/shotwell-common.install index cd7f004..191266c 100644 --- a/debian/shotwell-common.install +++ b/debian/shotwell-common.install @@ -1,5 +1,3 @@ -usr/share/appdata -usr/share/applications usr/share/glib-2.0 usr/share/help usr/share/icons diff --git a/debian/shotwell.install b/debian/shotwell.install index 527b78f..4afb4cf 100644 --- a/debian/shotwell.install +++ b/debian/shotwell.install @@ -1,2 +1,4 @@ usr/bin usr/lib +usr/share/appdata +usr/share/applications -- cgit v1.2.3 From 18e6cff861ee839166613feb4354af70eac0a62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 4 Jun 2017 10:34:47 +0200 Subject: Use dh_auto_configure instead of ./configure. Update rm paths for multiarch --- debian/changelog | 4 ++++ debian/rules | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e44807b..7c9df89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium * Don't install man page at shotwell-common. * Some packaging improvements (Closes:# 856708): - Move .desktop and appstream metadata from shotwell-common to shotwell. + - debian/rules: + + Use dh_auto_configure instead of ./configure. + + Update rm paths for multiarch. + + Don't install the .a file either. - Thanks to Jeremy Bicha -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/rules b/debian/rules index 9c1d293..7b659ca 100755 --- a/debian/rules +++ b/debian/rules @@ -10,10 +10,13 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") dh $@ override_dh_auto_configure: - ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile + dh_auto_configure -- --prefix=/usr \ + --libexec=/usr/lib \ + --disable-schemas-compile override_dh_install: dh_install # Remove unwanted la files - rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la - rm -f debian/shotwell/usr/lib/*.la + rm -f debian/shotwell/usr/lib/*/shotwell/plugins/builtin/*.la + rm -f debian/shotwell/usr/lib/*/*shotwell*.a + rm -f debian/shotwell/usr/lib/*/*shotwell*.la -- cgit v1.2.3 From 033fb3cbd62fb3d22c7fdb9a4f91cc117d645ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 4 Jun 2017 10:51:11 +0200 Subject: Remove build-depend m4 since debhelper version 10 use autoconf --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7c9df89..76acb02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium + Use dh_auto_configure instead of ./configure. + Update rm paths for multiarch. + Don't install the .a file either. + - Remove build-depend m4 since debhelper version 10 use autoconf. - Thanks to Jeremy Bicha -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/control b/debian/control index ed8e593..0366b34 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,6 @@ Build-Depends: libsqlite3-dev (>= 3.5.9), libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), - m4, valac (>= 0.22.0) Standards-Version: 3.9.8 Homepage: https://wiki.gnome.org/Apps/Shotwell -- cgit v1.2.3 From 7e391cc0d8a555c73eabe911e964cdadd7384129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 4 Jun 2017 13:34:02 +0200 Subject: Remove unnecessary debian/menu --- debian/changelog | 1 + debian/menu | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/menu (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 76acb02..d517a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium * Use the upstream ChangeLog as changelog and add NEWS to docs. * Remove debian/shotwell.1 to use the upstream man page. * Don't install man page at shotwell-common. + * Remove unnecessary debian/menu. * Some packaging improvements (Closes:# 856708): - Move .desktop and appstream metadata from shotwell-common to shotwell. - debian/rules: diff --git a/debian/menu b/debian/menu deleted file mode 100644 index a9e689e..0000000 --- a/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(shotwell):needs="X11" section="Applications/Viewers"\ - title="Shotwell" command="/usr/bin/shotwell" -- cgit v1.2.3 From af294db022620c8fc7a0c540e133259342a851e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 4 Jun 2017 15:10:16 +0200 Subject: remove wrong Breaks --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 0366b34..342261c 100644 --- a/debian/control +++ b/debian/control @@ -36,14 +36,13 @@ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ Package: shotwell Architecture: linux-any -Depends: +Depends: ${shlibs:Depends}, ${misc:Depends}, shotwell-common (= ${source:Version}), dconf-cli, default-dbus-session-bus | dbus-session-bus, librsvg2-common -Breaks: shotwell-common (<< 0.26.2-1) Replaces: shotwell-common (<< 0.26.2-1) Description: digital photo organizer Shotwell is a digital photo organizer designed for the GNOME desktop -- cgit v1.2.3 From 88fa80eb2c2a80c76782a08a2a6bb7c8f7b0a7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 24 Jun 2017 09:18:56 +0200 Subject: change DEVELOP.debian to README.source --- debian/DEVELOP.Debian | 18 ------------------ debian/README.source | 18 ++++++++++++++++++ debian/changelog | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 debian/DEVELOP.Debian create mode 100644 debian/README.source (limited to 'debian') diff --git a/debian/DEVELOP.Debian b/debian/DEVELOP.Debian deleted file mode 100644 index e4f2b3d..0000000 --- a/debian/DEVELOP.Debian +++ /dev/null @@ -1,18 +0,0 @@ -Hello, - -now I use the branching model from Vincent Driessen[1]. - -I use the gitflow-avh[2]. with the Documentation[3]. -The Debian package can be found here[4]. - -Please upload unattended uploads use a branch feature/. - - -Many thanks. - - -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 - -[1] http://nvie.com/posts/a-successful-git-branching-model/ -[2] https://github.com/petervanderdoes/gitflow-avh -[3] https://github.com/petervanderdoes/gitflow-avh/wiki -[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index d517a5b..111bd6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium - * New upstream release (Closes: #855681). + * New upstream release (Closes: #855681, Closes: #841859). - debian/control: Add new appstream-util, libappstream-glib-dev and libgdata-dev to Build-Depends. - * New debian/DEVELOP.debian. + * New README.source to explain the branching model used. * Use the automatic debug symbol packages: - Remove shotwell-dbg section from debian/control. - Remove override_dh_strip, override_dh_compress and some lines -- cgit v1.2.3 From 9fea107c173c4005faabf004a1107ccef5b7b07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 24 Jun 2017 11:37:42 +0200 Subject: d/watch: Rewrite to find only stable releases --- debian/changelog | 2 ++ debian/watch | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 111bd6c..f0d088b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium + Don't install the .a file either. - Remove build-depend m4 since debhelper version 10 use autoconf. - Thanks to Jeremy Bicha + * debian/watch: + Rewrite to find only stable releases. -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/watch b/debian/watch index 99c74ae..81fb209 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=4 -http://ftp.gnome.org/pub/gnome/sources/shotwell/([\d\.]+)/shotwell-([\d\.]+)\.tar\.xz +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz -- cgit v1.2.3 From 6e9bda752d89f97b0c66e69d9e57376f2947df0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 24 Jun 2017 12:08:28 +0200 Subject: Declare compliance with Debian Policy 4.0.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f0d088b..4a01986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium - Thanks to Jeremy Bicha * debian/watch: Rewrite to find only stable releases. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/control b/debian/control index 342261c..ffcb851 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: 3.9.8 +Standards-Version: 4.0.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/ -- cgit v1.2.3 From e60555276f4b67b4200f72974a20260db8faf444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 13 Aug 2017 15:41:51 +0200 Subject: d/shotwell.install: Drop now empty directory usr/share/appdata --- debian/changelog | 3 ++- debian/shotwell.install | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a01986..17ee75a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -shotwell (0.26.2-1) UNRELEASED; urgency=medium +shotwell (0.26.3-1) UNRELEASED; urgency=medium * New upstream release (Closes: #855681, Closes: #841859). - 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. * New README.source to explain the branching model used. * Use the automatic debug symbol packages: - Remove shotwell-dbg section from debian/control. diff --git a/debian/shotwell.install b/debian/shotwell.install index 4afb4cf..2248825 100644 --- a/debian/shotwell.install +++ b/debian/shotwell.install @@ -1,4 +1,3 @@ usr/bin usr/lib -usr/share/appdata usr/share/applications -- cgit v1.2.3 From f3c8fd73122878dbe98c5453195c2a655c5cf011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 16:10:18 +0100 Subject: Change to my new email-address --- debian/changelog | 7 +++++-- debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 17ee75a..dcd4478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.26.3-1) UNRELEASED; urgency=medium +shotwell (0.26.4-1) UNRELEASED; urgency=medium * New upstream release (Closes: #855681, Closes: #841859). - debian/control: Add new appstream-util, libappstream-glib-dev and @@ -25,8 +25,11 @@ shotwell (0.26.3-1) UNRELEASED; urgency=medium * debian/watch: Rewrite to find only stable releases. * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Change to my new email-address: + - debian/control, + - debian/copyright. - -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 + -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ffcb851..a8709cd 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: shotwell Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Build-Depends: appstream-util, debhelper (>= 10), diff --git a/debian/copyright b/debian/copyright index ab47427..dd4b907 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ License: LGPL-2.1 Files: debian/* Copyright: 2009-2011 Devid Antonio Filoni - 2014-2017 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-2+ Files: icons/pin-toolbar.svg -- cgit v1.2.3 From 56e9c4dab99eb105133c0e1ac412455bd1abe41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 16:11:34 +0100 Subject: Declare compliance with Debian Policy 4.1.1 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dcd4478..95cc284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,7 @@ shotwell (0.26.4-1) UNRELEASED; urgency=medium - Thanks to Jeremy Bicha * debian/watch: Rewrite to find only stable releases. - * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Declare compliance with Debian Policy 4.1.1 (No changes needed). * Change to my new email-address: - debian/control, - debian/copyright. diff --git a/debian/control b/debian/control index a8709cd..c99f7bb 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.0.0 +Standards-Version: 4.1.1 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/ -- cgit v1.2.3 From dd7f98a232efe86f6e6055119c9414a0f9d9e67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 16:45:20 +0100 Subject: d/changelog: Remove trailing white spaces --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 95cc284..a092bd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ shotwell (0.26.4-1) UNRELEASED; urgency=medium + Don't install the .a file either. - Remove build-depend m4 since debhelper version 10 use autoconf. - Thanks to Jeremy Bicha + * debian/changelog: + - Remove trailing white spaces. * debian/watch: Rewrite to find only stable releases. * Declare compliance with Debian Policy 4.1.1 (No changes needed). @@ -628,7 +630,7 @@ shotwell (0.8.1-4) unstable; urgency=low shotwell (0.8.1-3) unstable; urgency=low * Update debian/patches/non-linux-fixes.patch patch (Closes: #619682). - * Add debian/patches/vala-0_10_4.patch patch, fix FTBFS caused by + * Add debian/patches/vala-0_10_4.patch patch, fix FTBFS caused by valac 0.10.4. * debian/control: modify valac-0.10 (>= 0.9.8) to valac-0.10 (>= 0.10.4) in Build-Depends field. -- cgit v1.2.3 From 73542a3b4379319fc2d0a4d134f1f8a6d488dfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 17:17:59 +0100 Subject: d/changelog: change date/time, distribution for release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a092bd7..1dc4228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.26.4-1) UNRELEASED; urgency=medium +shotwell (0.26.4-1) unstable; urgency=medium * New upstream release (Closes: #855681, Closes: #841859). - debian/control: Add new appstream-util, libappstream-glib-dev and @@ -31,7 +31,7 @@ shotwell (0.26.4-1) UNRELEASED; urgency=medium - debian/control, - debian/copyright. - -- Jörg Frings-Fürst Wed, 22 Mar 2017 06:51:19 +0100 + -- Jörg Frings-Fürst Sun, 12 Nov 2017 17:17:13 +0100 shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium -- cgit v1.2.3 From e7254f209878026e23bffb701f96b169ebffbfe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 15 Dec 2017 11:51:57 +0100 Subject: Declare compliance with Debian Policy 4.1.2.0; Close bug #870027 --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1dc4228..d2774e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ 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,7 +26,7 @@ shotwell (0.26.4-1) unstable; 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. 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/ -- cgit v1.2.3 From ede50c561ec9811704821a9ea0f04c3d6c20b5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 15 Dec 2017 11:53:00 +0100 Subject: d/changelog: change date and time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d2774e0..ee3b059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,7 @@ shotwell (0.26.4-1) unstable; urgency=medium - debian/control, - debian/copyright. - -- Jörg Frings-Fürst Sun, 12 Nov 2017 17:17:13 +0100 + -- Jörg Frings-Fürst Fri, 15 Dec 2017 11:52:17 +0100 shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium -- cgit v1.2.3