r24846 - /desktop/experimental/gdk-pixbuf/debian/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Thu Jul 22 09:44:36 UTC 2010


Author: slomo
Date: Thu Jul 22 09:44:35 2010
New Revision: 24846

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24846
Log:
  + Fix GTK+2.0 replaces/conflicts versions to << 2.21.3.
  + Rename packages to include the 2.0 API version.
* debian/rules,
  debian/libgdk-pixbuf2.0-0.symbols:
  + Add symbols file and pass correct parameters to dh_makeshlibs.

Added:
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.install
      - copied unchanged from r24844, desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.symbols
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-dev.install
      - copied unchanged from r24844, desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-doc.install
      - copied unchanged from r24844, desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install
Removed:
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install
Modified:
    desktop/experimental/gdk-pixbuf/debian/   (props changed)
    desktop/experimental/gdk-pixbuf/debian/changelog
    desktop/experimental/gdk-pixbuf/debian/control
    desktop/experimental/gdk-pixbuf/debian/control.in
    desktop/experimental/gdk-pixbuf/debian/rules

Propchange: desktop/experimental/gdk-pixbuf/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: desktop/experimental/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/changelog?rev=24846&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] Thu Jul 22 09:44:35 2010
@@ -5,6 +5,10 @@
 
   [ Sebastian Dröge ]
   * debian/control.in:
-    + Fix replaces/conflicts versions to << 2.21.3.
+    + Fix GTK+2.0 replaces/conflicts versions to << 2.21.3.
+    + Rename packages to include the 2.0 API version.
+  * debian/rules,
+    debian/libgdk-pixbuf2.0-0.symbols:
+    + Add symbols file and pass correct parameters to dh_makeshlibs.
 
- -- Sebastian Dröge <slomo at debian.org>  Thu, 22 Jul 2010 11:34:27 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 22 Jul 2010 11:43:21 +0200

Modified: desktop/experimental/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/control?rev=24846&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/control [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/control [utf-8] Thu Jul 22 09:44:35 2010
@@ -1,40 +1,44 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: gdk-pixbuf
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop at lists.ubuntu.com>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 7),
                gnome-pkg-tools (>= 0.10),
-               dh-autoreconf,
                libglib2.0-dev (>= 2.25.9),
                libpng12-dev,
                libjpeg62-dev,
                libjasper-dev,
                libtiff4-dev
 Standards-Version: 3.9.0
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gdk-pixbuf/ubuntu
 Homepage: http://www.gtk.org/
 
-Package: libgdk-pixbuf0
+Package: libgdk-pixbuf2.0-0
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgtk2.0-0 (<< 2.90.4), libgtk2.0-bin (<< 2.90.4)
-Replaces: libgtk2.0-0 (<< 2.90.4), libgtk2.0-bin (<< 2.90.4)
+Conflicts: libgtk2.0-0 (<< 2.21.3), libgtk2.0-bin (<< 2.21.3)
+Replaces: libgtk2.0-0 (<< 2.21.3), libgtk2.0-bin (<< 2.21.3)
 Description: GDK Pixbuf library
  The Gdk Pixbuf library provides:
   - Image loading and saving facilities.
   - Fast scaling and compositing of pixbufs.
   - Simple animation loading (ie. animated GIFs)
 
-Package: libgdk-pixbuf-dev
+Package: libgdk-pixbuf2.0-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgdk-pixbuf0 (= ${binary:Version})
-Conflicts: libgtk2.0-dev (<< 2.90.4)
-Replaces: libgtk2.0-dev (<< 2.90.4)
+         libgdk-pixbuf2.0-0 (= ${binary:Version})
+Conflicts: libgtk2.0-dev (<< 2.21.3)
+Replaces: libgtk2.0-dev (<< 2.21.3)
 Description: GDK Pixbuf library (development files)
  The Gdk Pixbuf library provides:
   - Image loading and saving facilities.
@@ -43,12 +47,12 @@
  .
  This package contains the header files which are needed for using GDK Pixbuf.
 
