r49073 - in /desktop/unstable/caribou/debian: changelog control control.in rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Tue Jun 14 18:18:26 UTC 2016
Author: bigon
Date: Tue Jun 14 18:18:26 2016
New Revision: 49073
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49073
Log:
* Switch to python3
* Drop -dbg packages and rely on the automatically -dbgsym built ones
* debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
Modified:
desktop/unstable/caribou/debian/changelog
desktop/unstable/caribou/debian/control
desktop/unstable/caribou/debian/control.in
desktop/unstable/caribou/debian/rules
Modified: desktop/unstable/caribou/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/changelog?rev=49073&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/changelog [utf-8] (original)
+++ desktop/unstable/caribou/debian/changelog [utf-8] Tue Jun 14 18:18:26 2016
@@ -1,3 +1,11 @@
+caribou (0.4.20-2) UNRELEASED; urgency=medium
+
+ * Switch to python3
+ * Drop -dbg packages and rely on the automatically -dbgsym built ones
+ * debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 14 Jun 2016 20:02:21 +0200
+
caribou (0.4.20-1) unstable; urgency=medium
* New upstream release.
Modified: desktop/unstable/caribou/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/control?rev=49073&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/control [utf-8] (original)
+++ desktop/unstable/caribou/debian/control [utf-8] Tue Jun 14 18:18:26 2016
@@ -6,13 +6,13 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
-Build-Depends: debhelper (>= 8.1.3~),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
+Build-Depends: debhelper (>= 9.20160114~),
cdbs (>= 0.4.93~),
gnome-pkg-tools,
dh-autoreconf,
intltool (>= 0.35.0),
- python (>= 2.6.6-3~),
+ python3 (>= 2.6.6-3~),
python-gi-dev (>= 2.90.3),
valac,
gobject-introspection (>= 0.10.7),
@@ -28,8 +28,8 @@
libxklavier-dev,
libxml2-dev,
libxtst-dev
-X-Python-Version: >= 2.4
-Standards-Version: 3.9.7
+X-Python3-Version: >= 3.2
+Standards-Version: 3.9.8
Homepage: https://wiki.gnome.org/Projects/Caribou
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/caribou
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/caribou/
@@ -87,31 +87,19 @@
can be used by packages using the GIRepository format to generate
dynamic bindings.
-Package: libcaribou-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libcaribou0 (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Configurable on screen keyboard - library (debug symbols)
- An input assistive technology intended for switch and pointer users.
- .
- This package contains the debugging symbols for libcaribou library.
-
Package: caribou
Section: gnome
Architecture: any
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
${shlibs:Depends},
${misc:Depends},
- python-gi,
+ python3-gi,
gir1.2-caribou-1.0,
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-clutter-1.0,
- python-dbus,
- python-pyatspi
+ python3-dbus,
+ python3-pyatspi
Description: Configurable on screen keyboard with scanning mode
An input assistive technology intended for switch and pointer users.
@@ -119,14 +107,14 @@
Section: gnome
Priority: optional
Architecture: all
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
caribou (>= ${source:Version}),
- python-gi,
+ python3-gi,
gir1.2-caribou-1.0,
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-clutter-1.0,
- python-dbus,
+ python3-dbus,
${misc:Depends}
Description: Configurable on screen keyboard with scanning mode
An input assistive technology intended for switch and pointer users.
@@ -143,18 +131,6 @@
.
This package contains the GTK+ 2.0 module library.
-Package: libcaribou-gtk-module-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: libcaribou-gtk-module (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Configurable on screen keyboard with scanning mode - module
- An input assistive technology intended for switch and pointer users.
- .
- This package contains detached debugging symbols for libcaribou-gtk-module.
-
Package: libcaribou-gtk3-module
Architecture: any
Depends: ${shlibs:Depends},
@@ -166,15 +142,3 @@
An input assistive technology intended for switch and pointer users.
.
This package contains the GTK+ 3.0 module library.
-
-Package: libcaribou-gtk3-module-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: libcaribou-gtk3-module (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Configurable on screen keyboard with scanning mode - module
- An input assistive technology intended for switch and pointer users.
- .
- This package contains detached debugging symbols for libcaribou-gtk3-module.
Modified: desktop/unstable/caribou/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/control.in?rev=49073&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/control.in [utf-8] (original)
+++ desktop/unstable/caribou/debian/control.in [utf-8] Tue Jun 14 18:18:26 2016
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@, Rico Tzschichholz <ricotz at ubuntu.com>
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 9.20160114~),
cdbs (>= 0.4.93~),
gnome-pkg-tools,
dh-autoreconf,
intltool (>= 0.35.0),
- python (>= 2.6.6-3~),
+ python3 (>= 2.6.6-3~),
python-gi-dev (>= 2.90.3),
valac,
gobject-introspection (>= 0.10.7),
@@ -24,8 +24,8 @@
libxklavier-dev,
libxml2-dev,
libxtst-dev
-X-Python-Version: >= 2.4
-Standards-Version: 3.9.7
+X-Python3-Version: >= 3.2
+Standards-Version: 3.9.8
Homepage: https://wiki.gnome.org/Projects/Caribou
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/caribou
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/caribou/
@@ -83,31 +83,19 @@
can be used by packages using the GIRepository format to generate
dynamic bindings.
-Package: libcaribou-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libcaribou0 (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Configurable on screen keyboard - library (debug symbols)
- An input assistive technology intended for switch and pointer users.
- .
- This package contains the debugging symbols for libcaribou library.
-
Package: caribou
Section: gnome
Architecture: any
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
${shlibs:Depends},
${misc:Depends},
- python-gi,
+ python3-gi,
gir1.2-caribou-1.0,
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-clutter-1.0,
- python-dbus,
- python-pyatspi
+ python3-dbus,
+ python3-pyatspi
Description: Configurable on screen keyboard with scanning mode
An input assistive technology intended for switch and pointer users.
@@ -115,14 +103,14 @@
Section: gnome
Priority: optional
Architecture: all
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
caribou (>= ${source:Version}),
- python-gi,
+ python3-gi,
gir1.2-caribou-1.0,
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-clutter-1.0,
- python-dbus,
+ python3-dbus,
${misc:Depends}
Description: Configurable on screen keyboard with scanning mode
An input assistive technology intended for switch and pointer users.
@@ -139,18 +127,6 @@
.
This package contains the GTK+ 2.0 module library.
-Package: libcaribou-gtk-module-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: libcaribou-gtk-module (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Configurable on screen keyboard with scanning mode - module
- An input assistive technology intended for switch and pointer users.
- .
- This package contains detached debugging symbols for libcaribou-gtk-module.
-
Package: libcaribou-gtk3-module
Architecture: any
Depends: ${shlibs:Depends},
@@ -162,15 +138,3 @@
An input assistive technology intended for switch and pointer users.
.
This package contains the GTK+ 3.0 module library.
-
-Package: libcaribou-gtk3-module-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: libcaribou-gtk3-module (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Configurable on screen keyboard with scanning mode - module
- An input assistive technology intended for switch and pointer users.
- .
- This package contains detached debugging symbols for libcaribou-gtk3-module.
Modified: desktop/unstable/caribou/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/rules?rev=49073&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/rules [utf-8] (original)
+++ desktop/unstable/caribou/debian/rules [utf-8] Tue Jun 14 18:18:26 2016
@@ -10,6 +10,8 @@
DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+export PYTHON=/usr/bin/python3
+
# List any files which are not installed
include /usr/share/cdbs/1/rules/utils.mk
common-binary-post-install-arch:: list-missing
@@ -18,12 +20,12 @@
cp -a modules/caribou-gtk-module.desktop \
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk3-module.desktop
-DEB_PYTHON2_MODULE_PACKAGES = caribou caribou-antler
+DEB_PYTHON3_MODULE_PACKAGES = caribou caribou-antler
DEB_DH_MAKESHLIBS_ARGS_libcaribou0 += -V -- -c4
DEB_DH_MAKESHLIBS_ARGS_libcaribou-gtk-module += --no-act
DEB_DH_MAKESHLIBS_ARGS_libcaribou-gtk3-module += --no-act
-DEB_DH_STRIP_ARGS_libcaribou0 += --dbg-package=libcaribou-dbg
-DEB_DH_STRIP_ARGS_libcaribou-gtk-module += --dbg-package=libcaribou-gtk-module-dbg
-DEB_DH_STRIP_ARGS_libcaribou-gtk3-module += --dbg-package=libcaribou-gtk3-module-dbg
+DEB_DH_STRIP_ARGS_libcaribou0 += --dbgsym-migration='libcaribou-dbg (<< 0.4.20-2)'
+DEB_DH_STRIP_ARGS_libcaribou-gtk-module += --dbgsym-migration='libcaribou-gtk-module-dbg (<< 0.4.20-2)'
+DEB_DH_STRIP_ARGS_libcaribou-gtk3-module += --dbgsym-migration='libcaribou-gtk3-module-dbg (<< 0.4.20-2)'
More information about the pkg-gnome-commits
mailing list