Attachment 10222 Details for Bug 50425

[patch] patch

50425.patch (text/plain), 8.12 KB, created by Florian Best on 2019-10-29 08:47 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2019-10-29 08:47 CET

Size: 8.12 KB

patch

obsolete

>commit 0d0fd915351e9dc4effe412c55b47ee68cbbad1d
>Author: Florian Best <best@univention.de>
>Date:   Fri Oct 18 11:58:10 2019 +0200
>
>    migrate appcenter to dh-python
>
>diff --git management/univention-appcenter/debian/control management/univention-appcenter/debian/control
>index 0455c9f4af..c32d6d8664 100644
>--- management/univention-appcenter/debian/control
>+++ management/univention-appcenter/debian/control
>@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7.0.50~),
>  univention-join,
>  univention-ucs-translation-template,
>  univention-config-dev,
>- univention-management-console-dev,
>+ univention-management-console-dev (>= 11.0.4-37),
>  python-debian,
>  python-all,
>  ucslint,
>@@ -18,13 +18,12 @@ X-Python-Version: 2.7
> 
> Package: univention-management-console-module-appcenter
> Architecture: all
>-Depends: univention-management-console-server,
>+Depends: univention-management-console-server (>= 11.0.4-37),
>  python-univention-lib,
>  python-univention (>= 12.0.0-5),
>  shell-univention-lib (>= 3.0.12-4),
>- python-univention-directory-manager (>=9.0.22-13),
>+ python-univention-directory-manager (>= 14.0.14-14),
>  python-univention-appcenter (= ${source:Version}),
>- python-support,
>  univention-config,
>  univention-updater,
>  univention-management-console-module-lib,
>@@ -67,11 +66,11 @@ Package: python-univention-appcenter
> Architecture: all
> Depends: univention-ssh,
>  univention-join (>= 10.0.0-12),
>- univention-directory-manager-tools (>= 13.0.21-21),
>+ univention-directory-manager-tools (>= 14.0.14-14),
>  univention-admin-diary-client (>= 1.0.0-29),
>  python-univention (>= 12.0.0-5),
>  python-univention-config-registry,
>- python-univention-directory-manager,
>+ python-univention-directory-manager (>= 14.0.14-14),
>  python-mysqldb,
>  gnupg,
>  zsync,
>@@ -127,7 +126,6 @@ Package: univention-management-console-module-apps
> Architecture: all
> Depends: univention-management-console-module-appcenter (= ${source:Version}),
>  python-polib,
>- python-support,
>  ${misc:Depends},
>  ${python:Depends},
> Description: UMC module for application overview
>diff --git management/univention-appcenter/debian/rules management/univention-appcenter/debian/rules
>index a020dfd9f3..d4bf0da41f 100755
>--- management/univention-appcenter/debian/rules
>+++ management/univention-appcenter/debian/rules
>@@ -62,9 +62,6 @@ override_dh_auto_install:
> 	python setup_umc.py build --force -b build/univention-appcenter-umc install --force --root=debian/univention-management-console-module-appcenter --install-layout=deb
> 	dh_auto_install
> 
>-	install -D python-legacy/univention-management-console-module-appcenter.public debian/univention-management-console-module-appcenter/usr/share/python-support/univention-management-console-module-appcenter.public
>-	install -D python-legacy/univention-management-console-module-apps.public debian/univention-management-console-module-apps/usr/share/python-support/univention-management-console-module-apps.public
>-
> override_dh_auto_test:
> 	ucslint
> 	dh_auto_test --buildsystem=pybuild
>diff --git management/univention-appcenter/debian/univention-management-console-module-appcenter.install management/univention-appcenter/debian/univention-management-console-module-appcenter.install
>index 774e036d87..fbfc29400c 100644
>--- management/univention-appcenter/debian/univention-management-console-module-appcenter.install
>+++ management/univention-appcenter/debian/univention-management-console-module-appcenter.install
>@@ -1,4 +1,4 @@
>-udm/handlers/appcenter/*.py usr/share/pyshared/univention/admin/handlers/appcenter
>+udm/handlers/appcenter/*.py usr/lib/python2.7/dist-packages/univention/admin/handlers/appcenter
> listener/app_attributes.py usr/lib/univention-directory-listener/system
> ldap/*.schema usr/share/univention-management-console-module-appcenter
> ldap/*.acl usr/share/univention-management-console-module-appcenter
>diff --git management/univention-appcenter/debian/univention-management-console-module-appcenter.postinst management/univention-appcenter/debian/univention-management-console-module-appcenter.postinst
>index 431938118c..a46326b281 100644
>--- management/univention-appcenter/debian/univention-management-console-module-appcenter.postinst
>+++ management/univention-appcenter/debian/univention-management-console-module-appcenter.postinst
>@@ -30,15 +30,6 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <https://www.gnu.org/licenses/>.
> 
>-# Legacy code with python-support
>-# Needs to be done because the source package uses dh_python2, but UMC modules
>-# are still installed the old way
>-# TODO: Remove once we migrated all UMC modules (namely dh-umc-module-install)
>-if which update-python-modules >/dev/null 2>&1; then
>-	update-python-modules univention-management-console-module-appcenter.public
>-	update-python-modules --post-install
>-fi
>-
> #DEBHELPER#
> 
> if [ -z "$2" ]; then
>diff --git management/univention-appcenter/debian/univention-management-console-module-apps.postinst management/univention-appcenter/debian/univention-management-console-module-apps.postinst
>deleted file mode 100644
>index 47f7c4c35b..0000000000
>--- management/univention-appcenter/debian/univention-management-console-module-apps.postinst
>+++ /dev/null
>@@ -1,44 +0,0 @@
>-#!/bin/sh
>-#
>-# Univention Management Console Module Apps
>-#  postinst file for the debian package
>-#
>-# Copyright 2019 Univention GmbH
>-#
>-# https://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# The source code of this program is made available
>-# under the terms of the GNU Affero General Public License version 3
>-# (GNU AGPL V3) as published by the Free Software Foundation.
>-#
>-# Binary versions of this program provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention and not subject to the GNU AGPL V3.
>-#
>-# In the case you use this program under the terms of the GNU AGPL V3,
>-# the program is provided 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 Affero General Public License for more details.
>-#
>-# You should have received a copy of the GNU Affero General Public
>-# License with the Debian GNU/Linux or Univention distribution in file
>-# /usr/share/common-licenses/AGPL-3; if not, see
>-# <https://www.gnu.org/licenses/>.
>-
>-# Legacy code with python-support
>-# Needs to be done because the source package uses dh_python2, but UMC modules
>-# are still installed the old way
>-# TODO: Remove once we migrated all UMC modules (namely dh-umc-module-install)
>-if which update-python-modules >/dev/null 2>&1; then
>-	update-python-modules univention-management-console-module-apps.public
>-	update-python-modules --post-install
>-fi
>-
>-#DEBHELPER#
>-
>-exit 0
>diff --git management/univention-appcenter/python-legacy/univention-management-console-module-appcenter.public management/univention-appcenter/python-legacy/univention-management-console-module-appcenter.public
>deleted file mode 100644
>index 6179aa9b2e..0000000000
>--- management/univention-appcenter/python-legacy/univention-management-console-module-appcenter.public
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-/usr/share/pyshared/univention/admin/handlers/appcenter/__init__.py
>-/usr/share/pyshared/univention/admin/handlers/appcenter/app.py
>-/usr/share/pyshared/univention/management/console/modules/appcenter/__init__.py
>-/usr/share/pyshared/univention/management/console/modules/appcenter/app_center.py
>-/usr/share/pyshared/univention/management/console/modules/appcenter/constants.py
>-/usr/share/pyshared/univention/management/console/modules/appcenter/sanitizers.py
>-/usr/share/pyshared/univention/management/console/modules/appcenter/util.py
>diff --git management/univention-appcenter/python-legacy/univention-management-console-module-apps.public management/univention-appcenter/python-legacy/univention-management-console-module-apps.public
>deleted file mode 100644
>index cae949a8a4..0000000000
>--- management/univention-appcenter/python-legacy/univention-management-console-module-apps.public
>+++ /dev/null
>@@ -1 +0,0 @@
>-/usr/share/pyshared/univention/management/console/modules/apps/__init__.py

Actions: View | Diff

Attachments on bug 50425: 10222