-Package: libgdk-pixbuf-doc
+Package: libgdk-pixbuf2.0-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: libgtk2.0-dev (<< 2.90.4)
-Replaces: libgtk2.0-dev (<< 2.90.4)
+Conflicts: libgtk2.0-doc (<< 2.21.3)
+Replaces: libgtk2.0-doc (<< 2.21.3)
 Description: GDK Pixbuf library (documentation)
  The Gdk Pixbuf library provides:
   - Image loading and saving facilities.

Modified: desktop/experimental/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/control.in?rev=24846&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/control.in [utf-8] Thu Jul 22 09:44:35 2010
@@ -6,7 +6,6 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 7),
                gnome-pkg-tools (>= 0.10),
-               dh-autoreconf,
                libglib2.0-dev (>= 2.25.9),
                libpng12-dev,
                libjpeg62-dev,
@@ -15,7 +14,7 @@
 Standards-Version: 3.9.0
 Homepage: http://www.gtk.org/
 
-Package: libgdk-pixbuf0
+Package: libgdk-pixbuf2.0-0
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -27,12 +26,12 @@
   - Fast scaling and compositing of pixbufs.
   - Simple animation loading (ie. animated GIFs)
 
-Package: libgdk-pixbuf-dev
+Package: libgdk-pixbuf2.0-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgdk-pixbuf0 (= ${binary:Version})
+         libgdk-pixbuf2.0-0 (= ${binary:Version})
 Conflicts: libgtk2.0-dev (<< 2.21.3)
 Replaces: libgtk2.0-dev (<< 2.21.3)
 Description: GDK Pixbuf library (development files)
@@ -43,12 +42,12 @@
  .
  This package contains the header files which are needed for using GDK Pixbuf.
 
