Merge branch 'feature/upstream' into develop

11 files changed, 60 insertions, 73 deletions

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/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  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..17ee75a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,30 @@
-shotwell (0.26.1-1) UNRELEASED; urgency=medium
+shotwell (0.26.3-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.
+    - 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.
+    - 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.
+  * 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:
+      + 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 <jbicha@ubuntu.com>
+  * debian/watch:
+    Rewrite to find only stable releases.
+  * Declare compliance with Debian Policy 4.0.0. (No changes needed).
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 22 Mar 2017 06:51:19 +0100
 
diff --git a/debian/control b/debian/control
index 02d320a..ffcb851 100644
--- a/debian/control
+++ b/debian/control
@@ -28,22 +28,22 @@ 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
+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/
 
 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
+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 +58,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
@@ -69,21 +70,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/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"
diff --git a/debian/rules b/debian/rules
index f8d940b..7b659ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,31 +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
-	# 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
-
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS
-
-override_dh_strip:
-	dh_strip --dbg-package=shotwell-dbg
-
-override_dh_compress:
-	dh_compress -X.tar.xz
-
-override_dh_installman:
-	dh_installman
-	rm -fr debian/shotwell-common/usr/share/man
+	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
diff --git a/debian/shotwell-common.install b/debian/shotwell-common.install
index dd222db..191266c 100644
--- a/debian/shotwell-common.install
+++ b/debian/shotwell-common.install
@@ -1 +1,4 @@
-usr/share
+usr/share/glib-2.0
+usr/share/help
+usr/share/icons
+usr/share/locale
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 <debian@jff-webhosting.net>  Fri, 03 Apr 2015 13:16:32 +0200
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 <d.filoni@ubuntu.com>,
-for the Debian project (and may be used by others).
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
diff --git a/debian/shotwell.install b/debian/shotwell.install
index 527b78f..2248825 100644
--- a/debian/shotwell.install
+++ b/debian/shotwell.install
@@ -1,2 +1,3 @@
 usr/bin
 usr/lib
+usr/share/applications
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