debian/*: Adopt packaging changes from official Debian package.

4 files changed, 24 insertions, 23 deletions

diff --git a/debian/control b/debian/control
index 1ad29a4..54d8e7d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,16 @@ Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1.1),
-               mate-common,
-               libxi-dev,
-               libx11-dev,
-               libgtest-dev,
-               libglib2.0-dev (>=2.14.0),
-               libgtk-3-dev,
-               gtk-doc-tools,
                gobject-introspection,
+               gtk-doc-tools,
                libgirepository1.0-dev,
-               valac (>= 0.16)
-#               libxorg-gtest-dev,
+               libglib2.0-dev (>=2.14.0),
+               libgtest-dev,
+               libgtk-3-dev,
+               libx11-dev,
+               libxi-dev,
+               mate-common,
+               valac (>= 0.16),
 Standards-Version: 4.1.1
 Homepage: https://github.com/AyatanaIndicator/ayatana-ido
 Vcs-Git: https://github.com/AyatanaIndicator/ayatana-ido
@@ -23,8 +22,8 @@ Vcs-Browser: https://github.com/AyatanaIndicator/ayatana-ido
 
 Package: libayatana-ido3-0.4-0
 Architecture: any
-Depends: ${shlibs:Depends}, 
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Multi-Arch: same
 Description: Widgets and other objects used for Ayatana Indicators
  Shared library providing extra gtk menu items for display in system
@@ -36,13 +35,13 @@ Description: Widgets and other objects used for Ayatana Indicators
 Package: libayatana-ido3-0.4-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gir1.2-ayatana-ido3-0.4 (= ${binary:Version}),
+Depends: gir1.2-ayatanaido3-0.4 (= ${binary:Version}),
          libayatana-ido3-0.4-0 (= ${binary:Version}),
-         pkg-config,
          libglib2.0-dev (>=2.14.0),
          libgtk-3-dev (>= 3.8.2-0ubuntu2),
+         pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Widgets and other objects used for Ayatana Indicators - development files
  Shared library providing extra gtk menu items for display in system
  Ayatana Indicators
@@ -50,13 +49,15 @@ Description: Widgets and other objects used for Ayatana Indicators - development
  This package contains files that are needed to build GTK+ 3 applications
  with Ayatana Indicators support.
 
-Package: gir1.2-ayatana-ido3-0.4
+Package: gir1.2-ayatanaido3-0.4
 Section: introspection
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         libayatana-ido3-0.4-0 (>= ${binary:Version}),
-         ${gir:Depends}
+Breaks: gir1.2-ayatana-ido3-0.4 (<< 0.4.2-1~),
+Replaces gir1.2-ayatana-ido3-0.4 (<< 0.4.2-1~),
+Depends: libayatana-ido3-0.4-0 (>= ${binary:Version}),
+         ${gir:Depends},
+         ${misc:Depends},
 Description: Widgets and other objects used for Ayatana Indicators - Typelib file
  Shared library providing extra gtk menu items for display in system
  Ayatana Indicators.
diff --git a/debian/copyright b/debian/copyright
index ce9d032..d714da6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -150,7 +150,7 @@ License: LGPL-2+
  .
  You should have received a copy of the GNU Library General Public
  License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  02110-1301  USA
  .
  See /usr/share/common-licenses/LGPL-2 for the full license text.
diff --git a/debian/libayatana-ido3-0.4-dev.install b/debian/libayatana-ido3-0.4-dev.install
index a30594c..e1194bc 100644
--- a/debian/libayatana-ido3-0.4-dev.install
+++ b/debian/libayatana-ido3-0.4-dev.install
@@ -1,5 +1,5 @@
 usr/include/libayatana-ido3-*
-usr/lib/*/pkgconfig/libayatana-ido3-*
 usr/lib/*/libayatana-ido3-*.so
-usr/share/vala
+usr/lib/*/pkgconfig/libayatana-ido3-*
 usr/share/gir-1.0
+usr/share/vala
diff --git a/debian/watch b/debian/watch
index 6dfd70b..d73f4d7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://releases.arctica-project.org/source/ayatana-ido/ayatana-ido-(.+)\.tar\.gz
+https://releases.ayatana-indicators.org/source/ayatana-ido/ayatana-ido-(.+)\.tar\.gz