r54811 - in /desktop/unstable/gnome-dictionary/debian: changelog control control.in gnome-dictionary.install libgdict-common.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Nov 11 15:01:34 2017
New Revision: 54811

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54811
Log:
Fold libgdict-common into the gnome-dictionary binary package.
After the removal of the libgdict library package it no longer makes sense
to keep libgdict-common as a separate binary package.

Removed:
    desktop/unstable/gnome-dictionary/debian/gnome-dictionary.install
    desktop/unstable/gnome-dictionary/debian/libgdict-common.install
Modified:
    desktop/unstable/gnome-dictionary/debian/changelog
    desktop/unstable/gnome-dictionary/debian/control
    desktop/unstable/gnome-dictionary/debian/control.in
    desktop/unstable/gnome-dictionary/debian/rules

Modified: desktop/unstable/gnome-dictionary/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/changelog?rev=54811&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] Sat Nov 11 15:01:34 2017
@@ -1,3 +1,11 @@
+gnome-dictionary (3.26.1-3) UNRELEASED; urgency=medium
+
+  * Fold libgdict-common into the gnome-dictionary binary package.
+    After the removal of the libgdict library package it no longer makes sense
+    to keep libgdict-common as a separate binary package.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 11 Nov 2017 16:00:09 +0100
+
 gnome-dictionary (3.26.1-2) unstable; urgency=high
 
   * Depend on libgdict-common, accidentally dropped in 3.25.90-1

Modified: desktop/unstable/gnome-dictionary/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/control?rev=54811&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/control	[utf-8] Sat Nov 11 15:01:34 2017
@@ -25,23 +25,14 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-dictionary
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-dictionary
 
-Package: libgdict-common
-Section: libs
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Description: GNOME Dictionary base library - common files
- This package contains the translation files and dictionary source
- definitions used by the GNOME dictionary utility, and other
- applications providing similar functionality.
-
 Package: gnome-dictionary
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgdict-common (>= ${source:Version})
+         ${misc:Depends}
 Recommends: yelp
 Provides: dict-client
+Conflicts: libgdict-common
+Replaces: libgdict-common
 Description: GNOME dictionary application
  This program can look for the definition or translation of a word in
  existing databases over the Internet

Modified: desktop/unstable/gnome-dictionary/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/control.in?rev=54811&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/control.in	[utf-8] Sat Nov 11 15:01:34 2017
@@ -21,23 +21,14 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-dictionary
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-dictionary
 
-Package: libgdict-common
-Section: libs
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Description: GNOME Dictionary base library - common files
- This package contains the translation files and dictionary source
- definitions used by the GNOME dictionary utility, and other
- applications providing similar functionality.
-
 Package: gnome-dictionary
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgdict-common (>= ${source:Version})
+         ${misc:Depends}
 Recommends: yelp
 Provides: dict-client
+Conflicts: libgdict-common
+Replaces: libgdict-common
 Description: GNOME dictionary application
  This program can look for the definition or translation of a word in
  existing databases over the Internet

Modified: desktop/unstable/gnome-dictionary/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/rules?rev=54811&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/rules	[utf-8] Sat Nov 11 15:01:34 2017
@@ -11,6 +11,3 @@
 	dh_auto_configure -- \
 		-Dbuild_man=true \
 		-Duse_ipv6=true
-
-override_dh_install:
-	dh_install --fail-missing