r26381 - in /desktop/experimental/d-conf/debian: ./ patches/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sat Jan 22 21:31:50 UTC 2011
Author: bigon
Date: Sat Jan 22 21:31:49 2011
New Revision: 26381
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26381
Log:
* debian/control.in:
- Add new binary packages libdconf-dbus-1-0, libdconf-dbus-1-dbg, and
libdconf-dbus-1-dbg.
- Bumped required versions of valac and gtk-doc-tools
- Have libdconf-dbus-1-0 depend on libdconf0 for its dbus service,
even though it doesn't use any of its symbols
- Bump gtk-doc-tools build-dependency
* debian/copyright:
- Use DEP5 syntax
* debian/rules, debian/libdconf*.install:
- Updated to handle new library binary package
even though it doesn't use any of its symbols
* debian/patches/fix-doc-linking.patch:
- Fix link order issue with gtk-doc scanning
Added:
desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install
desktop/experimental/d-conf/debian/libdconf-dbus-1-0.symbols
desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install
desktop/experimental/d-conf/debian/patches/
desktop/experimental/d-conf/debian/patches/fix-doc-linking.patch
desktop/experimental/d-conf/debian/patches/series
Modified:
desktop/experimental/d-conf/debian/changelog
desktop/experimental/d-conf/debian/control
desktop/experimental/d-conf/debian/control.in
desktop/experimental/d-conf/debian/copyright
desktop/experimental/d-conf/debian/dconf-tools.install
desktop/experimental/d-conf/debian/libdconf-dev.install
desktop/experimental/d-conf/debian/libdconf0.install
desktop/experimental/d-conf/debian/libdconf0.symbols
desktop/experimental/d-conf/debian/rules
Modified: desktop/experimental/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/changelog?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/changelog [utf-8] (original)
+++ desktop/experimental/d-conf/debian/changelog [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,5 +1,6 @@
d-conf (0.7.1-1) UNRELEASED; urgency=low
+ [ Emilio Pozuelo Monfort ]
* New upstream release.
+ Drop gir package, g-i support removed upstream.
+ debian/control.in:
@@ -15,7 +16,23 @@
+ Abort the build if the symbols file is out of date.
+ Make the shlibs file always depend on the last upstream release.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 03 Jan 2011 23:43:21 +0000
+ [ Laurent Bigonville ]
+ * debian/control.in:
+ - Add new binary packages libdconf-dbus-1-0, libdconf-dbus-1-dbg, and
+ libdconf-dbus-1-dbg.
+ - Bumped required versions of valac and gtk-doc-tools
+ - Have libdconf-dbus-1-0 depend on libdconf0 for its dbus service,
+ even though it doesn't use any of its symbols
+ - Bump gtk-doc-tools build-dependency
+ * debian/copyright:
+ - Use DEP5 syntax
+ * debian/rules, debian/libdconf*.install:
+ - Updated to handle new library binary package
+ even though it doesn't use any of its symbols
+ * debian/patches/fix-doc-linking.patch:
+ - Fix link order issue with gtk-doc scanning
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 22 Jan 2011 22:22:20 +0100
d-conf (0.5.1-2) experimental; urgency=low
Modified: desktop/experimental/d-conf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control [utf-8] Sat Jan 22 21:31:49 2011
@@ -12,7 +12,7 @@
cdbs,
autotools-dev,
gnome-pkg-tools,
- gtk-doc-tools (>= 1.14),
+ gtk-doc-tools (>= 1.15),
valac (>= 0.11.4),
libglib2.0-dev (>= 2.25.16),
libdbus-1-dev,
@@ -30,14 +30,13 @@
Provides: gsettings-backend
Description: Simple key-based configuration system
dconf is a simple key-based configuration system.
-
+
Package: libdconf-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
libdconf0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.25.10),
- libdbus-1-dev
+ libglib2.0-dev (>= 2.25.10)
Description: Simple key-based configuration system (development files)
dconf is a simple key-based configuration system.
.
@@ -53,6 +52,40 @@
dconf is a simple key-based configuration system.
.
This package contains the debugging symbols.
+
+Package: libdconf-dbus-1-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libdconf0 (= ${binary:Version})
+Description: Simple key-based configuration system (dbus library)
+ dconf is a simple key-based configuration system.
+ .
+ This package contains a dbus convenience library.
+
+Package: libdconf-dbus-1-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libdconf-dbus-1-0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.25.10),
+ libdbus-1-dev
+Description: Simple key-based configuration system (dbus development files)
+ dconf is a simple key-based configuration system.
+ .
+ This package contains a static library and header files for the dbus library.
+
+Package: libdconf-dbus-1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+ libdconf-dbus-1-0 (= ${binary:Version})
+Description: Simple key-based configuration system (dbus debug symbols)
+ dconf is a simple key-based configuration system.
+ .
+ This package contains the debugging symbols for the dbus library.
Package: libdconf-doc
Section: doc
Modified: desktop/experimental/d-conf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control.in?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control.in [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control.in [utf-8] Sat Jan 22 21:31:49 2011
@@ -7,7 +7,7 @@
cdbs,
autotools-dev,
gnome-pkg-tools,
- gtk-doc-tools (>= 1.14),
+ gtk-doc-tools (>= 1.15),
valac (>= 0.11.4),
libglib2.0-dev (>= 2.25.16),
libdbus-1-dev,
@@ -25,14 +25,13 @@
Provides: gsettings-backend
Description: Simple key-based configuration system
dconf is a simple key-based configuration system.
-
+
Package: libdconf-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
libdconf0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.25.10),
- libdbus-1-dev
+ libglib2.0-dev (>= 2.25.10)
Description: Simple key-based configuration system (development files)
dconf is a simple key-based configuration system.
.
@@ -48,6 +47,40 @@
dconf is a simple key-based configuration system.
.
This package contains the debugging symbols.
+
+Package: libdconf-dbus-1-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libdconf0 (= ${binary:Version})
+Description: Simple key-based configuration system (dbus library)
+ dconf is a simple key-based configuration system.
+ .
+ This package contains a dbus convenience library.
+
+Package: libdconf-dbus-1-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libdconf-dbus-1-0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.25.10),
+ libdbus-1-dev
+Description: Simple key-based configuration system (dbus development files)
+ dconf is a simple key-based configuration system.
+ .
+ This package contains a static library and header files for the dbus library.
+
+Package: libdconf-dbus-1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+ libdconf-dbus-1-0 (= ${binary:Version})
+Description: Simple key-based configuration system (dbus debug symbols)
+ dconf is a simple key-based configuration system.
+ .
+ This package contains the debugging symbols for the dbus library.
Package: libdconf-doc
Section: doc
Modified: desktop/experimental/d-conf/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/copyright?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/copyright [utf-8] (original)
+++ desktop/experimental/d-conf/debian/copyright [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,29 +1,69 @@
-This work was packaged for Debian by:
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: dconf
+Upstream-Contact: Ryan Lortie <desrt at desrt.ca>
+Source: http://ftp.gnome.org/pub/GNOME/sources/dconf
- Robert Ancell <robert.ancell at canonical.com> on Mon, 24 May 2010 17:19:01 +1000
+Files: *
+Copyright: 2008,2009 Ryan Lortie <desrt at desrt.ca>
+ 2010 Codethink Limited
+License: LGPL-2+
-It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/dconf/
+Files: dbus-1/dconf-dbus-1.*
+ tests/gsettings.c tests/dbus1.c
+Copyright: 2010 Canonical Limited
+License: GPL-3+
-Upstream Author(s):
+Files: debian/*
+Copyright: 2010,2011 Canonical Limited
+License: GPL-3
- Ryan Lortie <desrt at desrt.ca>
+License: LGPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
-Copyright:
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
- Copyright © 2008-2009 Ryan Lortie
- Copyright © 2010 Codethink Limited
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
-License:
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the licence, or (at your option) any later version.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-
-The Debian packaging is:
-
- Copyright (C) 2010 Robert Ancell <robert.ancell at canonical.com> and is
- licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'.
Modified: desktop/experimental/d-conf/debian/dconf-tools.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/dconf-tools.install?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/dconf-tools.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/dconf-tools.install [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,1 +1,3 @@
debian/tmp/usr/bin
+debian/tmp/usr/share/dconf-editor
+debian/tmp/usr/share/applications/dconf-editor.desktop
Added: desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install?rev=26381&op=file
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install (added)
+++ desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libdconf-dbus-1.so.*
Added: desktop/experimental/d-conf/debian/libdconf-dbus-1-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dbus-1-0.symbols?rev=26381&op=file
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dbus-1-0.symbols (added)
+++ desktop/experimental/d-conf/debian/libdconf-dbus-1-0.symbols [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,0 +1,30 @@
+libdconf-dbus-1.so.0 libdconf-dbus-1-0 #MINVER#
+* Build-Depends-Package: libdconf-dbus-1-dev
+ dconf_dbus_client_has_pending at Base 0.7
+ dconf_dbus_client_new at Base 0.7
+ dconf_dbus_client_read at Base 0.7
+ dconf_dbus_client_ref at Base 0.7
+ dconf_dbus_client_subscribe at Base 0.7
+ dconf_dbus_client_unref at Base 0.7
+ dconf_dbus_client_unsubscribe at Base 0.7
+ dconf_dbus_client_write at Base 0.7
+ dconf_engine_decode_notify at Base 0.7
+ dconf_engine_free at Base 0.7
+ dconf_engine_get_state at Base 0.7
+ dconf_engine_interpret_reply at Base 0.7
+ dconf_engine_is_writable at Base 0.7
+ dconf_engine_list at Base 0.7
+ dconf_engine_message_copy at Base 0.7
+ dconf_engine_message_destroy at Base 0.7
+ dconf_engine_new at Base 0.7
+ dconf_engine_read at Base 0.7
+ dconf_engine_read_default at Base 0.7
+ dconf_engine_read_no_default at Base 0.7
+ dconf_engine_set_locked at Base 0.7
+ dconf_engine_set_service_func at Base 0.7
+ dconf_engine_unwatch at Base 0.7
+ dconf_engine_watch at Base 0.7
+ dconf_engine_write at Base 0.7
+ dconf_engine_write_many at Base 0.7
+ dconf_shmdir_from_environment at Base 0.7
+ gvdb_table_walk at Base 0.7
Added: desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install?rev=26381&op=file
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install (added)
+++ desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,0 +1,3 @@
+debian/tmp/usr/lib/pkgconfig/dconf-dbus-1.pc
+debian/tmp/usr/lib/libdconf-dbus-1.so
+debian/tmp/usr/include/dconf-dbus-1
Modified: desktop/experimental/d-conf/debian/libdconf-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dev.install?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dev.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf-dev.install [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/include
-debian/tmp/usr/share/vala
+debian/tmp/usr/lib/pkgconfig/dconf.pc
+debian/tmp/usr/lib/libdconf.so
+debian/tmp/usr/include/dconf
+debian/tmp/usr/share/vala/vapi/dconf.*
Modified: desktop/experimental/d-conf/debian/libdconf0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf0.install?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf0.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf0.install [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/libdconf.so.*
debian/tmp/usr/lib/d-conf
debian/tmp/usr/lib/gio
debian/tmp/usr/share/dbus-1
Modified: desktop/experimental/d-conf/debian/libdconf0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf0.symbols?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf0.symbols [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf0.symbols [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,33 +1,3 @@
-libdconf-dbus-1.so.0 libdconf0 #MINVER#
-* Build-Depends-Package: libdconf-dev
- dconf_dbus_client_has_pending at Base 0.7.1
- dconf_dbus_client_new at Base 0.7.1
- dconf_dbus_client_read at Base 0.7.1
- dconf_dbus_client_ref at Base 0.7.1
- dconf_dbus_client_subscribe at Base 0.7.1
- dconf_dbus_client_unref at Base 0.7.1
- dconf_dbus_client_unsubscribe at Base 0.7.1
- dconf_dbus_client_write at Base 0.7.1
- dconf_engine_decode_notify at Base 0.7.1
- dconf_engine_free at Base 0.7.1
- dconf_engine_get_state at Base 0.7.1
- dconf_engine_interpret_reply at Base 0.7.1
- dconf_engine_is_writable at Base 0.7.1
- dconf_engine_list at Base 0.7.1
- dconf_engine_message_copy at Base 0.7.1
- dconf_engine_message_destroy at Base 0.7.1
- dconf_engine_new at Base 0.7.1
- dconf_engine_read at Base 0.7.1
- dconf_engine_read_default at Base 0.7.1
- dconf_engine_read_no_default at Base 0.7.1
- dconf_engine_set_locked at Base 0.7.1
- dconf_engine_set_service_func at Base 0.7.1
- dconf_engine_unwatch at Base 0.7.1
- dconf_engine_watch at Base 0.7.1
- dconf_engine_write at Base 0.7.1
- dconf_engine_write_many at Base 0.7.1
- dconf_shmdir_from_environment at Base 0.7.1
- gvdb_table_walk at Base 0.7.1
libdconf.so.0 libdconf0 #MINVER#
* Build-Depends-Package: libdconf-dev
dconf_client_construct at Base 0.5
Added: desktop/experimental/d-conf/debian/patches/fix-doc-linking.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/patches/fix-doc-linking.patch?rev=26381&op=file
==============================================================================
--- desktop/experimental/d-conf/debian/patches/fix-doc-linking.patch (added)
+++ desktop/experimental/d-conf/debian/patches/fix-doc-linking.patch [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,0 +1,26 @@
+Index: d-conf-0.6/docs/Makefile.am
+===================================================================
+--- d-conf-0.6.orig/docs/Makefile.am 2011-01-05 09:58:16.951567406 -0500
++++ d-conf-0.6/docs/Makefile.am 2011-01-05 09:58:28.661461849 -0500
+@@ -9,7 +9,7 @@
+ MKDB_OPTIONS = --output-format=xml
+
+ INCLUDES = $(gio_CFLAGS)
+-GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client
++GTKDOC_LIBS = -L../client -ldconf -Wl,-rpath=../client $(gio_LIBS)
+
+ IGNORE_HFILES = \
+ dconf-engine.h \
+Index: d-conf-0.6/docs/Makefile.in
+===================================================================
+--- d-conf-0.6.orig/docs/Makefile.in 2011-01-05 09:58:16.981567136 -0500
++++ d-conf-0.6/docs/Makefile.in 2011-01-05 09:58:32.841424154 -0500
+@@ -207,7 +207,7 @@
+ DOC_SOURCE_DIR = ../client ../common
+ MKDB_OPTIONS = --output-format=xml
+ INCLUDES = $(gio_CFLAGS)
+-GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client
++GTKDOC_LIBS = -L../client -ldconf -Wl,-rpath=../client $(gio_LIBS)
+ IGNORE_HFILES = \
+ dconf-engine.h \
+ dconf-shmdir.h \
Added: desktop/experimental/d-conf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/patches/series?rev=26381&op=file
==============================================================================
--- desktop/experimental/d-conf/debian/patches/series (added)
+++ desktop/experimental/d-conf/debian/patches/series [utf-8] Sat Jan 22 21:31:49 2011
@@ -1,0 +1,1 @@
+fix-doc-linking.patch
Modified: desktop/experimental/d-conf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/rules?rev=26381&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/rules [utf-8] (original)
+++ desktop/experimental/d-conf/debian/rules [utf-8] Sat Jan 22 21:31:49 2011
@@ -10,3 +10,6 @@
GNOME_MODULE=dconf
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
+
+DEB_DBG_PACKAGE_libdconf0 := libdconf-dbg
+DEB_DBG_PACKAGE_libdconf-dbus-1-0 := libdconf-dbus-1-dbg
More information about the pkg-gnome-commits
mailing list