[tryton-debian-vcs] tryton-modules-ldap-connection branch debian updated. debian/2.8.0-3-4-gba11378
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:35:17 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-connection.git;a=commitdiff;h=debian/2.8.0-3-4-gba11378
commit ba113783e165ff4d08a86fd7eef46cb2bbb5b28b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:15 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 2484fff..ee461e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-ldap-connection (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:15 +0100
+
tryton-modules-ldap-connection (2.8.0-3) unstable; urgency=low
* Removing pydist-overrides, it is no more needed.
commit da552f71590c5ec76d1c0e90957598bc6d15c254
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 3b1c8b7..f66bd0c 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-ldap-connection.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 77549c520d47384682aa1d2fa3d53fc631e3758e
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 f79cf4a..3b1c8b7 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-ldap-connection.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-ldap-connection.git
commit 46b27035374b286ccd1f31ee9108389f11887087
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:21 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 5b6b16a..38379c2 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 508a056..a9ab577 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_connection
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add LDAP connection
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_ldap_connection
=======================
@@ -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/fr_FR.po b/locale/fr_FR.po
index 46e1c67..774c53c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -107,14 +107,6 @@ msgid "Never"
msgstr "Aucune"
msgctxt "selection:ldap.connection,secure:"
-msgid "Never"
-msgstr "Aucune"
-
-msgctxt "selection:ldap.connection,secure:"
-msgid "SSL"
-msgstr "SSL"
-
-msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
msgstr "SSL"
@@ -122,14 +114,6 @@ msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "selection:ldap.connection,secure:"
-msgid "TLS"
-msgstr "TLS"
-
-msgctxt "view:ldap.connection:"
-msgid "LDAP Connection"
-msgstr "Connexion LDAP"
-
msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
msgstr "Connexion LDAP"
@@ -138,10 +122,6 @@ msgctxt "view:ldap.connection:"
msgid "_Test Connection"
msgstr "_Test connexion"
-msgctxt "view:ldap.connection:"
-msgid "_Test Connection"
-msgstr "_Test connexion"
-
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
msgstr "Test de connexion réussi"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 68%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 46e1c67..9bcd539 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -8,19 +8,19 @@ msgstr "Active Directory"
msgctxt "field:ldap.connection,bind_dn:"
msgid "Bind DN"
-msgstr "Bind DN"
+msgstr "DN"
msgctxt "field:ldap.connection,bind_pass:"
msgid "Bind Pass"
-msgstr "Mot de passe du lien"
+msgstr "Geslo"
msgctxt "field:ldap.connection,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Ustvarjeno"
msgctxt "field:ldap.connection,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Ustvaril"
msgctxt "field:ldap.connection,id:"
msgid "ID"
@@ -28,19 +28,19 @@ msgstr "ID"
msgctxt "field:ldap.connection,port:"
msgid "Port"
-msgstr "Port"
+msgstr "Vrata"
msgctxt "field:ldap.connection,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:ldap.connection,secure:"
msgid "Secure"
-msgstr "Sécurité"
+msgstr "Varna povezava"
msgctxt "field:ldap.connection,server:"
msgid "Server"
-msgstr "Serveur"
+msgstr "Strežnik"
msgctxt "field:ldap.connection,uri:"
msgid "URI"
@@ -48,11 +48,11 @@ msgstr "URI"
msgctxt "field:ldap.connection,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Zapisano"
msgctxt "field:ldap.connection,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Zapisal"
msgctxt "field:ldap.test_connection.result,id:"
msgid "ID"
@@ -60,31 +60,31 @@ msgstr "ID"
msgctxt "help:ldap.connection,bind_dn:"
msgid "LDAP DN used to bind"
-msgstr "DN LDAP utilisé pour le bind"
+msgstr "LDAP DN za povezavo"
msgctxt "help:ldap.connection,bind_pass:"
msgid "LDAP password used to bind"
-msgstr "Mot de passe LDAP utilisé pour le lien"
+msgstr "LDAP geslo za povezavo"
msgctxt "help:ldap.connection,port:"
msgid "LDAP server port"
-msgstr "Port serveur LDAP"
+msgstr "Vrata LDAP strežnika"
msgctxt "help:ldap.connection,secure:"
msgid "LDAP secure connection"
-msgstr "Connexion LDAP sécurisée"
+msgstr "LDAP varna povezava"
msgctxt "help:ldap.connection,server:"
msgid "LDAP server name"
-msgstr "Nom du serveur LDAP"
+msgstr "Ime LDAP strežnika"
msgctxt "model:ir.action,name:act_connection_form"
msgid "Connection"
-msgstr "Connexion"
+msgstr "Povezava"
msgctxt "model:ir.action,name:wizard_test_connection"
msgid "Test LDAP Connection"
-msgstr "Test connexion LDAP"
+msgstr "Preizkus LDAP povezave"
msgctxt "model:ir.ui.menu,name:menu_administration"
msgid "LDAP"
@@ -92,27 +92,19 @@ msgstr "LDAP"
msgctxt "model:ir.ui.menu,name:menu_connection"
msgid "Connection"
-msgstr "Connexion"
+msgstr "Povezava"
msgctxt "model:ldap.connection,name:"
msgid "LDAP Connection"
-msgstr "Connexion LDAP"
+msgstr "LDAP povezava"
msgctxt "model:ldap.test_connection.result,name:"
msgid "Test Connection"
-msgstr "Test de connexion"
+msgstr "Preizkus povezave"
msgctxt "selection:ldap.connection,secure:"
msgid "Never"
-msgstr "Aucune"
-
-msgctxt "selection:ldap.connection,secure:"
-msgid "Never"
-msgstr "Aucune"
-
-msgctxt "selection:ldap.connection,secure:"
-msgid "SSL"
-msgstr "SSL"
+msgstr "Nikoli"
msgctxt "selection:ldap.connection,secure:"
msgid "SSL"
@@ -122,34 +114,22 @@ msgctxt "selection:ldap.connection,secure:"
msgid "TLS"
msgstr "TLS"
-msgctxt "selection:ldap.connection,secure:"
-msgid "TLS"
-msgstr "TLS"
-
-msgctxt "view:ldap.connection:"
-msgid "LDAP Connection"
-msgstr "Connexion LDAP"
-
msgctxt "view:ldap.connection:"
msgid "LDAP Connection"
-msgstr "Connexion LDAP"
-
-msgctxt "view:ldap.connection:"
-msgid "_Test Connection"
-msgstr "_Test connexion"
+msgstr "LDAP povezava"
msgctxt "view:ldap.connection:"
msgid "_Test Connection"
-msgstr "_Test connexion"
+msgstr "_Preizkus povezave"
msgctxt "view:ldap.test_connection.result:"
msgid "Test Connection Succeed!"
-msgstr "Test de connexion réussi"
+msgstr "Uspešen preizkus povezave!"
msgctxt "view:ldap.test_connection.result:"
msgid "Test LDAP Connection"
-msgstr "Test connexion LDAP"
+msgstr "Preizkus LDAP povezave"
msgctxt "wizard_button:ldap.test_connection,result,end:"
msgid "Close"
-msgstr "Fermer"
+msgstr "Zapri"
diff --git a/setup.py b/setup.py
index 974ed7b..ac9d5de 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_ldap_connection',
'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 68bb457..66b663e 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_ldap_connection import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 540ffd0..7b48603 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
res
diff --git a/trytond_ldap_connection.egg-info/PKG-INFO b/trytond_ldap_connection.egg-info/PKG-INFO
index 8fc6225..1806706 100644
--- a/trytond_ldap_connection.egg-info/PKG-INFO
+++ b/trytond_ldap_connection.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-ldap-connection
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add LDAP connection
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_ldap_connection
=======================
@@ -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_ldap_connection.egg-info/SOURCES.txt b/trytond_ldap_connection.egg-info/SOURCES.txt
index 1b21b9b..59c4337 100644
--- a/trytond_ldap_connection.egg-info/SOURCES.txt
+++ b/trytond_ldap_connection.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_ldap_connection.egg-info/PKG-INFO
trytond_ldap_connection.egg-info/SOURCES.txt
trytond_ldap_connection.egg-info/dependency_links.txt
diff --git a/trytond_ldap_connection.egg-info/requires.txt b/trytond_ldap_connection.egg-info/requires.txt
index 52f768e..a428f45 100644
--- a/trytond_ldap_connection.egg-info/requires.txt
+++ b/trytond_ldap_connection.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-ldap-connection
More information about the tryton-debian-vcs
mailing list