Apply changes as suggested by Jeremy Bicha:

- Bump version number to 0.6.0-0ubuntu2 (UNRELEASED)
- Clear previous changelog entries, set to initial release and close lp 1598503
- Move usr/lib/*/pkgconfig to libxfdashboard-dev.install
- Add development packages to libxfdashboard-dev Depends
- Upgrade users with old debug packages
- Remove --disable-silent-rules
- Add libxfdashboard0.symbols
- Mark xfdashboard Multi-Arch: foreign

5 files changed, 14 insertions, 218 deletions

diff --git a/debian/changelog b/debian/changelog
index 1520b02..e344399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,202 +1,5 @@
-xfdashboard (0.6.0-0ubuntu1) devel; urgency=medium
+xfdashboard (0.6.0-0ubuntu2) UNRELEASED; urgency=medium
 
-  * Imported Upstream version 0.6.0.
-  * Bump standards-version to 3.9.8.
+  * Initial release (LP: #1598503)
 
- -- Unit 193 <unit193@ubuntu.com>  Sat, 21 May 2016 00:09:53 -0400
-
-xfdashboard (0.5.92-0ubuntu1) xenial; urgency=medium
-
-  * Imported Upstream version 0.5.92
-
- -- Unit 193 <unit193@ubuntu.com>  Thu, 31 Mar 2016 22:06:07 -0400
-
-xfdashboard (0.5.91-0ubuntu1) xenial; urgency=medium
-
-  * Imported Upstream version 0.5.91
-
- -- Unit 193 <unit193@ubuntu.com>  Tue, 22 Mar 2016 19:23:45 -0400
-
-xfdashboard (0.5.90-0ubuntu1) xenial; urgency=medium
-
-  * Imported Upstream version 0.5.90
-  * Update standards-version to 3.9.7.
-  * Add the -plugins, libxfdashboard0, and libxfdashboard-dev packages.
-
- -- Unit 193 <unit193@ubuntu.com>  Mon, 29 Feb 2016 15:02:49 -0500
-
-xfdashboard (0.5.5-0ubuntu1) xenial; urgency=medium
-
-  * Imported Upstream version 0.5.5
-  * d/p/missing-potfiles.patch: Dropped, applied upstream.
-
- -- Unit 193 <unit193@ubuntu.com>  Mon, 01 Feb 2016 18:38:15 -0500
-
-xfdashboard (0.5.4-0ubuntu1) xenial; urgency=medium
-
-  * Imported Upstream version 0.5.4
-  * d/p/missing-potfiles.patch: Add missing file to POTFILES.in.
-
- -- Unit 193 <unit193@ubuntu.com>  Mon, 21 Dec 2015 15:52:14 -0500
-
-xfdashboard (0.5.3-0ubuntu1) xenial; urgency=medium
-
-  * Imported Upstream version 0.5.3
-  * d/rules: Don't make shlibs for the plugins.
-  * d/rules: Remove *.la files in the auto_install override.
-
- -- Unit 193 <unit193@ubuntu.com>  Fri, 13 Nov 2015 15:55:45 -0500
-
-xfdashboard (0.5.2-0ubuntu1) wily; urgency=medium
-
-  * Imported Upstream version 0.5.2
-    - Drop patches applied upstream.
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 10 Oct 2015 14:45:21 -0400
-
-xfdashboard (0.5.1-0ubuntu1) wily; urgency=medium
-
-  * Imported Upstream version 0.5.1
-  * d/copyright: Update my email address.
-  * d/control: Add build-dep on libxfce4ui-2-dev.
-  * d/p/add_application-tracker_to_potfiles.patch:
-    - Add missing xfdashboard/application-tracker.c to po/POTFILES.in.
-
- -- Unit 193 <unit193@ubuntu.com>  Thu, 10 Sep 2015 21:17:53 -0400
-
-xfdashboard (0.5.0-0ubuntu1) wily; urgency=medium
-
-  * Imported Upstream version 0.5.0.
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 13 Jun 2015 14:56:04 -0400
-
-xfdashboard (0.4.2-0ubuntu1) wily; urgency=medium
-
-  * Imported Upstream version 0.4.2.
-
- -- Unit 193 <unit193@ubuntu.com>  Sun, 31 May 2015 00:06:59 -0400
-
-xfdashboard (0.4.1-0ubuntu1) wily; urgency=medium
-
-  * Imported Upstream version 0.4.1.
-
- -- Unit 193 <unit193@ubuntu.com>  Fri, 29 May 2015 16:25:20 -0400
-
-xfdashboard (0.4.0-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.4.0.
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 11 Apr 2015 16:25:01 -0400
-
-xfdashboard (0.3.91-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.91.
-  * d/copyright, d/watch, d/control:
-    - Update Source urls for new Xfce locations.
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 28 Mar 2015 22:21:07 -0400
-
-xfdashboard (0.3.90-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.90.
-  * d/control: Changed upstream build-dep: libwnck-dev => libwnck-3-dev
-
- -- Unit 193 <unit193@ubuntu.com>  Thu, 19 Mar 2015 00:05:22 -0400
-
-xfdashboard (0.3.9-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.9.
-
- -- Unit 193 <unit193@ubuntu.com>  Fri, 20 Feb 2015 15:25:51 -0500
-
-xfdashboard (0.3.8-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.8.
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 24 Jan 2015 20:01:18 -0500
-
-xfdashboard (0.3.7-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.7.
-  * d/control: Add build-dep on libxfce4util-dev.
-  * d/copyright: click-action.* moved from src/ to xfdashboard/
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 17 Jan 2015 17:26:03 -0500
-
-xfdashboard (0.3.5-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.5
-  * d/copyright: Update copyright years.
-
- -- Unit 193 <unit193@ubuntu.com>  Sat, 10 Jan 2015 16:33:59 -0500
-
-xfdashboard (0.3.4-0ubuntu1) vivid; urgency=medium
-
-  * Imported Upstream version 0.3.4
-  * d/rules: Enable all hardening rules.
-  * d/control: Update description: Gnome => GNOME.
-
- -- Unit 193 <unit193@ubuntu.com>  Fri, 28 Nov 2014 04:46:44 -0500
-
-xfdashboard (0.3.3-0ubuntu1) utopic; urgency=medium
-
-  * Imported Upstream version 0.3.3
-  * Update Standards-Version to 3.9.6 (No changes)
-
- -- Unit 193 <unit193@ubuntu.com>  Wed, 22 Oct 2014 16:44:16 -0400
-
-xfdashboard (0.3.2-0ubuntu1) utopic; urgency=medium
-
-  * Imported Upstream version 0.3.2
-
- -- Unit 193 <unit193@ubuntu.com>  Mon, 08 Sep 2014 08:13:54 -0400
-
-xfdashboard (0.3.1-0ubuntu1) utopic; urgency=medium
-
-  * Imported Upstream version 0.3.1.
-  * Update Vcs-* fields for the Xubuntu team repo.
-
- -- Unit 193 <unit193@ubuntu.com>  Wed, 27 Aug 2014 04:25:24 -0400
-
-xfdashboard (0.3.0-1) utopic; urgency=medium
-
-  * Imported Upstream version 0.3.0.
-    - Drop patches applied upstream.
-
- -- Unit 193 <unit193@ubuntu.com>  Thu, 24 Jul 2014 03:12:04 -0400
-
-xfdashboard (0.2.1-1) utopic; urgency=medium
-
-  * Imported Upstream version 0.2.1.
-  * d/patches/missing_potfiles.patch:
-    - Add missing src/dynamic-table-layout.c to POTFILES.in.
-
- -- Unit 193 <unit193@ubuntu.com>  Thu, 17 Jul 2014 03:36:17 -0400
-
-xfdashboard (0.2.0-1) utopic; urgency=medium
-
-  * Updated long description.
-  * Imported Upstream version 0.2.0
-  * Drop patch, applied upstream.
-
- -- Unit 193 <unit193@ubuntu.com>  Mon, 09 Jun 2014 15:05:47 -0400
-
-xfdashboard (0.1.92-1) utopic; urgency=medium
-
-  * Point the Vcs-* URLs at Bitbucket.
-  * Imported Upstream version 0.1.92
-  * Drop patch bin-not-in-local.diff, fixed upstream.
-
- -- Unit 193 <unit193@ubuntu.com>  Fri, 30 May 2014 15:15:02 -0400
-
-xfdashboard (0.1.91-1) utopic; urgency=medium
-
-  * New upstream release.
-
- -- Unit 193 <unit193@ubuntu.com>  Fri, 09 May 2014 14:44:07 -0400
-
-xfdashboard (0.1.90-1) utopic; urgency=medium
- 
-   * Initial release.
- 
- -- Unit 193 <unit193@ubuntu.com>  Wed, 23 Apr 2014 15:13:59 -0400
+ -- Sean Davis <smd.seandavis@gmail.com>  Thu, 11 Aug 2016 20:58:30 -0400
diff --git a/debian/control b/debian/control
index 906a97a..93f0f74 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: xfce
 Priority: optional
 Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
 Uploaders: Unit 193 <unit193@ubuntu.com>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160114),
  autotools-dev,
  gettext,
  intltool,
@@ -25,6 +25,7 @@ Vcs-Git: https://git.launchpad.net/~xubuntu-dev/+git/xfdashboard
 
 Package: xfdashboard
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: xfdashboard-plugins
 Description: GNOME shell like dashboard for Xfce
@@ -61,7 +62,12 @@ Description: GNOME shell like dashboard for Xfce - shared library
 Package: libxfdashboard-dev
 Section: libdevel
 Architecture: any
-Depends: libxfdashboard0 (= ${binary:Version}),${shlibs:Depends}, ${misc:Depends}
+Depends: libxfdashboard0 (= ${binary:Version}),
+ libclutter-1.0-dev, libcogl-dev, libdbus-glib-1-dev, libgarcon-1-0-dev,
+ libglib2.0-dev, libgtk-3-dev, libwnck-3-dev, libxfce4ui-2-dev,
+ libxfce4util-dev, libxfconf-0-dev, ${shlibs:Depends}, ${misc:Depends}
+Breaks: libxfdashboard0 (<< 0.6.0-0ubuntu2)
+Replaces: libxfdashboard0 (<< 0.6.0-0ubuntu2)
 Description: GNOME shell like dashboard for Xfce - development files
  xfdashboard provides an overview of applications currently open enabling the
  user to switch between different applications. The search feature works like
@@ -69,16 +75,3 @@ Description: GNOME shell like dashboard for Xfce - development files
  applications.
  .
  This package provides the libxfdashboard development files.
-
-Package: xfdashboard-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfdashboard (= ${binary:Version})
-Description: GNOME shell like dashboard for Xfce - debugging symbols
- xfdashboard provides an overview of applications currently open enabling the
- user to switch between different applications. The search feature works like
- Xfce's appfinder which makes it convenient to search for and start
- applications.
- .
- This package contains the debugging symbols for xfdashboard.
diff --git a/debian/libxfdashboard-dev.install b/debian/libxfdashboard-dev.install
index 4f13a9c..0471d98 100644
--- a/debian/libxfdashboard-dev.install
+++ b/debian/libxfdashboard-dev.install
@@ -1,2 +1,3 @@
 usr/include/
 usr/lib/*/libxfdashboard.so
+usr/lib/*/pkgconfig/
diff --git a/debian/libxfdashboard0.install b/debian/libxfdashboard0.install
index e143579..dc50e2e 100644
--- a/debian/libxfdashboard0.install
+++ b/debian/libxfdashboard0.install
@@ -1,2 +1 @@
 usr/lib/*/libxfdashboard.so.*
-usr/lib/*/pkgconfig/
diff --git a/debian/rules b/debian/rules
index 38838d8..9148895 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@  --with autotools-dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-silent-rules
+	dh_auto_configure --
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
@@ -22,7 +22,7 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_strip:
-	dh_strip --dbg-package=xfdashboard-dbg
+	dh_strip --dbgsym-migration='xfdashboard-dbg (<< 0.6.0-0ubuntu2~)'
 
 override_dh_makeshlibs:
 	dh_makeshlibs -X debian/xfdashboard/usr/lib/$(DEB_HOST_MULTIARCH)/xfdashboard/plugins/*.so