r27600 - in /desktop/experimental/anjuta/debian: ./ patches/

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Fri Apr 15 17:28:43 UTC 2011


Author: jordi
Date: Fri Apr 15 17:28:41 2011
New Revision: 27600

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27600
Log:
* New upstream stable release.
* Remove 01_python_plugin_ldflags.patch: applied upstream.
* Remove all git cherrypick patches.
* Remove patches that reverted changes requiring newer lib versions.
* Replace 90_autotools.patch with dh_autoreconf.
* Bump Build-Depends for the switch to GTK+3.
* Enable GObject Introspection support.

Added:
    desktop/experimental/anjuta/debian/gir1.2-anjuta-3.0.install
    desktop/experimental/anjuta/debian/libanjuta-3-0.install
      - copied unchanged from r27599, desktop/experimental/anjuta/debian/libanjuta0.install
Removed:
    desktop/experimental/anjuta/debian/libanjuta0.install
    desktop/experimental/anjuta/debian/patches/01_python_plugin_ldflags.patch
    desktop/experimental/anjuta/debian/patches/02_python_autoindent_hang.patch
    desktop/experimental/anjuta/debian/patches/03_brace_completion_crash.patch
    desktop/experimental/anjuta/debian/patches/04_launcher_crash.patch
    desktop/experimental/anjuta/debian/patches/05_autocompletion_duplicates.patch
    desktop/experimental/anjuta/debian/patches/06_autocompletion_brace.patch
    desktop/experimental/anjuta/debian/patches/07_filewizard_csharp.patch
    desktop/experimental/anjuta/debian/patches/08_launcher_kill.patch
    desktop/experimental/anjuta/debian/patches/09_libxml_crash.patch
    desktop/experimental/anjuta/debian/patches/21_glib_2.24.patch
    desktop/experimental/anjuta/debian/patches/22_no_gdbus.patch
    desktop/experimental/anjuta/debian/patches/23_libgda_4.0.patch
    desktop/experimental/anjuta/debian/patches/24_libdevhelp_1.0.patch
    desktop/experimental/anjuta/debian/patches/90_autotools.patch
Modified:
    desktop/experimental/anjuta/debian/anjuta.install
    desktop/experimental/anjuta/debian/changelog
    desktop/experimental/anjuta/debian/control
    desktop/experimental/anjuta/debian/control.in
    desktop/experimental/anjuta/debian/libanjuta-dev.install
    desktop/experimental/anjuta/debian/patches/series
    desktop/experimental/anjuta/debian/rules

