r14065 - in /desktop/experimental/glib2.0/debian: changelog libglib2.0-0.symbols patches/02_fix_build_issue.patch patches/03_assertion_macros_compiler_warnings.patch patches/67_gcc43-inline.patch patches/series rules

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Mon Jan 7 18:43:35 UTC 2008 

Author: slomo
Date: Mon Jan  7 18:43:34 2008
New Revision: 14065

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14065
Log:
* update to 2.15.1

Removed:
    desktop/experimental/glib2.0/debian/patches/02_fix_build_issue.patch
    desktop/experimental/glib2.0/debian/patches/03_assertion_macros_compiler_warnings.patch
    desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/libglib2.0-0.symbols
    desktop/experimental/glib2.0/debian/patches/series
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=14065&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Mon Jan  7 18:43:34 2008
@@ -1,24 +1,20 @@
-glib2.0 (2.15.0-1) experimental; urgency=low
+glib2.0 (2.15.1-1) experimental; urgency=low
 
   [Sebastian Dröge]
   * New upstream development release, the new API may still change
-    incompatibly; API additions.
+    incompatibly; API additions:
+    + Drop patch 67_gcc43-inline.patch, merged upstream.
   * Include check-dist again to prevent accidental uploads to unstable.
   * Disable testsuite for now.
-  * Bump shlibs to 2.15.0.
+  * Bump shlibs to 2.15.1.
   * Add build dependencies for GIO and add libgio-fam package that contains
     a GIO file/directory monitoring module that uses fam.
-  * Add patch 02_fix_build_issue.patch, taken from the Ubuntu package to fix
-    the build.
-  * Add patch 03_assertion_macros_compiler_warnings.patch from upstream SVN
-    to prevent several compiler warnings caused by a change with the assertion
-    macros.
   * debian/rules,
     debian/libglib2.0-0.symbols,
     debian/control.in:
-    + Add a symbol file for GLib, generated from 2.12.4, 2.14.3, 2.15.0
-      and call dpkg-gensymbols at build time. Require dpkg-dev (>= 1.14.8)
-      for this.
+    + Add a symbol file for GLib, generated from 2.12.4, 2.14.3, 2.15.0,
+      2.15.1. This is handled by dh_makeshlibs.
+      Require dpkg-dev (>= 1.14.8) for this.
 
   [Loic Minier]
   * Build-dep on gtk-doc-tools to prevent a spurious warning from

Modified: desktop/experimental/glib2.0/debian/libglib2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.symbols?rev=14065&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.symbols (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.symbols Mon Jan  7 18:43:34 2008
@@ -22,6 +22,7 @@
  g_app_info_set_as_default_for_extension at Base 2.15.0
  g_app_info_set_as_default_for_type at Base 2.15.0
  g_app_info_should_show at Base 2.15.0
+ g_app_info_supports_files at Base 2.15.1
  g_app_info_supports_uris at Base 2.15.0
  g_app_launch_context_get_display at Base 2.15.0
  g_app_launch_context_get_startup_notify_id at Base 2.15.0
@@ -103,11 +104,7 @@
  g_desktop_app_info_get_type at Base 2.15.0
  g_desktop_app_info_new at Base 2.15.0
  g_desktop_app_info_new_from_filename at Base 2.15.0
- g_directory_monitor_cancel at Base 2.15.0
- g_directory_monitor_emit_event at Base 2.15.0
- g_directory_monitor_get_type at Base 2.15.0
- g_directory_monitor_is_cancelled at Base 2.15.0
- g_directory_monitor_set_rate_limit at Base 2.15.0
+ g_desktop_app_info_set_desktop_env at Base 2.15.1
  g_drive_can_eject at Base 2.15.0
  g_drive_can_poll_for_media at Base 2.15.0
  g_drive_eject at Base 2.15.0
@@ -360,16 +357,14 @@
  g_loadable_icon_load_finish at Base 2.15.0
  g_local_directory_monitor_get_type at Base 2.15.0
  g_local_file_monitor_get_type at Base 2.15.0
- g_memory_input_stream_from_data at Base 2.15.0
- g_memory_input_stream_get_data at Base 2.15.0
- g_memory_input_stream_get_data_size at Base 2.15.0
+ g_memory_input_stream_add_data at Base 2.15.1
  g_memory_input_stream_get_type at Base 2.15.0
- g_memory_input_stream_set_free_data at Base 2.15.0
+ g_memory_input_stream_new at Base 2.15.1
+ g_memory_input_stream_new_from_data at Base 2.15.1
  g_memory_output_stream_get_data at Base 2.15.0
+ g_memory_output_stream_get_size at Base 2.15.1
  g_memory_output_stream_get_type at Base 2.15.0
  g_memory_output_stream_new at Base 2.15.0
- g_memory_output_stream_set_free_data at Base 2.15.0
- g_memory_output_stream_set_max_size at Base 2.15.0
  g_mount_can_eject at Base 2.15.0
  g_mount_can_unmount at Base 2.15.0
  g_mount_eject at Base 2.15.0

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=14065&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series (original)
+++ desktop/experimental/glib2.0/debian/patches/series Mon Jan  7 18:43:34 2008
@@ -1,4 +1,2 @@
 #01_gettext-desktopfiles.patch
-02_fix_build_issue.patch
 60_wait-longer-for-threads-to-die.patch
-67_gcc43-inline.patch

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=14065&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Mon Jan  7 18:43:34 2008
@@ -39,7 +39,7 @@
 
 APIVER := 2.0
 SONAME := 0
-SHVER := 2.15.0
+SHVER := 2.15.1
 
 # package names
 SHARED_PKG := libglib$(APIVER)-$(SONAME)
@@ -219,8 +219,6 @@
 	dh_makeshlibs	-p$(SHARED_PKG) \
 			-V "$(SHARED_PKG) (>= $(SHVER))" \
 			--add-udeb="$(UDEB_PKG)"
-	dpkg-gensymbols -p$(SHARED_PKG) -P$(CURDIR)/debian/$(SHARED_PKG) \
-                -e$(CURDIR)/debian/$(SHARED_PKG)/usr/lib/libg*.so*
 	dh_installdeb -s
 	# override shlibs for libraries from this source before computing
 	# dependencies of packages generated from this source; we already have

More information about the pkg-gnome-commits mailing list