The handling of api-min/max will change with the next 2012.0/trunk revision: Starting with 2012.0, API version numbers will not include the patch anymore. The new API version will be xxxx.xx instead of xxxx.xx.xx. This will invalidate all of these patches. Obviously, we need to make a better job in fixing up these settings prior to the release.
Signed-off-by: Stefan Peter <[email protected]> diff --git a/debian/patches/55_pyplugin.diff b/debian/patches/55_pyplugin.diff index 4711ebf..e05229f 100644 --- a/debian/patches/55_pyplugin.diff +++ b/debian/patches/55_pyplugin.diff @@ -1,55 +1,53 @@ -# HG changeset patch -# User harryvanderwolf <[email protected]> -# Date 1337532569 -7200 -# Node ID 94678feaaa0239db5ca32d9b13125ecefcd6b2a6 -# Parent 19ab5dd796c43ac2cd3b977c467d2b73e9c4f798 -[KFJ] Update api-max to 2011.5 in python scripts +Author: Stefan Peter <[email protected]> +Description: Adapt the api-min/max to the new version -diff --git a/src/hugin_script_interface/plugins-dev/dual_use.py b/src/hugin_script_interface/plugins-dev/dual_use.py ---- a/src/hugin_script_interface/plugins-dev/dual_use.py -+++ b/src/hugin_script_interface/plugins-dev/dual_use.py +--- a/src/hugin_script_interface/plugins-dev/dual_use.py 2012-07-26 16:08:18.000000000 +0200 ++++ b/src/hugin_script_interface/plugins-dev/dual_use.py 2012-07-26 16:09:37.000000000 +0200 @@ -24,7 +24,7 @@ # @category Examples # @name Dual Use Plugin # @api-min 2011.1.0 --# @api-max 2011.2.0 -+# @api-max 2011.5.0 +-# @api-max 2011.5.0 ++# @api-max 2012.0.0 # dual_use will function as a hugin plugin and as a standalone # Python script. -diff --git a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py ---- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py -+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py -@@ -19,7 +19,7 @@ +--- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py 2012-07-26 16:05:16.000000000 +0200 ++++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py 2012-07-26 16:05:46.000000000 +0200 +@@ -18,8 +18,8 @@ + # @category Examples # @name Skeleton Plugin - # @api-min 2011.1.0 --# @api-max 2011.2.0 -+# @api-max 2011.5.0 +-# @api-min 2011.1.0 +-# @api-max 2011.5.0 ++# @api-min 2011.1.0.0 ++# @api-max 2012.0.0.0 # we use modern type python print statements: -diff --git a/src/hugin_script_interface/plugins/crop_cp.py b/src/hugin_script_interface/plugins/crop_cp.py ---- a/src/hugin_script_interface/plugins/crop_cp.py -+++ b/src/hugin_script_interface/plugins/crop_cp.py -@@ -24,7 +24,7 @@ +--- a/src/hugin_script_interface/plugins/crop_cp.py 2012-07-26 16:12:07.000000000 +0200 ++++ b/src/hugin_script_interface/plugins/crop_cp.py 2012-07-26 16:12:44.000000000 +0200 +@@ -23,8 +23,8 @@ + # @category Control Points # @name Crop Control Points - # @api-min 2011.1 --# @api-max 2011.2 -+# @api-max 2011.5 +-# @api-min 2011.1 +-# @api-max 2011.5 ++# @api-min 2011.1.0 ++# @api-max 2012.0.0 # crop_cps will function as a hugin plugin and as a standalone # Python script. It can also serve as a template for a slightly -diff --git a/src/hugin_script_interface/plugins/top_five.py b/src/hugin_script_interface/plugins/top_five.py ---- a/src/hugin_script_interface/plugins/top_five.py -+++ b/src/hugin_script_interface/plugins/top_five.py -@@ -5,7 +5,7 @@ +--- a/src/hugin_script_interface/plugins/top_five.py 2012-07-26 16:14:53.000000000 +0200 ++++ b/src/hugin_script_interface/plugins/top_five.py 2012-07-26 16:15:09.000000000 +0200 +@@ -4,8 +4,8 @@ + # @category Control Points # @name keep 5 CPs per image pair - # @api-min 2011.1 --# @api-max 2011.2 -+# @api-max 2011.5 +-# @api-min 2011.1 +-# @api-max 2011.5 ++# @api-min 2011.1.0 ++# @api-max 2012.0.0 # top_five.py - keep the five best CPs for each image pair diff --git a/debian/patches/56_shooting_pattern.diff b/debian/patches/56_shooting_pattern.diff index 537f888..07eb751 100644 --- a/debian/patches/56_shooting_pattern.diff +++ b/debian/patches/56_shooting_pattern.diff @@ -1,19 +1,14 @@ -# HG changeset patch -# User harryvanderwolf <[email protected]> -# Date 1337533787 -7200 -# Node ID aa82fe95d60377191c6b9823dc40b307f317f9d6 -# Parent 94678feaaa0239db5ca32d9b13125ecefcd6b2a6 -[KFJ] also update api-max in shooting_pattern.py from 2011.1 to 2011.5 +Author: Stefan Peter <[email protected]> +Description: Adapt the api-min/max to the new version -diff --git a/src/hugin_script_interface/plugins/shooting_pattern.py b/src/hugin_script_interface/plugins/shooting_pattern.py ---- a/src/hugin_script_interface/plugins/shooting_pattern.py -+++ b/src/hugin_script_interface/plugins/shooting_pattern.py +--- a/src/hugin_script_interface/plugins/shooting_pattern.py 2012-07-26 16:11:03.000000000 +0200 ++++ b/src/hugin_script_interface/plugins/shooting_pattern.py 2012-07-26 16:10:24.000000000 +0200 @@ -41,7 +41,7 @@ # @name 6-1-1 Shooting Pattern # @description apply a shooting pattern (6 around, 1 up 1 down) # @sys win nix mac --# @api-max 2011.1.0 -+# @api-max 2011.5.0 +-# @api-max 2011.5.0 ++# @api-max 2012.0.0 # @api-min 2011.1.0 # the position routine will apply yaw, pitch to an image diff --git a/debian/patches/57_woavers.diff b/debian/patches/57_woavers.diff index abf0a69..3d027a0 100644 --- a/debian/patches/57_woavers.diff +++ b/debian/patches/57_woavers.diff @@ -1,14 +1,16 @@ -Author: Andreas Metzler <[email protected]> -Description: Also bump compat version in woa.py. +Author: Stefan Peter <[email protected]> +Description: Adapt the api-min/max to the new version ---- hugin-2011.4.0+dfsg.orig/src/hugin_script_interface/plugins/woa.py -+++ hugin-2011.4.0+dfsg/src/hugin_script_interface/plugins/woa.py -@@ -25,7 +25,7 @@ gpl = r""" +--- a/src/hugin_script_interface/plugins/woa.py 2012-07-26 16:13:35.000000000 +0200 ++++ b/src/hugin_script_interface/plugins/woa.py 2012-07-26 16:13:56.000000000 +0200 +@@ -24,8 +24,8 @@ + """ # @category Control Points # @name Warped Overlap Analysis - # @api-min 2011.1 --# @api-max 2011.2 -+# @api-max 2011.5 +-# @api-min 2011.1 +-# @api-max 2011.5 ++# @api-min 2011.1.0 ++# @api-max 2012.0.0 # note that if you want to read the script, it's written bottom-up, so the # higher-level routines are towards the end. -- 1.7.9.5 _______________________________________________ Pkg-phototools-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-phototools-devel