Modified: desktop/experimental/anjuta/debian/anjuta.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/anjuta.install?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/anjuta.install [utf-8] (original)
+++ desktop/experimental/anjuta/debian/anjuta.install [utf-8] Fri Apr 15 17:28:41 2011
@@ -5,4 +5,4 @@
 debian/tmp/usr/lib/anjuta/*.plugin
 debian/tmp/usr/lib/anjuta/*.so
 debian/tmp/usr/share/applications
-debian/tmp/usr/lib/glade3/modules/*.so
+debian/tmp/usr/lib/glade/modules/*.so

Modified: desktop/experimental/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/changelog?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/changelog [utf-8] (original)
+++ desktop/experimental/anjuta/debian/changelog [utf-8] Fri Apr 15 17:28:41 2011
@@ -1,3 +1,15 @@
+anjuta (2:3.0.0.0-1) UNRELEASED; urgency=low
+
+  * New upstream stable release.
+  * Remove 01_python_plugin_ldflags.patch: applied upstream.
+  * Remove all git cherrypick patches.
+  * Remove patches that reverted changes requiring newer lib versions.
+  * Replace 90_autotools.patch with dh_autoreconf.
+  * Bump Build-Depends for the switch to GTK+3.
+  * Enable GObject Introspection support.
+
+ -- Jordi Mallach <jordi at debian.org>  Fri, 15 Apr 2011 18:27:26 +0200
+
 anjuta (2:2.32.0.0-5) unstable; urgency=low
 
   * Pick more patches in the upstream repository.

Modified: desktop/experimental/anjuta/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/control?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/control [utf-8] (original)
+++ desktop/experimental/anjuta/debian/control [utf-8] Fri Apr 15 17:28:41 2011
@@ -7,40 +7,43 @@
 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>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi 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.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),
+               dh-autoreconf,
+               gnome-pkg-tools (>= 0.11),
+               libglib2.0-dev (>= 2.28.0),
+               libgtk-3-dev (>= 3.0.0),
+               libgdk-pixbuf2.0-dev (>= 2.0.0),
+               libgda-4.0-dev (>= 4.2.0),
+               libvte-dev (>= 1:0.27.6),
                libxml2-dev (>= 2.4.23),
-               libdevhelp-1-dev (>= 0.22),
-               libgdl-1-dev (>= 2.27.1),
-               libgladeui-1-dev (>= 3.6.0),
+               libgdl-3-dev (>= 2.91.4),
+               libwnck-dev (>= 2.12),
+               libgtksourceview3.0-dev (>= 2.91.8),
+               libdevhelp-3-dev (>= 3.0.0),
+               libgladeui-dev (>= 3.9.2),
+               libvala-0.12-dev (>= 0.11.2),
+               gobject-introspection (>= 0.9.5),
+               libgirepository1.0-dev (>= 0.9.5),
+               libgraphviz-dev (>= 1.0),
                libneon27-gnutls-dev (>= 0.28.2),
                libsvn-dev (>= 1.5.0),
-               libgtksourceview2.0-dev (>= 2.9.7),
-               libwnck-dev (>= 2.12),
-               libunique-dev (>= 1.0.0),
-               libwebkit-dev,
-               libxslt1-dev,
-               libdbus-glib-1-dev,
-               libgraphviz-dev (>= 1.0),
-               pkg-config,
-               liblocale-gettext-perl,
+#               libunique-dev (>= 1.0.0),
+#               libxslt1-dev,
+               gir1.2-glib-2.0,
+               gir1.2-gtk-3.0,
+               pkg-config (>= 0.22),
+#               liblocale-gettext-perl,
                intltool (>= 0.40.1),
                gtk-doc-tools (>= 1.4),
-               autogen,
-               gnome-pkg-tools (>= 0.11)
+               gnome-doc-utils (>= 0.18),
+#               gnome-common,
+               autogen
 Build-Depends-Indep: libglib2.0-doc,
-                     libgtk2.0-doc
+                     libgtk-3-doc
 Standards-Version: 3.8.4
-Homepage: http://www.anjuta.org
+Homepage: http://www.anjuta.org/
 
 Package: anjuta
 Architecture: any
@@ -57,8 +60,8 @@
             gdb,
             libtool,
             liblocale-gettext-perl
-Suggests: libgtk2.0-dev,
-          libgtkmm2.0-dev,
+Suggests: libgtk3-dev,
+          libgtkmm-3.0-dev,
           glade-gnome
 Conflicts: libgbf-1-2,
            libgbf-1-1,
@@ -85,7 +88,7 @@
  .
  This package provides the required data files for Anjuta.
 
-Package: libanjuta0
+Package: libanjuta-3-0
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -93,7 +96,7 @@
          anjuta-common (= ${source:Version})
 Conflicts: anjuta (<< 2:2.28.1.0-2)
 Replaces: anjuta (<< 2:2.28.1.0-2)
-Breaks: anjuta-extras (<< 2.31.92)
+Breaks: anjuta-extras (<< 3.0.0.0)
 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.
@@ -103,10 +106,10 @@
 Package: libanjuta-dev
 Architecture: any
 Section: libdevel
-Depends: libanjuta0 (= ${binary:Version}),
+Depends: libanjuta-3-0 (= ${binary:Version}),
+         gir1.2-anjuta-3.0 (= ${binary:Version}),
          ${misc:Depends},
-         libgconf2-dev,
-         libgtk2.0-dev
+         libgtk-3-dev
 Conflicts: anjuta (<= 2.0.0),
            anjuta-common (<< 2:2.28.1.0-2),
            anjuta-dev
@@ -132,3 +135,16 @@
  debugging and management of code. It also integrates with glade and CVS.
  .
  This package provides the debug files for Anjuta.
+
+Package: gir1.2-anjuta-3.0
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the Anjuta 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.
+ .
+ This package contains introspection data for the Anjuta libraries.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.

Modified: desktop/experimental/anjuta/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/control.in?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/control.in [utf-8] (original)
+++ desktop/experimental/anjuta/debian/control.in [utf-8] Fri Apr 15 17:28:41 2011
@@ -5,37 +5,40 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.0),
                cdbs,
-               gnome-common,
-               gnome-doc-utils,
-               gconf2,
-               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),
+               dh-autoreconf,
+               gnome-pkg-tools (>= 0.11),
+               libglib2.0-dev (>= 2.28.0),
+               libgtk-3-dev (>= 3.0.0),
+               libgdk-pixbuf2.0-dev (>= 2.0.0),
+               libgda-4.0-dev (>= 4.2.0),
+               libvte-dev (>= 1:0.27.6),
                libxml2-dev (>= 2.4.23),
-               libdevhelp-1-dev (>= 0.22),
-               libgdl-1-dev (>= 2.27.1),
-               libgladeui-1-dev (>= 3.6.0),
+               libgdl-3-dev (>= 2.91.4),
+               libwnck-dev (>= 2.12),
+               libgtksourceview3.0-dev (>= 2.91.8),
+               libdevhelp-3-dev (>= 3.0.0),
+               libgladeui-dev (>= 3.9.2),
+               libvala-0.12-dev (>= 0.11.2),
+               gobject-introspection (>= 0.9.5),
+               libgirepository1.0-dev (>= 0.9.5),
+               libgraphviz-dev (>= 1.0),
                libneon27-gnutls-dev (>= 0.28.2),
                libsvn-dev (>= 1.5.0),
-               libgtksourceview2.0-dev (>= 2.9.7),
-               libwnck-dev (>= 2.12),
-               libunique-dev (>= 1.0.0),
-               libwebkit-dev,
-               libxslt1-dev,
-               libdbus-glib-1-dev,
-               libgraphviz-dev (>= 1.0),
-               pkg-config,
-               liblocale-gettext-perl,
+#               libunique-dev (>= 1.0.0),
+#               libxslt1-dev,
+               gir1.2-glib-2.0,
+               gir1.2-gtk-3.0,
+               pkg-config (>= 0.22),
+#               liblocale-gettext-perl,
                intltool (>= 0.40.1),
                gtk-doc-tools (>= 1.4),
-               autogen,
-               gnome-pkg-tools (>= 0.11)
+               gnome-doc-utils (>= 0.18),
+#               gnome-common,
+               autogen
 Build-Depends-Indep: libglib2.0-doc,
-                     libgtk2.0-doc
+                     libgtk-3-doc
 Standards-Version: 3.8.4
-Homepage: http://www.anjuta.org
+Homepage: http://www.anjuta.org/
 
 Package: anjuta
 Architecture: any
@@ -52,8 +55,8 @@
             gdb,
             libtool,
             liblocale-gettext-perl
-Suggests: libgtk2.0-dev,
-          libgtkmm2.0-dev,
+Suggests: libgtk3-dev,
+          libgtkmm-3.0-dev,
           glade-gnome
 Conflicts: libgbf-1-2,
            libgbf-1-1,
@@ -80,7 +83,7 @@
  .
  This package provides the required data files for Anjuta.
 
-Package: libanjuta0
+Package: libanjuta-3-0
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -88,7 +91,7 @@
          anjuta-common (= ${source:Version})
 Conflicts: anjuta (<< 2:2.28.1.0-2)
 Replaces: anjuta (<< 2:2.28.1.0-2)
-Breaks: anjuta-extras (<< 2.31.92)
+Breaks: anjuta-extras (<< 3.0.0.0)
 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.
@@ -98,10 +101,10 @@
 Package: libanjuta-dev
 Architecture: any
 Section: libdevel
-Depends: libanjuta0 (= ${binary:Version}),
+Depends: libanjuta-3-0 (= ${binary:Version}),
+         gir1.2-anjuta-3.0 (= ${binary:Version}),
          ${misc:Depends},
-         libgconf2-dev,
-         libgtk2.0-dev
+         libgtk-3-dev
 Conflicts: anjuta (<= 2.0.0),
            anjuta-common (<< 2:2.28.1.0-2),
            anjuta-dev
@@ -127,3 +130,16 @@
  debugging and management of code. It also integrates with glade and CVS.
  .
  This package provides the debug files for Anjuta.
+
+Package: gir1.2-anjuta-3.0
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the Anjuta 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.
+ .
+ This package contains introspection data for the Anjuta libraries.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.

Added: desktop/experimental/anjuta/debian/gir1.2-anjuta-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/gir1.2-anjuta-3.0.install?rev=27600&op=file
==============================================================================
--- desktop/experimental/anjuta/debian/gir1.2-anjuta-3.0.install (added)
+++ desktop/experimental/anjuta/debian/gir1.2-anjuta-3.0.install [utf-8] Fri Apr 15 17:28:41 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/Anjuta-3.0.typelib

Modified: desktop/experimental/anjuta/debian/libanjuta-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/libanjuta-dev.install?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/libanjuta-dev.install [utf-8] (original)
+++ desktop/experimental/anjuta/debian/libanjuta-dev.install [utf-8] Fri Apr 15 17:28:41 2011
@@ -2,3 +2,4 @@
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/share/gtk-doc
+debian/tmp/usr/share/gir-1.0/Anjuta-3.0.gir

Modified: desktop/experimental/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/patches/series?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/experimental/anjuta/debian/patches/series [utf-8] Fri Apr 15 17:28:41 2011
@@ -1,15 +1,1 @@
-01_python_plugin_ldflags.patch
-02_python_autoindent_hang.patch
-03_brace_completion_crash.patch
-04_launcher_crash.patch
-05_autocompletion_duplicates.patch
-06_autocompletion_brace.patch
-07_filewizard_csharp.patch
-08_launcher_kill.patch
-09_libxml_crash.patch
-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/experimental/anjuta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/anjuta/debian/rules?rev=27600&op=diff
==============================================================================
--- desktop/experimental/anjuta/debian/rules [utf-8] (original)
+++ desktop/experimental/anjuta/debian/rules [utf-8] Fri Apr 15 17:28:41 2011
@@ -1,10 +1,12 @@
 #!/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/class/autotools-files.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed




More information about the pkg-gnome-commits mailing list