Changeset 7038 for pkg/raul


Ignore:
Timestamp:
01/01/11 03:03:46 (2 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 2.32.1-2
Location:
pkg/raul/main/gconf/trunk/debian
Files:
4 added
12 edited

Legend:

Unmodified
Added
Removed

  • pkg/raul/main/gconf/trunk/debian/changelog

    r6616 r7038  
    1 gconf (2.28.1-parsix1) unstable; urgency=low 
    2  
    3   * Sync'd with Debian 2.28.1-3 
    4  
    5  -- Alan Baghumian <alan@technotux.org>  Sat, 03 Jul 2010 12:10:39 -0700 
     1gconf (2.32.1-parsix1) unstable; urgency=low 
     2 
     3  * Sync'd with Debian 2.32.1-2 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Fri, 31 Dec 2010 18:02:09 -0800 
     6 
     7gconf (2.32.1-2) experimental; urgency=low 
     8 
     9  * debian/po-up/*: 
     10    + Removed, the patch has been merged upstream so there's nothing 
     11      to translate. 
     12  * debian/rules: 
     13    + Remove patch-translations.mk. 
     14  * Update to the new gir policy: 
     15    - Rename gir1.0-gconf-2.0 to gir1.2-gconf-2.0. 
     16    - Bump the gobject-introspection build dependency. 
     17    - Build depend on gir1.2 packages. 
     18 
     19 -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 12 Dec 2010 15:59:47 +0100 
     20 
     21gconf (2.32.1-1) experimental; urgency=low 
     22 
     23  [ Josselin Mouette ] 
     24  * Include patch-translations.mk, bump build-depends accordingly. 
     25  * Include 03_error_message.patch in POTFILES.in. 
     26  * pt_BR.po: Brazilian Portuguese translation. Closes: #599032. 
     27  * fr.po: French translation by Christian Perrier. Closes: #599049. 
     28  * da.po: Danish translation by Joe Hansen. Closes: #599125. 
     29  * cs.po: Czech translation by Michal Simunek. Closes: #599198. 
     30  * update-gconf-defaults: patch from Ubuntu to deal with broken  
     31    symlinks. Closes: #599393. Thanks Michael Vogt. 
     32  * de.po: German translation by Helge Kreutzmann. Closes: #599683. 
     33  * sv.po: Swedish translation by Martin Bagge. Closes: #599854. 
     34  * 04_manpage.patch: patch from A. Costa. Fixes typos in the manual  
     35    page. Closes: #600899. 
     36 
     37  [ Sjoerd Simons ] 
     38  * New upstream release 
     39  * Bump gobject-introspection to the lastest version to generate the most 
     40    recent .gir version 
     41  * debian/patches/03_error_message.patch 
     42    + Removed, merged upstream 
     43  * debian/rules: 
     44    + Specify compilation with gtk2 
     45 
     46  [ Emilio Pozuelo Monfort ] 
     47  * Switch to source format 3.0 (quilt). 
     48  * debian/patches/*: 
     49    - Updated to apply cleanly. 
     50 
     51 -- Emilio Pozuelo Monfort <pochu@debian.org>  Mon, 06 Dec 2010 00:53:14 +0100 
     52 
     53gconf (2.31.5-1) experimental; urgency=low 
     54 
     55  [ Josselin Mouette ] 
     56  * Patch from Ubuntu - thanks to Sébastien Bacher. Closes: #587786. 
     57    * debian/control.in: 
     58      - list a new gir1.0-gconf-2.0 binary 
     59      - libgconf2-dev replaces gir-repository-dev 
     60    * debian/gir1.0-gconf-2.0.install, 
     61      debian/libgconf2-dev.install: 
     62      - install the gir and typelib 
     63    * debian/rules: 
     64      - use dh_girepository 
     65  * Fix description for the GIR package. 
     66 
     67  [ Sjoerd Simons ] 
     68  * New upstream release 
     69 
     70 -- Sjoerd Simons <sjoerd@debian.org>  Sat, 03 Jul 2010 15:36:20 +0100 
     71 
     72gconf (2.31.4-1) experimental; urgency=low 
     73 
     74  [ Josselin Mouette ] 
     75  * 03_error_message.patch: new patch. Replace the error message by 
     76    something more accurate nowadays. Closes: #582839. 
     77 
     78  [ Sebastian Dröge ] 
     79  * New upstream development release: 
     80    + debian/control.in: 
     81      - Update GLib build dependency to >= 2.25.9. 
     82 
     83 -- Sebastian Dröge <slomo@debian.org>  Sat, 19 Jun 2010 08:07:51 +0200 
     84 
     85gconf (2.31.3-1) experimental; urgency=low 
     86 
     87  * New upstream development release: 
     88    + debian/gconf2.install: 
     89      - Add autostart file for GSettings. 
     90 
     91 -- Sebastian Dröge <slomo@debian.org>  Tue, 25 May 2010 11:56:39 +0200 
     92 
     93gconf (2.31.2-1) experimental; urgency=low 
     94 
     95  * New upstream development release. 
     96 
     97 -- Sebastian Dröge <slomo@debian.org>  Fri, 23 Apr 2010 12:59:31 +0200 
     98 
     99gconf (2.31.1-1) experimental; urgency=low 
     100 
     101  * New upstream development release: 
     102    + debian/control.in: 
     103      - Update build-dependencies and dependencies. 
     104    + debian/libgconf2.install: 
     105      - Add GSettings backend module. 
     106    + debian/rules: 
     107      - Update shlibs version to >= 2.31.1 because of new API. 
     108 
     109 -- Sebastian Dröge <slomo@debian.org>  Wed, 21 Apr 2010 09:04:14 +0200 
    6110 
    7111gconf (2.28.1-3) unstable; urgency=low 

  • pkg/raul/main/gconf/trunk/debian/control

    r6616 r7038  
    88Priority: optional 
    99Maintainer: Josselin Mouette <joss@debian.org> 
    10 Uploaders: David Weinehall <tao@debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> 
     10Uploaders: David Weinehall <tao@debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Sebastian Dröge <slomo@debian.org>, Sjoerd Simons <sjoerd@debian.org> 
    1111Build-Depends: debhelper (>= 5), 
    1212               cdbs (>= 0.4.41), 
    13                quilt, 
    14                gnome-pkg-tools (>= 0.10), 
     13               gnome-pkg-tools (>= 0.14), 
    1514               dpkg-dev (>= 1.13.19), 
    1615               gtk-doc-tools (>= 1.0), 
    17                libglib2.0-dev (>= 2.14.0), 
     16               libglib2.0-dev (>= 2.25.9), 
    1817               liborbit2-dev (>= 1:2.10.2-1.1), 
    1918               libdbus-1-dev (>= 1.0.0), 
    … …  
    2928               python-support (>= 0.5.3), 
    3029               autotools-dev, 
    31                libglib2.0-doc 
     30               libglib2.0-doc, 
     31               gobject-introspection (>= 0.9.12-4~), 
     32               libgirepository1.0-dev (>= 0.9.12), 
     33               gir1.2-glib-2.0 
    3234Standards-Version: 3.8.4 
    3335Homepage:  http://projects.gnome.org/gconf/ 
    … …  
    112114Depends: ${misc:Depends}, 
    113115         libgconf2-4 (= ${binary:Version}), 
    114          libglib2.0-dev (>= 2.14.0), 
     116         libglib2.0-dev (>= 2.25.9), 
    115117         liborbit2-dev (>= 1:2.10.2-1.1), 
    116118         libdbus-1-dev (>= 1.0.0), 
    117119         gconf2 (= ${binary:Version}) 
    118 Replaces: gconf2 (<< 2.12.0-2) 
     120Replaces: gconf2 (<< 2.12.0-2),  
     121          gir-repository-dev (<< 0.6.5-7) 
    119122Description: GNOME configuration database system (development) 
    120123 GConf is a configuration database system for storing application 
    … …  
    126129 This package contains the static libraries, header files and 
    127130 documentation needed to build applications using GConf.  
     131 
     132Package: gir1.2-gconf-2.0 
     133Architecture: any 
     134Depends: ${gir:Depends}, 
     135         ${misc:Depends}, 
     136         ${shlibs:Depends} 
     137Conflicts: gir1.0-gconf-2.0 
     138Description: GNOME configuration database system (GObject-Introspection) 
     139 GConf is a configuration database system for storing application 
     140 preferences. It supports default or mandatory settings set by the 
     141 administrator, and changes to the database are instantly applied to all 
     142 running applications. It is written for the GNOME desktop but doesn't 
     143 require it. 
     144 . 
     145 This package contains introspection data for GConf. It can be used by  
     146 packages using the GIRepository format to generate dynamic bindings. 

  • pkg/raul/main/gconf/trunk/debian/control.in

    r6616 r7038  
    66Build-Depends: debhelper (>= 5), 
    77               cdbs (>= 0.4.41), 
    8                quilt, 
    9                gnome-pkg-tools (>= 0.10), 
     8               gnome-pkg-tools (>= 0.14), 
    109               dpkg-dev (>= 1.13.19), 
    1110               gtk-doc-tools (>= 1.0), 
    12                libglib2.0-dev (>= 2.14.0), 
     11               libglib2.0-dev (>= 2.25.9), 
    1312               liborbit2-dev (>= 1:2.10.2-1.1), 
    1413               libdbus-1-dev (>= 1.0.0), 
    … …  
    2423               python-support (>= 0.5.3), 
    2524               autotools-dev, 
    26                libglib2.0-doc 
     25               libglib2.0-doc, 
     26               gobject-introspection (>= 0.9.12-4~), 
     27               libgirepository1.0-dev (>= 0.9.12), 
     28               gir1.2-glib-2.0 
    2729Standards-Version: 3.8.4 
    2830Homepage:  http://projects.gnome.org/gconf/ 
    … …  
    107109Depends: ${misc:Depends}, 
    108110         libgconf2-4 (= ${binary:Version}), 
    109          libglib2.0-dev (>= 2.14.0), 
     111         libglib2.0-dev (>= 2.25.9), 
    110112         liborbit2-dev (>= 1:2.10.2-1.1), 
    111113         libdbus-1-dev (>= 1.0.0), 
    112114         gconf2 (= ${binary:Version}) 
    113 Replaces: gconf2 (<< 2.12.0-2) 
     115Replaces: gconf2 (<< 2.12.0-2),  
     116          gir-repository-dev (<< 0.6.5-7) 
    114117Description: GNOME configuration database system (development) 
    115118 GConf is a configuration database system for storing application 
    … …  
    121124 This package contains the static libraries, header files and 
    122125 documentation needed to build applications using GConf.  
     126 
     127Package: gir1.2-gconf-2.0 
     128Architecture: any 
     129Depends: ${gir:Depends}, 
     130         ${misc:Depends}, 
     131         ${shlibs:Depends} 
     132Conflicts: gir1.0-gconf-2.0 
     133Description: GNOME configuration database system (GObject-Introspection) 
     134 GConf is a configuration database system for storing application 
     135 preferences. It supports default or mandatory settings set by the 
     136 administrator, and changes to the database are instantly applied to all 
     137 running applications. It is written for the GNOME desktop but doesn't 
     138 require it. 
     139 . 
     140 This package contains introspection data for GConf. It can be used by  
     141 packages using the GIRepository format to generate dynamic bindings. 

  • pkg/raul/main/gconf/trunk/debian/gconf2.install

    r4981 r7038  
    33debian/update-gconf-defaults usr/bin/ 
    44debian/tmp/usr/share/man 
     5debian/tmp/etc/xdg/autostart 

  • pkg/raul/main/gconf/trunk/debian/libgconf2-4.install

    r4925 r7038  
    33debian/tmp/usr/lib/libgconf2-4/gconf-sanity-check-2 
    44debian/tmp/usr/lib/libgconf2-4/2/*.so 
     5debian/tmp/usr/lib/gio/modules/*.so 

  • pkg/raul/main/gconf/trunk/debian/libgconf2-dev.install

    r462 r7038  
    44debian/tmp/usr/lib/*.la 
    55debian/tmp/usr/share/aclocal 
     6debian/tmp/usr/share/gir-1.0 
    67debian/tmp/usr/lib/pkgconfig 
    78debian/tmp/usr/share/gtk-doc/html/gconf/* usr/share/doc/gconf2/html/ 

  • pkg/raul/main/gconf/trunk/debian/patches/01_defaults_path.patch

    r6616 r7038  
    1 diff -urN GConf-2.28.0.orig/defaults/gconf-defaults.c GConf-2.28.0/defaults/gconf-defaults.c 
    2 --- GConf-2.28.0.orig/defaults/gconf-defaults.c 2009-08-19 17:35:32.000000000 +0200 
    3 +++ GConf-2.28.0/defaults/gconf-defaults.c      2009-10-04 12:17:01.000000000 +0200 
     1--- a/defaults/gconf-defaults.c 
     2+++ b/defaults/gconf-defaults.c 
    43@@ -811,7 +811,7 @@ 
    54        else { 
    … …  
    1110  
    1211         polkit_authority_enumerate_actions (mechanism->priv->auth, 
    13 diff -urN GConf-2.28.0.orig/gconf/gconfd.c GConf-2.28.0/gconf/gconfd.c 
    14 --- GConf-2.28.0.orig/gconf/gconfd.c    2009-08-19 17:35:32.000000000 +0200 
    15 +++ GConf-2.28.0/gconf/gconfd.c 2009-10-04 12:16:44.000000000 +0200 
    16 @@ -637,7 +637,7 @@ 
     12--- a/gconf/gconfd.c 
     13+++ b/gconf/gconfd.c 
     14@@ -667,7 +667,7 @@ 
    1715  
    1816          gconf_log (GCL_DEBUG, "System defaults changed.  Notifying."); 

  • pkg/raul/main/gconf/trunk/debian/patches/02_fix_wrong_return_value.patch

    r6616 r7038  
    55--- a/gconf/gconf-client.c 
    66+++ b/gconf/gconf-client.c 
    7 @@ -2025,7 +2025,7 @@ 
     7@@ -2163,7 +2163,7 @@ 
    88     { 
    99       g_free (dir); 

  • pkg/raul/main/gconf/trunk/debian/patches/25_gconf-path-max-hurd.patch

    r6616 r7038  
    1 diff -Naur GConf-2.6.4.orig/backends/markup-tree.c GConf-2.6.4/backends/markup-tree.c 
    2 --- GConf-2.8.1.orig/backends/markup-tree.c     2004-09-29 14:09:44.000000000 +0200 
    3 +++ GConf-2.8.1/backends/markup-tree.c  2004-09-29 14:14:01.000000000 +0200 
    4 @@ -34,6 +34,11 @@ 
    5  #include <stdio.h> 
    6  #include <time.h> 
     1--- a/backends/markup-tree.c 
     2+++ b/backends/markup-tree.c 
     3@@ -71,6 +71,11 @@ 
     4 } 
     5 #endif 
    76  
    87+/* PATH_MAX is not defined in limits.h on some platforms */ 
    … …  
    1413 { 
    1514   char       *locale; 
    16 diff -Naur GConf-2.6.4.orig/backends/xml-dir.c GConf-2.6.4/backends/xml-dir.c 
    17 --- GConf-2.8.1.orig/backends/xml-dir.c 2004-09-29 14:09:44.000000000 +0200 
    18 +++ GConf-2.8.1/backends/xml-dir.c      2004-09-29 14:11:59.000000000 +0200 
     15--- a/backends/xml-dir.c 
     16+++ b/backends/xml-dir.c 
    1917@@ -36,6 +36,11 @@ 
    20  
     18  
    2119 #include "gconf/gconf-internals.h" 
    2220  

  • pkg/raul/main/gconf/trunk/debian/patches/series

    r5983 r7038  
    1101_defaults_path.patch 
    2202_fix_wrong_return_value.patch 
     304_manpage.patch 
    3425_gconf-path-max-hurd.patch 

  • pkg/raul/main/gconf/trunk/debian/rules

    r5983 r7038  
    33include /usr/share/cdbs/1/rules/debhelper.mk 
    44include /usr/share/cdbs/1/class/gnome.mk 
    5 include /usr/share/cdbs/1/rules/patchsys-quilt.mk 
    65include /usr/share/cdbs/1/rules/utils.mk 
    76include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk 
    … …  
    2322 
    2423DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO 
    25 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 
     24DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 \ 
     25  --with-gtk=2.0 
    2626DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4 
    2727 
    2828LDFLAGS += -Wl,-z,defs -Wl,--as-needed 
    2929 
    30 DEB_DH_MAKESHLIBS_ARGS_libgconf2-4 += -Xbackend -V"libgconf2-4 (>= 2.27.0)" 
     30DEB_DH_MAKESHLIBS_ARGS_libgconf2-4 += -Xbackend -V"libgconf2-4 (>= 2.31.1)" 
    3131DEB_DH_SHLIBDEPS_ARGS += -Xgconf-sanity-check 
    3232 
    … …  
    3535binary-predeb/gconf2:: 
    3636        dh_pysupport -p$(cdbs_curpkg) 
     37 
     38$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: 
     39        dh_girepository -p$(cdbs_curpkg) 
     40 

  • pkg/raul/main/gconf/trunk/debian/update-gconf-defaults

    r6616 r7038  
    131131      break 
    132132  else: 
    133     defaults_files.append(f) 
     133    if os.path.exists(os.path.join(options.source_dir, f)): 
     134      defaults_files.append(f) 
    134135defaults_files.sort() 
    135136 
Note: See TracChangeset for help on using the changeset viewer.