r36984 - in /desktop/experimental/libpeas/debian: changelog control control.in patches/ patches/11-no-gettext.patch patches/30_fix_python2-config.patch patches/series rules

toabctl-guest at users.alioth.debian.org toabctl-guest at users.alioth.debian.org
Sat Mar 16 11:24:52 UTC 2013 

Author: toabctl-guest
Date: Sat Mar 16 11:24:52 2013
New Revision: 36984

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36984
Log:
* New upstream release.
* debian/control:
  - Bump Standards-Version to 3.9.4.
  - Build-Depends on python3-dev to build python3 loader.
  - Build-Depends on dh_autoreconf.
* debian/rules:
  - Enable python3 loader (Closes: #678354).
  - Include autoreconf.mk to run dh_autoreconf.
* debian/patches:
  - Added 30_fix_python2-config.patch: Check python2.X-config binaries.
  - Added 11-no-gettext.patch: Don't mix intltool and gettext macros.

Added:
    desktop/experimental/libpeas/debian/patches/
    desktop/experimental/libpeas/debian/patches/11-no-gettext.patch
    desktop/experimental/libpeas/debian/patches/30_fix_python2-config.patch
    desktop/experimental/libpeas/debian/patches/series
Modified:
    desktop/experimental/libpeas/debian/changelog
    desktop/experimental/libpeas/debian/control
    desktop/experimental/libpeas/debian/control.in
    desktop/experimental/libpeas/debian/rules

Modified: desktop/experimental/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/changelog?rev=36984&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/changelog [utf-8] (original)
+++ desktop/experimental/libpeas/debian/changelog [utf-8] Sat Mar 16 11:24:52 2013
@@ -1,3 +1,19 @@
+libpeas (1.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Bump Standards-Version to 3.9.4.
+    - Build-Depends on python3-dev to build python3 loader.
+    - Build-Depends on dh_autoreconf.
+  * debian/rules:
+    - Enable python3 loader (Closes: #678354).
+    - Include autoreconf.mk to run dh_autoreconf.
+  * debian/patches:
+    - Added 30_fix_python2-config.patch: Check python2.X-config binaries.
+    - Added 11-no-gettext.patch: Don't mix intltool and gettext macros.
+
+ -- Thomas Bechtold <thomasbechtold at jpberlin.de>  Sat, 16 Mar 2013 07:27:26 +0100
+
 libpeas (1.6.2-1) experimental; urgency=low
 
   * New upstream release

Modified: desktop/experimental/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/control?rev=36984&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/control [utf-8] (original)
+++ desktop/experimental/libpeas/debian/control [utf-8] Sat Mar 16 11:24:52 2013
@@ -6,9 +6,10 @@
 Source: libpeas
 Priority: extra
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),
+               dh-autoreconf,
                gnome-pkg-tools,
                intltool (>= 0.40),
                gtk-doc-tools (>= 1.11),
@@ -20,8 +21,9 @@
                libseed-gtk3-dev (>= 2.91.91) [!ia64 !mips],
                python-dev (>= 2.5.2),
                python-gi-dev (>= 3.0.0),
+               python3-dev,
                gnome-icon-theme
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Section: libs
 Homepage: http://live.gnome.org/Libpeas
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libpeas/

Modified: desktop/experimental/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/control.in?rev=36984&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/control.in [utf-8] (original)
+++ desktop/experimental/libpeas/debian/control.in [utf-8] Sat Mar 16 11:24:52 2013
@@ -4,6 +4,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),
+               dh-autoreconf,
                gnome-pkg-tools,
                intltool (>= 0.40),
                gtk-doc-tools (>= 1.11),
@@ -15,8 +16,9 @@
                libseed-gtk3-dev (>= 2.91.91) [!ia64 !mips],
                python-dev (>= 2.5.2),
                python-gi-dev (>= 3.0.0),
+               python3-dev,
                gnome-icon-theme
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Section: libs
 Homepage: http://live.gnome.org/Libpeas
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libpeas/

Added: desktop/experimental/libpeas/debian/patches/11-no-gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/patches/11-no-gettext.patch?rev=36984&op=file
==============================================================================
--- desktop/experimental/libpeas/debian/patches/11-no-gettext.patch (added)
+++ desktop/experimental/libpeas/debian/patches/11-no-gettext.patch [utf-8] Sat Mar 16 11:24:52 2013
@@ -1,0 +1,16 @@
+From: Thomas Bechtold <thomasbechtold at jpberlin.de>
+Description: Don't mix intltool and gettext macros.
+Forwarded: no
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,9 +71,6 @@
+ 
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=libpeas
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])

Added: desktop/experimental/libpeas/debian/patches/30_fix_python2-config.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/patches/30_fix_python2-config.patch?rev=36984&op=file
==============================================================================
--- desktop/experimental/libpeas/debian/patches/30_fix_python2-config.patch (added)
+++ desktop/experimental/libpeas/debian/patches/30_fix_python2-config.patch [utf-8] Sat Mar 16 11:24:52 2013
@@ -1,0 +1,17 @@
+Description: Allow also python2.X-config
+ Debian does not have python2-config, so a check for python2.5-config, 
+ python2.6-config or python2.7-config is needed
+Author: Thomas Bechtold <thomasbechtold at jpberlin.de>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695957
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -340,7 +340,7 @@
+         found_python2="no (python2 not found)"
+     else
+         AM_PYTHON_CHECK_VERSION($PYTHON2, $PYTHON2_REQUIRED, [
+-            AC_PATH_TOOL(PYTHON2_CONFIG, "python2-config")
++            AC_PATH_PROGS(PYTHON2_CONFIG, [python2-config python2.7-config python2.6-config python2.5-config])
+             if test -n "${PYTHON2_CONFIG}"; then
+                 PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0 >= $PYGOBJECT_REQUIRED, [
+                     found_python2=yes

Added: desktop/experimental/libpeas/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/patches/series?rev=36984&op=file
==============================================================================
--- desktop/experimental/libpeas/debian/patches/series (added)
+++ desktop/experimental/libpeas/debian/patches/series [utf-8] Sat Mar 16 11:24:52 2013
@@ -1,0 +1,2 @@
+30_fix_python2-config.patch
+11-no-gettext.patch

Modified: desktop/experimental/libpeas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libpeas/debian/rules?rev=36984&op=diff
==============================================================================
--- desktop/experimental/libpeas/debian/rules [utf-8] (original)
+++ desktop/experimental/libpeas/debian/rules [utf-8] Sat Mar 16 11:24:52 2013
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -7,7 +8,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
-                             --enable-python \
+                             --enable-python2 \
+                             --enable-python3 \
                              --disable-gjs
 
 ifeq (,$(filter $(DEB_HOST_ARCH),ia64 mips))

More information about the pkg-gnome-commits mailing list