r37009 - in /desktop/experimental/gnome-calculator/debian: changelog control.in rules

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Mar 18 14:27:15 2013
New Revision: 37009

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37009
Log:
Use epoch on transitional package rather then the 6.4.999+ prefix
revert lowering the breaks and replaces version which will benefit ubuntu

Modified:
    desktop/experimental/gnome-calculator/debian/changelog
    desktop/experimental/gnome-calculator/debian/control.in
    desktop/experimental/gnome-calculator/debian/rules

Modified: desktop/experimental/gnome-calculator/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-calculator/debian/changelog?rev=37009&op=diff
==============================================================================
--- desktop/experimental/gnome-calculator/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-calculator/debian/changelog [utf-8] Mon Mar 18 14:27:15 2013
@@ -15,9 +15,7 @@
     - we only need to make sure the transitional packages has
       a high enough version number, not the new packages.
     - override dh_gencontrol for gcalctool transitional package
-      to set it's version to 6.4.999+$(DEB_VERSION)
-  * Lower gnome-calculator Breaks and Replaces gcalctool version to
-    (<< 6.4.999) instead of (<< 6.7)
+      to add an epoch there (set version to 1:$(DEB_VERSION)).
 
  -- Andreas Henriksson <andreas at fatal.se>  Mon, 18 Mar 2013 12:41:17 +0100
 

Modified: desktop/experimental/gnome-calculator/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-calculator/debian/control.in?rev=37009&op=diff
==============================================================================
--- desktop/experimental/gnome-calculator/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-calculator/debian/control.in [utf-8] Mon Mar 18 14:27:15 2013
@@ -26,8 +26,8 @@
 Recommends: yelp,
             gvfs,
             gnome-icon-theme
-Breaks: gcalctool (<< 6.4.999)
-Replaces: gcalctool (<< 6.4.999)
+Breaks: gcalctool (<< 6.7)
+Replaces: gcalctool (<< 6.7)
 Description: GNOME desktop calculator
  gcalctool is a powerful graphical calculator with financial, logical and
  scientific modes. It uses a multiple precision package to do its arithmetic

Modified: desktop/experimental/gnome-calculator/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-calculator/debian/rules?rev=37009&op=diff
==============================================================================
--- desktop/experimental/gnome-calculator/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-calculator/debian/rules [utf-8] Mon Mar 18 14:27:15 2013
@@ -10,4 +10,4 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 # make the transitional package have a high enough version number
-DEB_DH_GENCONTROL_ARGS_gcalctool += -u-v6.4.999+$(DEB_VERSION)
+DEB_DH_GENCONTROL_ARGS_gcalctool += -u-v1:$(DEB_VERSION)