-Package: libgdk-pixbuf-doc
+Package: libgdk-pixbuf2.0-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: libgtk2.0-dev (<< 2.21.3)
-Replaces: libgtk2.0-dev (<< 2.21.3)
+Conflicts: libgtk2.0-doc (<< 2.21.3)
+Replaces: libgtk2.0-doc (<< 2.21.3)
 Description: GDK Pixbuf library (documentation)
  The Gdk Pixbuf library provides:
   - Image loading and saving facilities.

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.symbols?rev=24846&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.symbols (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.symbols [utf-8] Thu Jul 22 09:44:35 2010
@@ -1,0 +1,140 @@
+libgdk_pixbuf-2.0.so.0 libgdk-pixbuf2.0-0 #MINVER#
+ gdk_colorspace_get_type at Base 2.21.6
+ gdk_interp_type_get_type at Base 2.21.6
+ gdk_pixbuf_add_alpha at Base 2.21.6
+ gdk_pixbuf_alpha_mode_get_type at Base 2.21.6
+ gdk_pixbuf_animation_get_height at Base 2.21.6
+ gdk_pixbuf_animation_get_iter at Base 2.21.6
+ gdk_pixbuf_animation_get_static_image at Base 2.21.6
+ gdk_pixbuf_animation_get_type at Base 2.21.6
+ gdk_pixbuf_animation_get_width at Base 2.21.6
+ gdk_pixbuf_animation_is_static_image at Base 2.21.6
+ gdk_pixbuf_animation_iter_advance at Base 2.21.6
+ gdk_pixbuf_animation_iter_get_delay_time at Base 2.21.6
+ gdk_pixbuf_animation_iter_get_pixbuf at Base 2.21.6
+ gdk_pixbuf_animation_iter_get_type at Base 2.21.6
+ gdk_pixbuf_animation_iter_on_currently_loading_frame at Base 2.21.6
+ gdk_pixbuf_animation_new_from_file at Base 2.21.6
+ gdk_pixbuf_animation_ref at Base 2.21.6
+ gdk_pixbuf_animation_unref at Base 2.21.6
+ gdk_pixbuf_apply_embedded_orientation at Base 2.21.6
+ gdk_pixbuf_composite at Base 2.21.6
+ gdk_pixbuf_composite_color at Base 2.21.6
+ gdk_pixbuf_composite_color_simple at Base 2.21.6
+ gdk_pixbuf_copy at Base 2.21.6
+ gdk_pixbuf_copy_area at Base 2.21.6
+ gdk_pixbuf_error_get_type at Base 2.21.6
+ gdk_pixbuf_error_quark at Base 2.21.6
+ gdk_pixbuf_fill at Base 2.21.6
+ gdk_pixbuf_flip at Base 2.21.6
+ gdk_pixbuf_format_copy at Base 2.21.6
+ gdk_pixbuf_format_free at Base 2.21.6
+ gdk_pixbuf_format_get_description at Base 2.21.6
+ gdk_pixbuf_format_get_extensions at Base 2.21.6
+ gdk_pixbuf_format_get_license at Base 2.21.6
+ gdk_pixbuf_format_get_mime_types at Base 2.21.6
+ gdk_pixbuf_format_get_name at Base 2.21.6
+ gdk_pixbuf_format_get_type at Base 2.21.6
+ gdk_pixbuf_format_is_disabled at Base 2.21.6
+ gdk_pixbuf_format_is_scalable at Base 2.21.6
+ gdk_pixbuf_format_is_writable at Base 2.21.6
+ gdk_pixbuf_format_set_disabled at Base 2.21.6
+ gdk_pixbuf_from_pixdata at Base 2.21.6
+ gdk_pixbuf_get_bits_per_sample at Base 2.21.6
+ gdk_pixbuf_get_colorspace at Base 2.21.6
+ gdk_pixbuf_get_file_info at Base 2.21.6
+ gdk_pixbuf_get_formats at Base 2.21.6
+ gdk_pixbuf_get_has_alpha at Base 2.21.6
+ gdk_pixbuf_get_height at Base 2.21.6
+ gdk_pixbuf_get_n_channels at Base 2.21.6
+ gdk_pixbuf_get_option at Base 2.21.6
+ gdk_pixbuf_get_pixels at Base 2.21.6
+ gdk_pixbuf_get_rowstride at Base 2.21.6
+ gdk_pixbuf_get_type at Base 2.21.6
+ gdk_pixbuf_get_width at Base 2.21.6
+ gdk_pixbuf_gettext at Base 2.21.6
+ gdk_pixbuf_loader_close at Base 2.21.6
+ gdk_pixbuf_loader_get_animation at Base 2.21.6
+ gdk_pixbuf_loader_get_format at Base 2.21.6
+ gdk_pixbuf_loader_get_pixbuf at Base 2.21.6
+ gdk_pixbuf_loader_get_type at Base 2.21.6
+ gdk_pixbuf_loader_new at Base 2.21.6
+ gdk_pixbuf_loader_new_with_mime_type at Base 2.21.6
+ gdk_pixbuf_loader_new_with_type at Base 2.21.6
+ gdk_pixbuf_loader_set_size at Base 2.21.6
+ gdk_pixbuf_loader_write at Base 2.21.6
+ gdk_pixbuf_major_version at Base 2.21.6
+ gdk_pixbuf_micro_version at Base 2.21.6
+ gdk_pixbuf_minor_version at Base 2.21.6
+ gdk_pixbuf_new at Base 2.21.6
+ gdk_pixbuf_new_from_data at Base 2.21.6
+ gdk_pixbuf_new_from_file at Base 2.21.6
+ gdk_pixbuf_new_from_file_at_scale at Base 2.21.6
+ gdk_pixbuf_new_from_file_at_size at Base 2.21.6
+ gdk_pixbuf_new_from_inline at Base 2.21.6
+ gdk_pixbuf_new_from_stream at Base 2.21.6
+ gdk_pixbuf_new_from_stream_at_scale at Base 2.21.6
+ gdk_pixbuf_new_from_xpm_data at Base 2.21.6
+ gdk_pixbuf_new_subpixbuf at Base 2.21.6
+ gdk_pixbuf_non_anim_get_type at Base 2.21.6
+ gdk_pixbuf_non_anim_new at Base 2.21.6
+ gdk_pixbuf_ref at Base 2.21.6
+ gdk_pixbuf_rotate_simple at Base 2.21.6
+ gdk_pixbuf_rotation_get_type at Base 2.21.6
+ gdk_pixbuf_saturate_and_pixelate at Base 2.21.6
+ gdk_pixbuf_save at Base 2.21.6
+ gdk_pixbuf_save_to_buffer at Base 2.21.6
+ gdk_pixbuf_save_to_bufferv at Base 2.21.6
+ gdk_pixbuf_save_to_callback at Base 2.21.6
+ gdk_pixbuf_save_to_callbackv at Base 2.21.6
+ gdk_pixbuf_save_to_stream at Base 2.21.6
+ gdk_pixbuf_savev at Base 2.21.6
+ gdk_pixbuf_scale at Base 2.21.6
+ gdk_pixbuf_scale_simple at Base 2.21.6
+ gdk_pixbuf_scaled_anim_get_type at Base 2.21.6
+ gdk_pixbuf_scaled_anim_iter_get_type at Base 2.21.6
+ gdk_pixbuf_set_option at Base 2.21.6
+ gdk_pixbuf_simple_anim_add_frame at Base 2.21.6
+ gdk_pixbuf_simple_anim_get_loop at Base 2.21.6
+ gdk_pixbuf_simple_anim_get_type at Base 2.21.6
+ gdk_pixbuf_simple_anim_iter_get_type at Base 2.21.6
+ gdk_pixbuf_simple_anim_new at Base 2.21.6
+ gdk_pixbuf_simple_anim_set_loop at Base 2.21.6
+ gdk_pixbuf_unref at Base 2.21.6
+ gdk_pixbuf_version at Base 2.21.6
+ gdk_pixdata_deserialize at Base 2.21.6
+ gdk_pixdata_from_pixbuf at Base 2.21.6
+ gdk_pixdata_serialize at Base 2.21.6
+ gdk_pixdata_to_csource at Base 2.21.6
+libgdk_pixbuf_xlib-2.0.so.0 libgdk-pixbuf2.0-0 #MINVER#
+ gdk_pixbuf_dpy at Base 2.21.6
+ gdk_pixbuf_screen at Base 2.21.6
+ gdk_pixbuf_xlib_get_from_drawable at Base 2.21.6
+ gdk_pixbuf_xlib_init at Base 2.21.6
+ gdk_pixbuf_xlib_init_with_depth at Base 2.21.6
+ gdk_pixbuf_xlib_render_pixmap_and_mask at Base 2.21.6
+ gdk_pixbuf_xlib_render_threshold_alpha at Base 2.21.6
+ gdk_pixbuf_xlib_render_to_drawable at Base 2.21.6
+ gdk_pixbuf_xlib_render_to_drawable_alpha at Base 2.21.6
+ xlib_draw_gray_image at Base 2.21.6
+ xlib_draw_indexed_image at Base 2.21.6
+ xlib_draw_rgb_32_image at Base 2.21.6
+ xlib_draw_rgb_image at Base 2.21.6
+ xlib_draw_rgb_image_dithalign at Base 2.21.6
+ xlib_rgb_cmap_free at Base 2.21.6
+ xlib_rgb_cmap_new at Base 2.21.6
+ xlib_rgb_ditherable at Base 2.21.6
+ xlib_rgb_gc_set_background at Base 2.21.6
+ xlib_rgb_gc_set_foreground at Base 2.21.6
+ xlib_rgb_get_cmap at Base 2.21.6
+ xlib_rgb_get_depth at Base 2.21.6
+ xlib_rgb_get_display at Base 2.21.6
+ xlib_rgb_get_screen at Base 2.21.6
+ xlib_rgb_get_visual at Base 2.21.6
+ xlib_rgb_get_visual_info at Base 2.21.6
+ xlib_rgb_init at Base 2.21.6
+ xlib_rgb_init_with_depth at Base 2.21.6
+ xlib_rgb_set_install at Base 2.21.6
+ xlib_rgb_set_min_colors at Base 2.21.6
+ xlib_rgb_set_verbose at Base 2.21.6
+ xlib_rgb_xpixel_from_rgb at Base 2.21.6

Modified: desktop/experimental/gdk-pixbuf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/rules?rev=24846&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/rules [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/rules [utf-8] Thu Jul 22 09:44:35 2010
@@ -2,7 +2,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_DH_MAKESHLIBS_ARGS_libgdk-pixbuf2.0-0 += -X "/usr/lib/gdk-pixbuf-2.0" -V "libgdk-pixbuf2.0-0 (>= 2.21.6)" -- -c4
+




More information about the pkg-gnome-commits mailing list