r25276 - in /desktop/unstable/anjuta/debian: changelog patches/01_python_plugin_ldflags.patch patches/90_autotools.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Oct 3 10:08:57 UTC 2010


Author: joss
Date: Sun Oct  3 10:08:51 2010
New Revision: 25276

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25276
Log:
* 01_python_plugin_ldflags.patch: new patch. Fix Python plugin by 
  linking it with the correct flags.
* 90_autotools.patch: regenerated accordingly.

Added:
    desktop/unstable/anjuta/debian/patches/01_python_plugin_ldflags.patch
Modified:
    desktop/unstable/anjuta/debian/changelog
    desktop/unstable/anjuta/debian/patches/90_autotools.patch
    desktop/unstable/anjuta/debian/patches/series

Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=25276&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Sun Oct  3 10:08:51 2010
@@ -1,3 +1,11 @@
+anjuta (2:2.32.0.0-3) unstable; urgency=low
+
+  * 01_python_plugin_ldflags.patch: new patch. Fix Python plugin by 
+    linking it with the correct flags.
+  * 90_autotools.patch: regenerated accordingly.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 03 Oct 2010 11:13:37 +0200
+
 anjuta (2:2.32.0.0-2) unstable; urgency=low
 
   * Upload to unstable.

Added: desktop/unstable/anjuta/debian/patches/01_python_plugin_ldflags.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/01_python_plugin_ldflags.patch?rev=25276&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/01_python_plugin_ldflags.patch (added)
+++ desktop/unstable/anjuta/debian/patches/01_python_plugin_ldflags.patch [utf-8] Sun Oct  3 10:08:51 2010
@@ -1,0 +1,13 @@
+Index: anjuta-2.32.0.0/plugins/language-support-python/Makefile.am
+===================================================================
+--- anjuta-2.32.0.0.orig/plugins/language-support-python/Makefile.am	2010-10-03 11:11:36.043064388 +0200
++++ anjuta-2.32.0.0/plugins/language-support-python/Makefile.am	2010-10-03 11:12:49.067175966 +0200
+@@ -36,6 +36,8 @@ plugin_LTLIBRARIES = libpython_plugin.la
+ # Plugin sources
+ libpython_plugin_la_SOURCES = plugin.c plugin.h python-assist.c python-assist.h python-utils.c python-utils.h
+ 
++libpython_plugin_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
++
+ # Plugin dependencies
+ libpython_plugin_la_LIBADD = \
+ 	$(LIBANJUTA_LIBS) 

Modified: desktop/unstable/anjuta/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/90_autotools.patch?rev=25276&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/90_autotools.patch [utf-8] Sun Oct  3 10:08:51 2010
@@ -3,8 +3,8 @@
 
 Index: anjuta-2.32.0.0/aclocal.m4
 ===================================================================
---- anjuta-2.32.0.0.orig/aclocal.m4	2010-09-27 20:01:52.000000000 +0200
-+++ anjuta-2.32.0.0/aclocal.m4	2010-10-02 12:57:31.484235457 +0200
+--- anjuta-2.32.0.0.orig/aclocal.m4	2010-10-03 11:11:00.971564865 +0200
++++ anjuta-2.32.0.0/aclocal.m4	2010-10-03 11:29:43.523567643 +0200
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -192,8 +192,8 @@
  	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 Index: anjuta-2.32.0.0/configure
 ===================================================================
---- anjuta-2.32.0.0.orig/configure	2010-09-27 20:01:54.000000000 +0200
-+++ anjuta-2.32.0.0/configure	2010-10-02 12:57:52.400723955 +0200
+--- anjuta-2.32.0.0.orig/configure	2010-10-03 11:11:00.955565974 +0200
++++ anjuta-2.32.0.0/configure	2010-10-03 11:29:43.543563202 +0200
 @@ -1,13 +1,13 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -2280,8 +2280,8 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 Index: anjuta-2.32.0.0/libanjuta/Makefile.in
 ===================================================================
---- anjuta-2.32.0.0.orig/libanjuta/Makefile.in	2010-09-27 20:01:54.000000000 +0200
-+++ anjuta-2.32.0.0/libanjuta/Makefile.in	2010-10-02 12:57:31.528230088 +0200
+--- anjuta-2.32.0.0.orig/libanjuta/Makefile.in	2010-10-03 11:11:00.943568639 +0200
++++ anjuta-2.32.0.0/libanjuta/Makefile.in	2010-10-03 11:29:43.543563202 +0200
 @@ -88,7 +88,7 @@ am_libanjuta_la_OBJECTS = anjuta-enum-ty
  	anjuta-launcher.lo anjuta-utils.lo anjuta-session.lo \
  	anjuta-save-prompt.lo anjuta-serializer.lo resources.lo \
@@ -2316,3 +2316,35 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-glade-catalog.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-launcher.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-marshal.Plo at am__quote@
+Index: anjuta-2.32.0.0/plugins/language-support-python/Makefile.in
+===================================================================
+--- anjuta-2.32.0.0.orig/plugins/language-support-python/Makefile.in	2010-10-03 11:30:35.451566100 +0200
++++ anjuta-2.32.0.0/plugins/language-support-python/Makefile.in	2010-10-03 11:30:18.491562039 +0200
+@@ -86,6 +86,10 @@ libpython_plugin_la_OBJECTS = $(am_libpy
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
++libpython_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++	$(AM_CFLAGS) $(CFLAGS) $(libpython_plugin_la_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SCRIPTS = $(scripts_SCRIPTS)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -388,6 +392,7 @@ plugin_LTLIBRARIES = libpython_plugin.la
+ 
+ # Plugin sources
+ libpython_plugin_la_SOURCES = plugin.c plugin.h python-assist.c python-assist.h python-utils.c python-utils.h
++libpython_plugin_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
+ 
+ # Plugin dependencies
+ libpython_plugin_la_LIBADD = \
+@@ -472,7 +477,7 @@ clean-pluginLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libpython_plugin.la: $(libpython_plugin_la_OBJECTS) $(libpython_plugin_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(LINK) -rpath $(plugindir) $(libpython_plugin_la_OBJECTS) $(libpython_plugin_la_LIBADD) $(LIBS)
++	$(AM_V_CCLD)$(libpython_plugin_la_LINK) -rpath $(plugindir) $(libpython_plugin_la_OBJECTS) $(libpython_plugin_la_LIBADD) $(LIBS)
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"

Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=25276&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Sun Oct  3 10:08:51 2010
@@ -1,3 +1,4 @@
+01_python_plugin_ldflags.patch
 21_glib_2.24.patch
 22_no_gdbus.patch
 23_libgda_4.0.patch




More information about the pkg-gnome-commits mailing list