[tryton-debian-vcs] tryton-modules-carrier branch debian updated. debian/2.8.0-2-4-gcf701ce
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:33:46 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-carrier.git;a=commitdiff;h=debian/2.8.0-2-4-gcf701ce
commit cf701cecc4a5d13ff9f3d16d6e104153f6cad12a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:10 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 2f30772..5f39727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-carrier (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:53:48 +0100
+
tryton-modules-carrier (2.8.0-2) unstable; urgency=low
* Moving doc/index.rst to appropriate subdirectory doc.
commit d46aaf39f45c7b25f636500eb1b10be64cd8cef7
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 24f6740..17b1ab2 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-carrier.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 a4f969acdf621afaf32703af7a4fdcefb61dfcdc
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 0cd5c90..24f6740 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-carrier.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-carrier.git
commit 04d3232ec63ff2c4b9c12c6b6be23eb75f49fe41
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:51 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 5c7a6d9..4f015bc 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 df30fe4..1d83c64 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with carriers
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_carrier
=============
@@ -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/es_CO.po b/locale/es_CO.po
index 821b9e4..fc57ef4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -8,7 +8,7 @@ msgstr "Método de Costo de Transporte"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Trasnportador de Producto"
+msgstr "Transportador de Producto"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 8b77644..ea443be 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -52,7 +52,7 @@ msgstr "Transportistas"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr "Transportistas"
+msgstr "Transportista"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
diff --git a/locale/es_ES.po b/locale/sl_SI.po
similarity index 69%
copy from locale/es_ES.po
copy to locale/sl_SI.po
index 8b77644..a8adb87 100644
--- a/locale/es_ES.po
+++ b/locale/sl_SI.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr "Método coste del transportista"
+msgstr "Obračun špedicijskih stroškov"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Producto del transportista"
+msgstr "Izdelek"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:carrier,id:"
msgid "ID"
@@ -24,52 +24,52 @@ msgstr "ID"
msgctxt "field:carrier,party:"
msgid "Party"
-msgstr "Tercero"
+msgstr "Stranka"
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
-msgstr "Método para calcular el coste del transportista."
+msgstr "Način izračuna špedicijskih stroškov"
msgctxt "model:carrier,name:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr "Špediter"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
-msgstr "Transportistas"
+msgstr "Špediterji"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr "Transportistas"
+msgstr "Špedicija"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr "Transportistas"
+msgstr "Špediterji"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr "Administración de transportista"
+msgstr "Špedicija"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
-msgstr "Precio del producto"
+msgstr "Cena izdelka"
msgctxt "view:carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr "Špediter"
msgctxt "view:carrier:"
msgid "Carriers"
-msgstr "Transportistas"
+msgstr "Špediterji"
diff --git a/setup.py b/setup.py
index 4d6b3ec..00c5171 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_carrier',
'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 4381a52..94a87d9 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_carrier import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 9b26c5a..79c2613 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
party
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 9dd7f51..700c0d8 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with carriers
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_carrier
=============
@@ -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_carrier.egg-info/SOURCES.txt b/trytond_carrier.egg-info/SOURCES.txt
index 3592c31..fa44ab3 100644
--- a/trytond_carrier.egg-info/SOURCES.txt
+++ b/trytond_carrier.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_carrier.egg-info/PKG-INFO
trytond_carrier.egg-info/SOURCES.txt
trytond_carrier.egg-info/dependency_links.txt
diff --git a/trytond_carrier.egg-info/requires.txt b/trytond_carrier.egg-info/requires.txt
index 0dcc8a6..9e4982f 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_party >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_party >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list