r13994 - in /desktop/experimental/glib2.0/debian: changelog control control.in libgio-fam.install patches/02_fix_build_issue.patch patches/series rules

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Sun Dec 23 05:19:30 UTC 2007 

Author: slomo
Date: Sun Dec 23 05:19:30 2007
New Revision: 13994

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13994
Log:
* New upstream development release, the new API may still change
  incompatibly; API additions.
* Include check-dist again to prevent accidental uploads to unstable.
* Disable testsuite for now.
* Bump shlibs to 2.15.0.
* 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.

Added:
    desktop/experimental/glib2.0/debian/libgio-fam.install
    desktop/experimental/glib2.0/debian/patches/02_fix_build_issue.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    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=13994&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Sun Dec 23 05:19:30 2007
@@ -1,9 +1,21 @@
-glib2.0 (2.14.4-3) UNRELEASED; urgency=low
-
+glib2.0 (2.15.0-1) experimental; urgency=low
+
+  [Sebastian Dröge]
+  * New upstream development release, the new API may still change
+    incompatibly; API additions.
+  * Include check-dist again to prevent accidental uploads to unstable.
+  * Disable testsuite for now.
+  * Bump shlibs to 2.15.0.
+  * 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.
+
+  [Loic Minier]
   * Build-dep on gtk-doc-tools to prevent a spurious warning from
     gtk-doc.make: "/bin/sh: line 11: test: !=: unary operator expected".
 
- -- Loic Minier <lool at dooz.org>  Sun, 02 Dec 2007 18:14:04 +0100
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 23 Dec 2007 05:58:17 +0100
 
 glib2.0 (2.14.4-2) unstable; urgency=low
 

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=13994&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control (original)
+++ desktop/experimental/glib2.0/debian/control Sun Dec 23 05:19:30 2007
@@ -11,8 +11,11 @@
                quilt,
                dpkg-dev (>= 1.13.19),
                libpcre3-dev (>= 7.2),
-               gtk-doc-tools
-Standards-Version: 3.7.2
+               gtk-doc-tools,
+               libselinux1-dev | not+linux-gnu,
+               linux-libc-dev | not+linux-gnu,
+               libfam-dev | libgamin-dev
+Standards-Version: 3.7.3
 
 Package: libglib2.0-0
 Section: libs
@@ -113,3 +116,10 @@
  This package contains the HTML documentation for the GLib library
  in /usr/share/doc/libglib2.0-doc/ .
 
+Package: libgio-fam
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GLib Input, Output and Streaming Library (fam module)
+ GIO is the input, output and streaming API of GLib. This package
+ provides a fam file and directory monitoring backend for it.
+ 

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=13994&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in (original)
+++ desktop/experimental/glib2.0/debian/control.in Sun Dec 23 05:19:30 2007
@@ -11,8 +11,11 @@
                quilt,
                dpkg-dev (>= 1.13.19),
                libpcre3-dev (>= 7.2),
-               gtk-doc-tools
-Standards-Version: 3.7.2
+               gtk-doc-tools,
+               libselinux1-dev | not+linux-gnu,
+               linux-libc-dev | not+linux-gnu,
+               libfam-dev | libgamin-dev
+Standards-Version: 3.7.3
 
 Package: @SHARED_PKG@
 Section: libs
@@ -113,3 +116,10 @@
  This package contains the HTML documentation for the GLib library
  in /usr/share/doc/@DOC_PKG@/ .
 
+Package: libgio-fam
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GLib Input, Output and Streaming Library (fam module)
+ GIO is the input, output and streaming API of GLib. This package
+ provides a fam file and directory monitoring backend for it.
+ 

Added: desktop/experimental/glib2.0/debian/libgio-fam.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libgio-fam.install?rev=13994&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/libgio-fam.install (added)
+++ desktop/experimental/glib2.0/debian/libgio-fam.install Sun Dec 23 05:19:30 2007
@@ -1,0 +1,1 @@
+debian/install/deb/usr/lib/gio usr/lib/gio/

Added: desktop/experimental/glib2.0/debian/patches/02_fix_build_issue.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/02_fix_build_issue.patch?rev=13994&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/02_fix_build_issue.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/02_fix_build_issue.patch Sun Dec 23 05:19:30 2007
@@ -1,0 +1,35 @@
+=== modified file 'glib2.0-2.15.0/gio/fam/Makefile.am'
+--- glib2.0-2.15.0/gio/fam/Makefile.am	2007-12-21 15:38:10 +0000
++++ glib2.0-2.15.0/gio/fam/Makefile.am	2007-12-21 15:38:55 +0000
+@@ -30,6 +30,8 @@
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+ 		$(top_builddir)/gio/libgio-2.0.la \
++		$(top_builddir)/gobject/libgobject-2.0.la \
++		$(top_builddir)/glib/libglib-2.0.la \
+ 		$(GLIB_LIBS) \
+ 		$(FAM_LIBS) \
+ 		$(NULL)
+
+=== modified file 'glib2.0-2.15.0/gio/fam/Makefile.in'
+--- glib2.0-2.15.0/gio/fam/Makefile.in	2007-12-21 15:38:10 +0000
++++ glib2.0-2.15.0/gio/fam/Makefile.in	2007-12-21 15:48:10 +0000
+@@ -59,7 +59,7 @@
+ giomoduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
++libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la $(top_builddir)/gobject/libgobject-2.0.la $(top_builddir)/glib/libglib-2.0.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+@@ -319,6 +319,8 @@
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+ 		$(top_builddir)/gio/libgio-2.0.la \
++		$(top_builddir)/gobject/libgobject-2.0.la \
++		$(top_builddir)/glib/libglib-2.0.la \
+ 		$(GLIB_LIBS) \
+ 		$(FAM_LIBS) \
+ 		$(NULL)
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=13994&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series (original)
+++ desktop/experimental/glib2.0/debian/patches/series Sun Dec 23 05:19:30 2007
@@ -1,3 +1,4 @@
 #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=13994&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Sun Dec 23 05:19:30 2007
@@ -2,6 +2,7 @@
 
 DISABLE_UPDATE_UPLOADERS := 1
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := glib
@@ -38,7 +39,7 @@
 
 APIVER := 2.0
 SONAME := 0
-SHVER := 2.14.0
+SHVER := 2.15.0
 
 # package names
 SHARED_PKG := libglib$(APIVER)-$(SONAME)
@@ -57,7 +58,8 @@
 CHECK_FLAVORS := $(filter deb, $(FLAVORS))
 
 # list of arches on which testsuite failures are fatal
-CHECK_SUPPORTED_ARCHES := alpha amd64 i386 ia64 lpia s390
+CHECK_SUPPORTED_ARCHES :=
+# CHECK_SUPPORTED_ARCHES := alpha amd64 i386 ia64 lpia s390
 # testsuite is known to fail on hppa, hurd, kfreebsd-amd64, kfreebsd-i386; see
 # Debian #428674
 # testsuite is known to fail on arm, mips, mipsel, powerpc, sparc; see GNOME #481573

More information about the pkg-gnome-commits mailing list