Update replaces and depends

diff --git a/debian/changelog b/debian/changelog
index 886b2840c9d3cbc768e3b45114080dabd8ad741e..ea25c00286efb1ff073f90e9af08493cadb33fa4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ glabels (3.0.0-3) unstable; urgency=low
 
   * Remove obsolete configure options
   * Remove broken man page symlink
+  * Remove Replaces for glabels 2.0 transition
+  * Depend on gnome-desktop-data for licenses in GNOME help
 
  -- Jakob Haufe <sur5r@sur5r.net>  Mon, 09 Apr 2012 17:23:25 +0200
 

diff --git a/debian/control b/debian/control
index 18ae6abbcc2c00bc79790b0c3cd2a7cc79a8e9f8..c8c27ee3587e70d371af9bb81d935cdb5e02974a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Depends: glabels-data (= ${source:Version}),
          ${misc:Depends}
 Recommends: evince
 Suggests: evolution-data-server
-Replaces: glabels-data (<< 2.2.5-1)
 Provides: libglabels5
 Description: label, business card and media cover creation program for GNOME
  gLabels is a lightweight program for creating labels, barcodes, business
@@ -41,8 +40,7 @@ Description: label, business card and media cover creation program for GNOME
 
 Package: glabels-data
 Architecture: all
-Depends: ${misc:Depends}
-Replaces: glabels (<< 2.0.2)
+Depends: gnome-desktop-data, ${misc:Depends}
 Description: data files for gLabels
  gLabels is a lightweight program for creating labels, barcodes, business
  cards and media covers for the GNOME desktop environment.
@@ -58,7 +56,6 @@ Depends: glabels (= ${binary:Version}),
          libglib2.0-dev,
          libxml2-dev,
          ${misc:Depends}
-Replaces: glabels (<< 2.0.2)
 Description: development documentation and library files for gLabels
  gLabels is a lightweight program for creating labels, barcodes, business
  cards and media covers for the GNOME desktop environment.