diff -u glib2.0-2.16.3/debian/patches/series glib2.0-2.16.3/debian/patches/series --- glib2.0-2.16.3/debian/patches/series +++ glib2.0-2.16.3/debian/patches/series @@ -6,0 +7 @@ +92_ubuntu_preserve-mtime.patch diff -u glib2.0-2.16.3/debian/control glib2.0-2.16.3/debian/control --- glib2.0-2.16.3/debian/control +++ glib2.0-2.16.3/debian/control @@ -1,7 +1,8 @@ Source: glib2.0 Section: libs Priority: optional -Maintainer: Loic Minier +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Loic Minier Uploaders: Debian GNOME Maintainers , Sebastian Dröge Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), diff -u glib2.0-2.16.3/debian/changelog glib2.0-2.16.3/debian/changelog --- glib2.0-2.16.3/debian/changelog +++ glib2.0-2.16.3/debian/changelog @@ -1,3 +1,13 @@ +glib2.0 (2.16.3-1ubuntu3) hardy-proposed; urgency=low + + * debian/patches/92_ubuntu_preserve-mtime.patch: + - suggested patch from upstream tracker + http://bugzilla.gnome.org/show_bug.cgi?id=515777 + to preserve modified time on file copying (LP: #215499) + * debian/control.in: change maintainer fields + + -- Tormod Volden Wed, 11 Jun 2008 18:39:25 +0200 + glib2.0 (2.16.3-1ubuntu2) hardy-proposed; urgency=low * debian/patches/91_from_svn_fix_ncpfs_free_space.patch: diff -u glib2.0-2.16.3/debian/control.in glib2.0-2.16.3/debian/control.in --- glib2.0-2.16.3/debian/control.in +++ glib2.0-2.16.3/debian/control.in @@ -1,7 +1,8 @@ Source: glib@APIVER@ Section: libs Priority: optional -Maintainer: Loic Minier +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Loic Minier Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), only in patch2: unchanged: --- glib2.0-2.16.3.orig/debian/patches/92_ubuntu_preserve-mtime.patch +++ glib2.0-2.16.3/debian/patches/92_ubuntu_preserve-mtime.patch @@ -0,0 +1,25 @@ +# preserve modified time on file copy +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=515777 +# Ubuntu: https://bugs.launchpad.net/bugs/215499 + +Index: glib2.0-2.16.3/gio/glocalfile.c +=================================================================== +--- glib2.0-2.16.3.orig/gio/glocalfile.c 2008-06-11 18:35:12.000000000 +0200 ++++ glib2.0-2.16.3/gio/glocalfile.c 2008-06-11 18:35:46.000000000 +0200 +@@ -177,11 +177,16 @@ + g_file_attribute_info_list_add (list, + G_FILE_ATTRIBUTE_TIME_MODIFIED, + G_FILE_ATTRIBUTE_TYPE_UINT64, ++ G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE | + G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED); + g_file_attribute_info_list_add (list, + G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, + G_FILE_ATTRIBUTE_TYPE_UINT32, ++ G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE | + G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED); ++ /* When copying, the target file is accessed. Replicating ++ * the source access time does not make sense in this case. ++ */ + g_file_attribute_info_list_add (list, + G_FILE_ATTRIBUTE_TIME_ACCESS, + G_FILE_ATTRIBUTE_TYPE_UINT64,