[tryton-debian-vcs] tryton-modules-product-measurements branch debian created. 0e06e84532a40eceb07386a91125e6abc4acd67d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:05:58 UTC 2013
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-measurements.git;a=commitdiff;h=0e06e84532a40eceb07386a91125e6abc4acd67d
commit 0e06e84532a40eceb07386a91125e6abc4acd67d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:20 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index eac0856..d04bc66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product-measurements (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:39 +0100
+
tryton-modules-product-measurements (2.8.0-2) unstable; urgency=low
* Moving doc/index.rst to appropriate subdirectory doc.
commit dfa5e3b7dbec91ee77441226c1e583724e63a020
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index ccee981..af37184 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-measurements.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 436d4fd65fc91188311a2445b45f22ede229ed05
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 24af2ca..ccee981 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-measurements.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-product-measurements.git
commit cb13dced9b2c1b2ec906a7419e1cf7d6eb9130c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:34 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 79c1c2d..8258af5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f927610..1ef26a3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_measurements
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_product_measurements
============================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..fd170af
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.template,height:"
+msgid "Height"
+msgstr "Višina"
+
+msgctxt "field:product.template,height_digits:"
+msgid "Height Digits"
+msgstr "Decimalke za višino"
+
+msgctxt "field:product.template,height_uom:"
+msgid "Height Uom"
+msgstr "ME za višino"
+
+msgctxt "field:product.template,length:"
+msgid "Length"
+msgstr "Dolžina"
+
+msgctxt "field:product.template,length_digits:"
+msgid "Length Digits"
+msgstr "Decimalke za dolžino"
+
+msgctxt "field:product.template,length_uom:"
+msgid "Length Uom"
+msgstr "ME za dolžino"
+
+msgctxt "field:product.template,weight:"
+msgid "Weight"
+msgstr "Teža"
+
+msgctxt "field:product.template,weight_digits:"
+msgid "Weight Digits"
+msgstr "Decimalke za težo"
+
+msgctxt "field:product.template,weight_uom:"
+msgid "Weight Uom"
+msgstr "ME za težo"
+
+msgctxt "field:product.template,width:"
+msgid "Width"
+msgstr "Širina"
+
+msgctxt "field:product.template,width_digits:"
+msgid "Width Digits"
+msgstr "Decimalke za širino"
+
+msgctxt "field:product.template,width_uom:"
+msgid "Width Uom"
+msgstr "ME za širino"
+
+msgctxt "view:product.template:"
+msgid "Measurements"
+msgstr "Mere"
diff --git a/setup.py b/setup.py
index 3218c87..a06f4b8 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_product_measurements',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index afd8893..a3528d7 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from test_product_measurements import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 64d10a8..a200876 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
product
diff --git a/trytond_product_measurements.egg-info/PKG-INFO b/trytond_product_measurements.egg-info/PKG-INFO
index 26ad01c..0c1c66f 100644
--- a/trytond_product_measurements.egg-info/PKG-INFO
+++ b/trytond_product_measurements.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-measurements
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_product_measurements
============================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_product_measurements.egg-info/SOURCES.txt b/trytond_product_measurements.egg-info/SOURCES.txt
index 1a81632..171bb25 100644
--- a/trytond_product_measurements.egg-info/SOURCES.txt
+++ b/trytond_product_measurements.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_product_measurements.egg-info/PKG-INFO
trytond_product_measurements.egg-info/SOURCES.txt
trytond_product_measurements.egg-info/dependency_links.txt
diff --git a/trytond_product_measurements.egg-info/requires.txt b/trytond_product_measurements.egg-info/requires.txt
index fd5ae88..a69ed06 100644
--- a/trytond_product_measurements.egg-info/requires.txt
+++ b/trytond_product_measurements.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 1e0122c6cea59008cc731b9e7003e759209bf8f2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:21:00 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index 7a821b2..eac0856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-product-measurements (2.8.0-2) unstable; urgency=low
+
+ * Moving doc/index.rst to appropriate subdirectory doc.
+ * Simplifying package layout by renaming <pkg_name>.docs to docs.
+ * Removing needless empty line in rules.
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:33:15 +0200
+
tryton-modules-product-measurements (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 88773a2c0745142b0187c7689fa831c4bf6292a2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit b06dd142a4a51fba86eae9136f2d0806d80ae808
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit 33d26f2d3ff53e6d30c03a68beefd2dc13248a93
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 16:57:52 2013 +0200
Simplifying package layout by renaming <pkg_name>.docs to docs.
Thanks to Andreas Tille for this proposal. Since tryton module packages
will most probably stay simple binary packages this change simplifies the
package layout.
diff --git a/debian/tryton-modules-product-measurements.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-product-measurements.docs
rename to debian/docs
commit 65d8bdf767bdd450e8538dbf733362f25b4ebafd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 14 18:40:52 2013 +0200
Moving doc/index.rst to appropriate subdirectory doc.
diff --git a/debian/tryton-modules-product-measurements.docs b/debian/tryton-modules-product-measurements.docs
index 172a1f8..a2e6bd4 100644
--- a/debian/tryton-modules-product-measurements.docs
+++ b/debian/tryton-modules-product-measurements.docs
@@ -1 +1 @@
-doc/index.rst
+doc/
commit 9a088e091c755ed4484712ab0028ac1f6470fb4f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:09 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 84eb17d..7a821b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product-measurements (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+ * First upload to Debian (Closes: #706842).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:31 +0200
+
tryton-modules-product-measurements (2.6.0-2) experimental; urgency=low
* Improving update of major version in Depends.
commit 858b8c1d21ea229f72fdc6bd58b5f18b969125e2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:10 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 776b559..4413e1c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2012 Cédric Krier
+Copyright: 2011-2013 Cédric Krier
2011-2012 Bertrand Chenal
2011 Nicolas Évrard
- 2011-2012 B2CK SPRL
+ 2011-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 3dc911099a089588d6fd1e638a51a2e048ba75f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:01 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index c6d5b30..79c1c2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..87a90a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2013 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index e4632a1..732a76e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index aec1ae4..f927610 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product_measurements
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_product_measurements
============================
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a239be5..b821d50 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -8,11 +8,11 @@ msgstr "Altura"
msgctxt "field:product.template,height_digits:"
msgid "Height Digits"
-msgstr "Decimales de altura"
+msgstr "Dígitos de altura"
msgctxt "field:product.template,height_uom:"
msgid "Height Uom"
-msgstr "Altura UdM"
+msgstr "UdM de altura"
msgctxt "field:product.template,length:"
msgid "Length"
@@ -20,11 +20,11 @@ msgstr "Longitud"
msgctxt "field:product.template,length_digits:"
msgid "Length Digits"
-msgstr "Decimales de longitud"
+msgstr "Dígitos de longitud"
msgctxt "field:product.template,length_uom:"
msgid "Length Uom"
-msgstr "Longitud UdM"
+msgstr "UdM de longitud"
msgctxt "field:product.template,weight:"
msgid "Weight"
@@ -32,11 +32,11 @@ msgstr "Peso"
msgctxt "field:product.template,weight_digits:"
msgid "Weight Digits"
-msgstr "Decimales del peso"
+msgstr "Dígitos de peso"
msgctxt "field:product.template,weight_uom:"
msgid "Weight Uom"
-msgstr "Peso UdM"
+msgstr "UdM de peso"
msgctxt "field:product.template,width:"
msgid "Width"
@@ -44,11 +44,11 @@ msgstr "Ancho"
msgctxt "field:product.template,width_digits:"
msgid "Width Digits"
-msgstr "Decimales del ancho"
+msgstr "Dígitos de ancho"
msgctxt "field:product.template,width_uom:"
msgid "Width Uom"
-msgstr "Ancho UdM"
+msgstr "UdM de ancho"
msgctxt "view:product.template:"
msgid "Measurements"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index ae236bf..9f06c93 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,56 +4,52 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.template,height:"
msgid "Height"
-msgstr ""
+msgstr "Alto"
msgctxt "field:product.template,height_digits:"
msgid "Height Digits"
-msgstr ""
+msgstr "Decimales de Alto"
msgctxt "field:product.template,height_uom:"
msgid "Height Uom"
-msgstr ""
+msgstr "UdM de Alto"
-#, fuzzy
msgctxt "field:product.template,length:"
msgid "Length"
-msgstr "Longitud"
+msgstr "Largo"
msgctxt "field:product.template,length_digits:"
msgid "Length Digits"
-msgstr ""
+msgstr "Decimales de Largo"
msgctxt "field:product.template,length_uom:"
msgid "Length Uom"
-msgstr ""
+msgstr "UdM de Largo"
-#, fuzzy
msgctxt "field:product.template,weight:"
msgid "Weight"
msgstr "Peso"
msgctxt "field:product.template,weight_digits:"
msgid "Weight Digits"
-msgstr ""
+msgstr "Decimales de Peso"
-#, fuzzy
msgctxt "field:product.template,weight_uom:"
msgid "Weight Uom"
msgstr "UdM de Peso"
-#, fuzzy
msgctxt "field:product.template,width:"
msgid "Width"
msgstr "Ancho"
msgctxt "field:product.template,width_digits:"
msgid "Width Digits"
-msgstr ""
+msgstr "Decimales de Ancho"
msgctxt "field:product.template,width_uom:"
msgid "Width Uom"
-msgstr ""
+msgstr "UdM de Ancho"
msgctxt "view:product.template:"
msgid "Measurements"
-msgstr ""
+msgstr "Medidas"
diff --git a/product.xml b/product.xml
index e083cee..c1be0f0 100644
--- a/product.xml
+++ b/product.xml
@@ -7,31 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="template_view_form">
<field name="model">product.template</field>
<field name="inherit" ref="product.template_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook"
- position="inside">
- <page string="Measurements" col="3" id="measurements"
- states="{'invisible': Eval('type').in_(['service'])}">
- <label name="length"/>
- <field name="length"/>
- <field name="length_uom"/>
- <label name="height"/>
- <field name="height"/>
- <field name="height_uom"/>
- <label name="width"/>
- <field name="width"/>
- <field name="width_uom"/>
- <label name="weight"/>
- <field name="weight"/>
- <field name="weight_uom"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">template_form</field>
</record>
</data>
diff --git a/setup.py b/setup.py
index 3148f82..3218c87 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_product_measurements',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_product_measurements',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.product_measurements': '.'},
packages=[
'trytond.modules.product_measurements',
'trytond.modules.product_measurements.tests',
],
package_data={
- 'trytond.modules.product_measurements': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.product_measurements': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index 760eb94..64d10a8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
product
diff --git a/trytond_product_measurements.egg-info/PKG-INFO b/trytond_product_measurements.egg-info/PKG-INFO
index c51125f..26ad01c 100644
--- a/trytond_product_measurements.egg-info/PKG-INFO
+++ b/trytond_product_measurements.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-product-measurements
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_product_measurements
============================
diff --git a/trytond_product_measurements.egg-info/SOURCES.txt b/trytond_product_measurements.egg-info/SOURCES.txt
index 4e782b3..1a81632 100644
--- a/trytond_product_measurements.egg-info/SOURCES.txt
+++ b/trytond_product_measurements.egg-info/SOURCES.txt
@@ -28,4 +28,5 @@ trytond_product_measurements.egg-info/dependency_links.txt
trytond_product_measurements.egg-info/entry_points.txt
trytond_product_measurements.egg-info/not-zip-safe
trytond_product_measurements.egg-info/requires.txt
-trytond_product_measurements.egg-info/top_level.txt
\ No newline at end of file
+trytond_product_measurements.egg-info/top_level.txt
+view/template_form.xml
\ No newline at end of file
diff --git a/trytond_product_measurements.egg-info/requires.txt b/trytond_product_measurements.egg-info/requires.txt
index b077aeb..fd5ae88 100644
--- a/trytond_product_measurements.egg-info/requires.txt
+++ b/trytond_product_measurements.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_product >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000..3eb333f
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/form/notebook" position="inside">
+ <page string="Measurements" col="3" id="measurements"
+ states="{'invisible': Eval('type').in_(['service'])}">
+ <label name="length"/>
+ <field name="length"/>
+ <field name="length_uom"/>
+ <label name="height"/>
+ <field name="height"/>
+ <field name="height_uom"/>
+ <label name="width"/>
+ <field name="width"/>
+ <field name="width_uom"/>
+ <label name="weight"/>
+ <field name="weight"/>
+ <field name="weight_uom"/>
+ </page>
+ </xpath>
+</data>
commit e54f1b9e4f66d4dc8542c78b1980d33b98faf66e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:52 2013 +0200
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 0a953a0..84eb17d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product-measurements (2.6.0-2) experimental; urgency=low
+
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:07:55 +0200
+
tryton-modules-product-measurements (2.6.0-1) experimental; urgency=low
* Initial packaging.
commit bda4494a43a4454cb019948e600fb2d5a8f97aeb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 0333ca4..24af2ca 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-product-measurements
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-product (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Product Measurements Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit 8b589962a6cb5fd6fe836eebe84a7a72619e6eb5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 23 15:08:56 2013 +0200
Adding debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..0a953a0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-product-measurements (2.6.0-1) experimental; urgency=low
+
+ * Initial packaging.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 23 Apr 2013 14:33:56 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0333ca4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: tryton-modules-product-measurements
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Standards-Version: 3.9.4
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-measurements.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-product-measurements.git
+X-Python-Version: >= 2.6
+
+Package: tryton-modules-product-measurements
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-product (>= 2.6), python-pkg-resources
+Description: Tryton Application Platform (Product Measurements Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This package adds the handling of following measurements for products:
+ .
+ * Length, Height, Width, Weight
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..776b559
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: 2011-2012 Cédric Krier
+ 2011-2012 Bertrand Chenal
+ 2011 Nicolas Évrard
+ 2011-2012 B2CK SPRL
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..1ae0776
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..22a4de9
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = xz
+compression-level = 9
diff --git a/debian/tryton-modules-product-measurements.docs b/debian/tryton-modules-product-measurements.docs
new file mode 100644
index 0000000..172a1f8
--- /dev/null
+++ b/debian/tryton-modules-product-measurements.docs
@@ -0,0 +1 @@
+doc/index.rst
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..22d3ce0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_product_measurements-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-product-measurements
More information about the tryton-debian-vcs
mailing list