[tryton-debian-vcs] tryton-modules-product-measurements branch debian updated. debian/2.8.0-2-4-g0e06e84

git repository hosting tryton-debian-vcs at m9s.biz
Mon Nov 25 19:36:10 UTC 2013


The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-measurements.git;a=commitdiff;h=debian/2.8.0-2-4-g0e06e84

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
-- 
tryton-modules-product-measurements



More information about the tryton-debian-vcs mailing list