r25266 - in /desktop/unstable/anjuta: ./ debian/ debian/patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Oct 3 07:59:24 UTC 2010
Author: joss
Date: Sun Oct 3 07:59:19 2010
New Revision: 25266
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25266
Log:
Merge experimental branch.
Upload to unstable.
Added:
desktop/unstable/anjuta/debian/patches/21_glib_2.24.patch
- copied unchanged from r25265, desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch
desktop/unstable/anjuta/debian/patches/22_no_gdbus.patch
- copied unchanged from r25265, desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch
desktop/unstable/anjuta/debian/patches/23_libgda_4.0.patch
- copied unchanged from r25265, desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch
desktop/unstable/anjuta/debian/patches/24_libdevhelp_1.0.patch
- copied unchanged from r25265, desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch
desktop/unstable/anjuta/debian/patches/90_autotools.patch
- copied unchanged from r25265, desktop/experimental/anjuta/debian/patches/90_autotools.patch
Modified:
desktop/unstable/anjuta/ (props changed)
desktop/unstable/anjuta/debian/changelog
desktop/unstable/anjuta/debian/control
desktop/unstable/anjuta/debian/control.in (contents, props changed)
desktop/unstable/anjuta/debian/patches/series
desktop/unstable/anjuta/debian/rules
Propchange: desktop/unstable/anjuta/
------------------------------------------------------------------------------
svn:mergeinfo = /desktop/experimental/anjuta:25176-25265
Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=25266&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Sun Oct 3 07:59:19 2010
@@ -1,3 +1,33 @@
+anjuta (2:2.32.0.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 03 Oct 2010 09:58:38 +0200
+
+anjuta (2:2.32.0.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * 90_autotools.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 02 Oct 2010 12:58:40 +0200
+
+anjuta (2:2.31.92.0-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * 21_glib_2.24.patch: revert upstream patch that introduces Glib 2.25
+ requirement.
+ * 22_no_gdbus.patch: ditto for the one that introduces GDBus.
+ * 23_libgda_4.0.patch: revert the changes that require libgda 4.1.
+ * 24_libdevhelp_1.0.patch: revert the patch that introduces devhelp
+ 2.32 requirement.
+ * 90_autotools.patch: run autoreconf on top of that.
+ * Update build-dependencies.
+ * Drop vala and introspection support.
+ * Bump shlibs.
+ * Break anjuta-extras < 2.31.92.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 22 Sep 2010 18:08:58 +0200
+
anjuta (2:2.30.2.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/anjuta/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/control?rev=25266&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/control [utf-8] (original)
+++ desktop/unstable/anjuta/debian/control [utf-8] Sun Oct 3 07:59:19 2010
@@ -7,15 +7,14 @@
Section: gnome
Priority: optional
Maintainer: Rob Bradford <robster at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.0),
cdbs,
gnome-common,
gnome-doc-utils,
gconf2,
- libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.17.10),
- liborbit2-dev (>= 1:2.6.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.20.0),
libgconf2-dev (>= 2.12.0),
libgda-4.0-dev (>= 4.0.0),
libvte-dev (>= 1:0.13.1),
@@ -30,11 +29,8 @@
libunique-dev (>= 1.0.0),
libwebkit-dev,
libxslt1-dev,
- libvala-dev (>= 0.7.8),
- valac (>= 0.7.8),
libdbus-glib-1-dev,
- libgjs-dev,
- libgirepository1.0-dev,
+ libgraphviz-dev (>= 1.0),
pkg-config,
liblocale-gettext-perl,
intltool (>= 0.40.1),
@@ -63,8 +59,7 @@
liblocale-gettext-perl
Suggests: libgtk2.0-dev,
libgtkmm2.0-dev,
- glade-gnome,
- valac
+ glade-gnome
Conflicts: libgbf-1-2,
libgbf-1-1,
libgbf-1-0
@@ -95,10 +90,10 @@
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends},
- anjuta-common
+ anjuta-common (= ${source:Version})
Conflicts: anjuta (<< 2:2.28.1.0-2)
Replaces: anjuta (<< 2:2.28.1.0-2)
-Breaks: anjuta-extras (<< 2.30.0)
+Breaks: anjuta-extras (<< 2.31.92)
Description: A GNOME development IDE, for C/C++ - shared libraries
This IDE for C/C++ and GNOME/Gtk+ applications has features that enable easy
debugging and management of code. It also integrates with glade and CVS.
Modified: desktop/unstable/anjuta/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/control.in?rev=25266&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/control.in [utf-8] (original)
+++ desktop/unstable/anjuta/debian/control.in [utf-8] Sun Oct 3 07:59:19 2010
@@ -8,9 +8,8 @@
gnome-common,
gnome-doc-utils,
gconf2,
- libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.17.10),
- liborbit2-dev (>= 1:2.6.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.20.0),
libgconf2-dev (>= 2.12.0),
libgda-4.0-dev (>= 4.0.0),
libvte-dev (>= 1:0.13.1),
@@ -25,11 +24,8 @@
libunique-dev (>= 1.0.0),
libwebkit-dev,
libxslt1-dev,
- libvala-dev (>= 0.7.8),
- valac (>= 0.7.8),
libdbus-glib-1-dev,
- libgjs-dev,
- libgirepository1.0-dev,
+ libgraphviz-dev (>= 1.0),
pkg-config,
liblocale-gettext-perl,
intltool (>= 0.40.1),
@@ -58,8 +54,7 @@
liblocale-gettext-perl
Suggests: libgtk2.0-dev,
libgtkmm2.0-dev,
- glade-gnome,
- valac
+ glade-gnome
Conflicts: libgbf-1-2,
libgbf-1-1,
libgbf-1-0
@@ -90,10 +85,10 @@
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends},
- anjuta-common
+ anjuta-common (= ${source:Version})
Conflicts: anjuta (<< 2:2.28.1.0-2)
Replaces: anjuta (<< 2:2.28.1.0-2)
-Breaks: anjuta-extras (<< 2.30.0)
+Breaks: anjuta-extras (<< 2.31.92)
Description: A GNOME development IDE, for C/C++ - shared libraries
This IDE for C/C++ and GNOME/Gtk+ applications has features that enable easy
debugging and management of code. It also integrates with glade and CVS.
Propchange: desktop/unstable/anjuta/debian/control.in
('svn:mergeinfo' removed)
Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=25266&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Sun Oct 3 07:59:19 2010
@@ -1,1 +1,6 @@
+21_glib_2.24.patch
+22_no_gdbus.patch
+23_libgda_4.0.patch
+24_libdevhelp_1.0.patch
+90_autotools.patch
99_ltmain_as-needed.patch
Modified: desktop/unstable/anjuta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/rules?rev=25266&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/rules [utf-8] (original)
+++ desktop/unstable/anjuta/debian/rules [utf-8] Sun Oct 3 07:59:19 2010
@@ -16,7 +16,7 @@
DEB_DH_MAKESHLIBS_ARGS_anjuta += --no-act
LIB_PKG := $(shell sed -nr 's/^Package:[[:space:]]*(libanjuta[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-SHVER = 2:2.30.0
+SHVER = 2:2.31.92
DEB_DH_MAKESHLIBS_ARGS_$(LIB_PKG) = -V '$(LIB_PKG) (>= $(SHVER))'
install/anjuta::
More information about the pkg-gnome-commits
mailing list