Merge lp:~noskcaj/deja-dup/merge into lp:~ubuntu-desktop/deja-dup/ubuntu

[Jackson Doak]

Merge from debian. This leaves us with a package mostly the same as our old one, so there are probably some changes that can be dropped.

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-23 16:26:53 +0000
+++ debian/changelog	2015-07-04 05:02:31 +0000
@@ -1,3 +1,49 @@
+deja-dup (34.0-1ubuntu1) wily; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - debian/control:
+      + Add appdata-tools to Build-Deps to validate appdata file
+      + Add dbus-x11, python3 and desktop-file-utils as Build-Depends for tests
+      + Use dh-translations
+      + Change yelp-tools Build-Depend to just itstool, as that's all
+        that is needed
+      + Build-depend on gnome-control-center, unity-control-center, libunity
+      + Add XS-Testsuite: Autopkgtest
+      + Use ubuntu vcs
+      + Use ${misc:Pre-Depends}
+      + Depend on adwaita-icon-theme
+      + Don't recommend an ssh client
+      + Reccomend policykit-1
+      + Improve descriptions
+      + Split backends into different packages
+      + Drop dbg package
+    - debian/rules:
+      + Add --with translations to configure
+      + Enable CCPANEL, UNITY, UNITY_CCPANEL
+      + Use multiarch libs
+      + Don't make a dbg package
+      + Run dh_auto_test
+      + Don't override dh_makeshlibs
+    - Add autopkgtest
+
+ -- Jackson Doak <[e-mail]>  Sat, 04 Jul 2015 13:39:47 +1000
+
+deja-dup (34.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstraem release.
+  * Update outdated section names in debian/gbp.conf.
+
+ -- Michael Biebl <[e-mail]>  Tue, 16 Jun 2015 16:54:00 +0200
+
+deja-dup (32.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+  * debian/copyright: Fix copyright file, files have been moved around
+
+ -- Laurent Bigonville <[e-mail]>  Sun, 12 Oct 2014 10:51:13 +0200
+
 deja-dup (32.0-0ubuntu5) vivid; urgency=medium
 
   * debian/patches/0001-fix-appdata-validate-ftbs.patch:
@@ -36,6 +82,15 @@
 
  -- Michael Terry <[e-mail]>  Sat, 20 Sep 2014 11:35:28 -0400
 
+deja-dup (30.0-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop debian/patches/01_CMP0004_OLD.patch: Fixed upstream
+  * Add debian/gbp.conf file
+  * debian/control.in: Re-add the Vcs-* fields with the new URL's
+
+ -- Laurent Bigonville <[e-mail]>  Fri, 11 Apr 2014 22:21:25 +0200
+
 deja-dup (30.0-0ubuntu7) utopic; urgency=medium
 
   * debian/patches/deprecated-property.patch:
@@ -92,6 +147,25 @@
 
  -- Michael Terry <[e-mail]>  Fri, 28 Mar 2014 09:03:56 -0400
 
+deja-dup (29.5-1) unstable; urgency=low
+
+  * New upstream release (Closes: #667722, #671479)
+    - Adjust the {build-}dependencies
+    - debian/rules, debian/control: deja-dup is now using cmake
+  * Adopt deja-dup by the GNOME team (Closes: #740924)
+  * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
+  * Add debian/patches/01_CMP0004_OLD.patch: Fix FTBFS due to changes in cmake
+  * debian/rules: Drop the override_dh_builddeb target, this is not needed
+    anymore
+  * Fix the debian/watch URL
+  * Bump debhelper compatibility to 9 to get the hardening flags for free
+  * debian/rules: Properly exclude nautilus plugin from dh_makeshlibs call
+    (Closes: #651279)
+  * debian/control: Adjust the recommends, add gvfs-backends and rename
+    python-rackspace-cloudfiles to python-cloudfiles (Closes: #669045, #732730)
+
+ -- Laurent Bigonville <[e-mail]>  Thu, 06 Mar 2014 22:11:37 +0100
+
 deja-dup (29.5-0ubuntu2) trusty; urgency=medium
 
   * debian/patches/rm-full-path.patch:
@@ -366,6 +440,54 @@
 
  -- Michael Terry <[e-mail]>  Mon, 24 Oct 2011 13:49:53 -0400
 
+deja-dup (20.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "configure:3028: error: xmllint not found":
+    change build dependency from itstool to yelp-tools; thanks, Michael Biebl.
+    (Closes: #666225)
+
+ -- gregor herrmann <[e-mail]>  Sun, 03 Jun 2012 16:37:10 +0200
+
+deja-dup (20.2-2) unstable; urgency=low
+
+  * ACK previous NMU (Closes: #651257)
+  * Delete old unused patch (Closes: #651258)
+  * Drop gnome-control-center support as Gnome 3 upstream don't want 3rd
+  party applications to be installed there (Closes: #650142)
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Thu, 08 Dec 2011 12:15:32 +0100
+
+deja-dup (20.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: Drop libdbusmenu-gtk3-dev Build-dep, the package is only
+    available in experimental for now (Closes: #651257)
+
+ -- Laurent Bigonville <[e-mail]>  Wed, 07 Dec 2011 11:54:25 +0100
+
+deja-dup (20.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #613336, #632568)
+     - Fixed GPG error during restore (Closes: #624598)
+     - Transitioned to use nautilus 3 (Closes: #637312)
+  * Remove .la files (Closes: #621293)
+  * debian/rules:
+    - Convert to dh8
+  * debian/source/format:
+    - Convert to 3.0 (quilt)
+  * debian/control:
+    - Update description
+    - Needs libnotify >= 0.7.0
+  * debian/copyright:
+    - Update from upstream AUTHORS
+    - Standards-Version: bump to 3.9.2, no changes needed.
+    - Change yelp Build-Dep to just itstool
+
+  (These changes where taken from Ubuntu package, thanks to Michael Terry)
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Fri, 25 Nov 2011 21:11:10 +0100
+
 deja-dup (20.1-0ubuntu1) precise; urgency=low
 
   * New upstream bug fix release
@@ -724,6 +846,14 @@
 
  -- Michael Terry <[e-mail]>  Tue, 04 May 2010 15:57:37 -0400
 
+deja-dup (14.2-1) unstable; urgency=low
+
+  * New upstream release
+    + Fixes problem to external disks (Closes: #583218)
+  * Bump dependency in duplicity to 0.6.07 (Closes: #546520)
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Thu, 08 Jul 2010 16:46:39 +0200
+
 deja-dup (14.0.3-0ubuntu1) lucid; urgency=low
 
   * New upstream release
@@ -747,6 +877,12 @@
 
  -- Michael Terry <[e-mail]>  Sat, 03 Apr 2010 07:18:59 -0400
 
+deja-dup (14.0-1) unstable; urgency=low
+
+  * New upstream version (Closes: #574938) 
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Thu, 01 Apr 2010 11:55:08 +0200
+
 deja-dup (14.0-0ubuntu1) lucid; urgency=low
 
   * New upstream bug-fix release
@@ -772,6 +908,15 @@
 
  -- Michael Terry <[e-mail]>  Mon, 08 Feb 2010 17:44:05 -0500
 
+deja-dup (13.6-1) unstable; urgency=low
+
+  * New upstream release (Closes: #567124)
+    + Adds menu entry to System category (Closes: #544455)
+  * Depends on gvfs-fuse (Closes: #546506)
+  * Bump Standards-Version to 3.8.4. No changes needed.
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Thu, 28 Jan 2010 00:13:03 +0100
+
 deja-dup (13.6-0ubuntu2) lucid; urgency=low
 
   * Build-depend on libappindicator-dev (>= 0.0.11), in order to switch over
@@ -820,6 +965,22 @@
 
  -- Michael Terry <[e-mail]>  Mon, 12 Oct 2009 11:01:41 -0400
 
+deja-dup (10.1-2) unstable; urgency=low
+
+  * intltool is a build-dependency (Closes: #544451)
+  * Bump Standards-Version to 3.8.1. No changes needed.
+  * Add to debian/copyright file every (C) bit in sources. 
+    Thanks to Torsten Werner.
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Mon, 31 Aug 2009 23:16:58 +0200
+
+deja-dup (10.1-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Docs have been relicensed to GPLv3.
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Tue, 04 Aug 2009 23:34:17 +0200
+
 deja-dup (10.0-0ubuntu1) karmic; urgency=low
 
   * New upstream release (LP: #384067, LP: #353838, LP: #333126)
@@ -834,6 +995,46 @@
 
  -- Michael Terry <[e-mail]>  Fri, 05 Jun 2009 16:09:45 -0400
 
+deja-dup (9.1-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Tue, 28 Apr 2009 23:47:27 +0200
+
+deja-dup (8.1-1) unstable; urgency=low
+
+  * Inital Debian release, based on Ubuntu packages (Closes: #506590)
+  * debian/control:
+    - Change maintainer to me.
+    - Bump Standards-Version to 3.8.1. No changes needed. 
+    - Move -dbg package to 'debug' section. 
+
+ -- Jose Carlos Garcia Sogo <[e-mail]>  Tue, 14 Apr 2009 00:19:30 +0200
+
+deja-dup (8.1-0intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Fri, 03 Apr 2009 17:59:44 -0400
+
+deja-dup (8.1-0hardy1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Fri, 03 Apr 2009 17:58:44 -0400
+
+deja-dup (8.0-0intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Sun, 29 Mar 2009 11:53:45 -0400
+
+deja-dup (8.0-0hardy1) hardy; urgency=low
+
+  * Initial hardy release
+
+ -- Michael Terry <[e-mail]>  Sun, 29 Mar 2009 11:43:28 -0400
+
 deja-dup (7.4-0ubuntu2) jaunty; urgency=low
 
   * debian/control:
@@ -852,3 +1053,96 @@
   * Initial release (LP: #324388)
 
  -- Michael Terry <[e-mail]>  Thu, 12 Feb 2009 07:18:01 -0500
+
+deja-dup (7.4-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Wed, 11 Feb 2009 21:17:47 -0500
+
+deja-dup (7.3-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Tue, 03 Feb 2009 20:40:01 -0500
+
+deja-dup (7.2-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Mon, 02 Feb 2009 20:49:16 -0500
+
+deja-dup (7.1-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Thu, 29 Jan 2009 15:54:19 -0500
+
+deja-dup (7.0-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Add Build-Depend on libnautilus-extension-dev
+
+ -- Michael Terry <[e-mail]>  Thu, 29 Jan 2009 08:07:33 -0500
+
+deja-dup (6.0-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Mon, 19 Jan 2009 19:51:28 -0500
+
+deja-dup (5.2-0~intrepid1) intrepid; urgency=low
+
+  * New upstream release
+
+ -- Michael Terry <[e-mail]>  Wed, 07 Jan 2009 21:47:58 -0500
+
+deja-dup (5.1-0~intrepid1) intrepid; urgency=low
+
+  * New upstream version
+
+ -- Michael Terry <[e-mail]>  Wed, 07 Jan 2009 20:54:58 -0500
+
+deja-dup (5.0-0~intrepid1) intrepid; urgency=low
+
+  * New upstream version
+
+ -- Michael Terry <[e-mail]>  Tue, 06 Jan 2009 20:30:09 -0500
+
+deja-dup (4.0-0~intrepid1) intrepid; urgency=low
+
+  * New upstream version
+  * debian/control:
+    - Add dbg package
+    - Recommend util-linux, for ionice
+    - Dropped valac from Build-Depends, not needed
+
+ -- Michael Terry <[e-mail]>  Mon, 29 Dec 2008 23:19:56 -0500
+
+deja-dup (3.0~ppa1) intrepid; urgency=low
+
+  * New upstream version
+  * debian/control:
+    - Add libunique-dev and libnotify-dev to Build-Depends
+
+ -- Michael Terry <[e-mail]>  Thu, 04 Dec 2008 22:28:24 -0500
+
+deja-dup (2.1-0ubuntu1~ppa1) intrepid; urgency=low
+
+  * New upstream version
+
+ -- Michael Terry <[e-mail]>  Mon, 01 Dec 2008 21:09:29 -0500
+
+deja-dup (2.0-0ubuntu1~ppa1) intrepid; urgency=low
+
+  * New upstream version
+
+ -- Michael Terry <[e-mail]>  Sat, 22 Nov 2008 08:20:04 -0500
+
+deja-dup (1.0-0ubuntu1~ppa1) intrepid; urgency=low
+
+  * Initial Release.
+
+ -- Michael Terry <[e-mail]>  Mon, 20 Oct 2008 13:00:47 -0400
+
 
=== modified file 'debian/control'
--- debian/control	2015-02-23 16:02:45 +0000
+++ debian/control	2015-07-04 05:02:31 +0000
@@ -1,39 +1,42 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
 Source: deja-dup
 Section: utils
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Iain Lane <[e-mail]>, Jackson Doak <[e-mail]>, Laurent Bigonville <[e-mail]>, Louis Bouchard <[e-mail]>, Michael Biebl <[e-mail]>, Michael Terry <[e-mail]>
 Homepage: https://launchpad.net/deja-dup
 Build-Depends: appstream-util,
                cmake,
                dbus-x11,
                debhelper (>= 9),
                desktop-file-utils,
-               dh-translations,
+               gnome-pkg-tools,
                intltool (>= 0.40),
                itstool,
                libglib2.0-dev (>= 2.34),
                libgnome-control-center-dev (>= 3.4),
                libgtk-3-dev (>= 3.6),
-               libnautilus-extension-dev (>= 3.0),
+               libnautilus-extension-dev,
                libnotify-dev (>= 0.7),
                libpeas-dev,
                libsecret-1-dev,
                libunity-control-center-dev,
                libunity-dev (>= 5.0.0),
-               libxml2-utils,
                pkg-config,
                python3,
-               valac (>= 0.22),
+               valac (>= 0.20)
+Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
-Standards-Version: 3.9.3
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/deja-dup/ubuntu
 
 Package: deja-dup
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          duplicity (>= 0.6.23),
          adwaita-icon-theme
 Recommends: deja-dup-backend-gvfs,
 
=== added file 'debian/control.in'
--- debian/control.in	1970-01-01 00:00:00 +0000
+++ debian/control.in	2015-07-04 05:02:31 +0000
@@ -0,0 +1,89 @@
+Source: deja-dup
+Section: utils
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: @GNOME_TEAM@
+Homepage: https://launchpad.net/deja-dup
+Build-Depends: appstream-util,
+               cmake,
+               dbus-x11,
+               debhelper (>= 9),
+               desktop-file-utils,
+               gnome-pkg-tools,
+               intltool (>= 0.40),
+               itstool,
+               libglib2.0-dev (>= 2.34),
+               libgnome-control-center-dev (>= 3.4),
+               libgtk-3-dev (>= 3.6),
+               libnautilus-extension-dev,
+               libnotify-dev (>= 0.7),
+               libpeas-dev,
+               libsecret-1-dev,
+               libunity-control-center-dev,
+               libunity-dev (>= 5.0.0),
+               pkg-config,
+               python3,
+               valac (>= 0.20)
+Standards-Version: 3.9.6
+XS-Testsuite: autopkgtest
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/deja-dup/ubuntu
+
+Package: deja-dup
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         duplicity (>= 0.6.23),
+         adwaita-icon-theme
+Recommends: deja-dup-backend-gvfs,
+            policykit-1,
+Suggests: deja-dup-backend-cloudfiles,
+          deja-dup-backend-s3,
+Description: Back up your files
+ Déjà Dup is a simple backup tool. It hides the complexity of backing up the
+ Right Way (encrypted, off-site, and regular) and uses duplicity as the
+ backend.
+ .
+ Features:
+  * Support for local, remote, or cloud backup locations, such as Amazon S3,
+    and Rackspace Cloud Files
+  * Securely encrypts and compresses your data
+  * Incrementally backs up, letting you restore from any particular backup
+  * Schedules regular backups
+  * Integrates well into your GNOME desktop
+
+Package: deja-dup-backend-gvfs
+Architecture: all
+Depends: ${misc:Depends},
+         deja-dup,
+         gvfs-backends,
+Description: Remote server support for Déjà Dup
+ Déjà Dup is a simple backup tool. It hides the complexity of backing up the
+ Right Way (encrypted, off-site, and regular) and uses duplicity as the
+ backend.
+ .
+ This package adds FTP, SSH, WebDAV, and Windows Shares support to Déjà Dup.
+
+Package: deja-dup-backend-cloudfiles
+Architecture: all
+Depends: ${misc:Depends},
+         deja-dup,
+         python-cloudfiles,
+Description: Rackspace Cloudfiles support for Déjà Dup
+ Déjà Dup is a simple backup tool. It hides the complexity of backing up the
+ Right Way (encrypted, off-site, and regular) and uses duplicity as the
+ backend.
+ .
+ This package adds Rackspace Cloudfiles support to Déjà Dup.
+
+Package: deja-dup-backend-s3
+Architecture: all
+Depends: ${misc:Depends},
+         deja-dup,
+         python-boto (>= 0.9d),
+Description: Amazon S3 support for Déjà Dup
+ Déjà Dup is a simple backup tool. It hides the complexity of backing up the
+ Right Way (encrypted, off-site, and regular) and uses duplicity as the
+ backend.
+ .
+ This package adds Amazon S3 support to Déjà Dup.
 
=== modified file 'debian/copyright'
--- debian/copyright	2012-08-21 20:18:56 +0000
+++ debian/copyright	2015-07-04 05:02:31 +0000
@@ -1,62 +1,41 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
 Upstream-Name: Déjà Dup
 Upstream-Contact: Déjà Dup Maintainers <[e-mail]>
 Source: https://launchpad.net/deja-dup/+download
 
 Files: *
-Copyright: 2008–2011 Michael Terry <[e-mail]>
-           2009–2010 Andrew Fister <[e-mail]>
+Copyright: 2008,2009,2010,2011 Michael Terry <[e-mail]>
+           2009,2010 Andrew Fister <[e-mail]>
            2010 Michael Vogt <[e-mail]>
            2010 Urban Skudnik <[e-mail]>
-           2011 Canonical Ltd
-Comment: For specific author information, see the bzr logs
 License: GPL-3+
 
 Files: po/*.po
-Copyright: 2008–2011 Rosetta Contributors and Canonical Ltd
-License: GPL-3+
-
-Files: common/uriutils.[ch]
-Copyright: 2006–2007 Red Hat, Inc
-License: GPL-3+
-
-Files: nautilus/NautilusExtension.[ch]
+Copyright: 2008,2009,2010,2011 Rosetta Contributors and Canonical Ltd
+License: GPL-3+
+
+Files: libdeja/uriutils.[ch]
+Copyright: 2006-2007 Red Hat, Inc
+License: GPL-3+
+
+Files: deja-dup/nautilus/NautilusExtension.[ch]
 Copyright: 2004–2005 Free Software Foundation, Inc.
-           2009–2011 Michael Terry <[e-mail]>
-           2011 Canonical Ltd
-License: GPL-3+
-
-Files: preferences/PreferencesPanel.c
-Copyright: 2010 Intel, Inc
-           2011 Michael Terry <[e-mail]>
-License: GPL-3+
-
-Files: vapi/config.vapi
-Copyright: 2007–2008 Jaap Haitsma <[e-mail]>
-License: GPL-3+
-
-Files: help/C/*.page
-Copyright: 2010–2011 Michael Terry <[e-mail]>
-           2011 Canonical Ltd
+           2009 Michael Terry <[e-mail]>
+License: GPL-3+
+
+Files: deja-dup/help/C/*.page
+Copyright: 2010,2011 Michael Terry <[e-mail]>
 License: CC-BY-SA-3.0
 
-Files: help/*/*.po
-Copyright: 2008–2011 Rosetta Contributors and Canonical Ltd
+Files: deja-dup/help/*/*.po
+Copyright: 2008,2009,2010,2011 Rosetta Contributors and Canonical Ltd
 License: CC-BY-SA-3.0
 
 Files: man/help2man
 Copyright: 1997–2005, 2009–2010 Free Software Foundation, Inc.
 License: GPL-3+
 
-Files: data/icons/*.png data/icons/source.svg
-Copyright: 2011 Lapo Calamandrei <[e-mail]>
-License: LGPL-3+ or CC-BY-SA-3.0
-
-Files: data/icons/*/deja-dup-symbolic.svg
-Copyright: 2011 Michael Terry <[e-mail]>
-License: LGPL-3+ or CC-BY-SA-3.0
-
-Files: data/icons/*/deja-dup-cloud.svg
+Files: data/icons/*.svg
 Copyright: None
 License: public-domain
  These icons originally came from the Tango project
@@ -80,23 +59,6 @@
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
 
-License: LGPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU Lesser General Public License
- version 3 can be found in the file /usr/share/common-licenses/LGPL-3.
-
 License: CC-BY-SA-3.0
  You are free:
  to Share (to copy, distribute and transmit the work) and
 
=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2015-07-04 05:02:31 +0000
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = master
+upstream-branch = upstream
+pristine-tar = True
+
+[buildpackage]
+tarball-dir = ../tarballs/
+export-dir = ../build-area/
 
=== removed directory 'debian/patches'
=== removed file 'debian/patches/0001-fix-appdata-validate-ftbs.patch'
--- debian/patches/0001-fix-appdata-validate-ftbs.patch	2015-02-23 16:26:53 +0000
+++ debian/patches/0001-fix-appdata-validate-ftbs.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Index: deja-dup-32.0/deja-dup/CMakeLists.txt
-===================================================================
---- deja-dup-32.0.orig/deja-dup/CMakeLists.txt
-+++ deja-dup-32.0/deja-dup/CMakeLists.txt
-@@ -40,9 +40,9 @@ install(TARGETS deja-dup DESTINATION bin
- deja_merge_po(desktop deja-dup.desktop "${CMAKE_INSTALL_FULL_DATADIR}/applications")
- 
- deja_merge_po(xml deja-dup.appdata.xml "${CMAKE_INSTALL_FULL_DATADIR}/appdata")
--find_program(APPDATA_VALIDATE appdata-validate)
--if(APPDATA_VALIDATE)
--  add_test(validate-deja-dup.appdata.xml appdata-validate --relax "${CMAKE_CURRENT_BINARY_DIR}/deja-dup.appdata.xml")
-+find_program(APPSTREAM_UTIL appstream-util)
-+if(APPSTREAM_UTIL)
-+  add_test(validate-deja-dup.appdata.xml appstream-util --nonet validate-relax "${CMAKE_CURRENT_BINARY_DIR}/deja-dup.appdata.xml")
- endif()
- 
- install(DIRECTORY ui DESTINATION "${PKG_DATADIR}")
 
=== removed file 'debian/patches/series'
--- debian/patches/series	2015-02-23 16:13:17 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0001-fix-appdata-validate-ftbs.patch
 
=== modified file 'debian/rules'
--- debian/rules	2014-04-02 14:47:01 +0000
+++ debian/rules	2015-07-04 05:02:31 +0000
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
-# -*- Mode: Makefile; indent-tabs-mode: t; tab-width: 2 -*-
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --parallel --with translations --buildsystem cmake
+	dh $@ --parallel --buildsystem cmake --with gnome --with translations
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DENABLE_CCPANEL=ON \
 
=== modified file 'debian/watch'
--- debian/watch	2012-02-23 17:41:45 +0000
+++ debian/watch	2015-07-04 05:02:31 +0000
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/deja-dup/+download .*/deja-dup-(.+)\.tar\.xz
+https://launchpad.net/deja-dup/+download .*/deja-dup-(.+)\.tar\.xz