r17632 - in /desktop/experimental/gnome-desktop/debian: changelog control control.in libgnome-desktop-2-7.install libgnome-desktop-2.install libgnome-desktop-2.shlibs libgnome-desktop-dev.install patches/99_ltmain_as-needed.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Nov 17 20:44:03 UTC 2008
Author: joss
Date: Mon Nov 17 20:44:03 2008
New Revision: 17632
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17632
Log:
* New upstream release.
- update patches/99_ltmain_as-needed.patch to apply.
* Bump build-dependency on intltool, add one on libxrandr-dev.
* Add a ~ to build-depend on libgnomeui-dev.
* Rename the library package to libgnome-desktop-2-7.
* Ship the documentation in libgnome-desktop-dev.
Added:
desktop/experimental/gnome-desktop/debian/libgnome-desktop-2-7.install (props changed)
- copied unchanged from r17631, desktop/experimental/gnome-desktop/debian/libgnome-desktop-2.install
Removed:
desktop/experimental/gnome-desktop/debian/libgnome-desktop-2.install
desktop/experimental/gnome-desktop/debian/libgnome-desktop-2.shlibs
Modified:
desktop/experimental/gnome-desktop/debian/changelog
desktop/experimental/gnome-desktop/debian/control
desktop/experimental/gnome-desktop/debian/control.in
desktop/experimental/gnome-desktop/debian/libgnome-desktop-dev.install
desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch
desktop/experimental/gnome-desktop/debian/rules
Modified: desktop/experimental/gnome-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop/debian/changelog?rev=17632&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/changelog (original)
+++ desktop/experimental/gnome-desktop/debian/changelog Mon Nov 17 20:44:03 2008
@@ -1,3 +1,17 @@
+gnome-desktop (2.24.1-1) experimental; urgency=low
+
+ [ Andreas Henriksson ]
+ * New upstream release.
+ - update patches/99_ltmain_as-needed.patch to apply.
+
+ [ Josselin Mouette ]
+ * Bump build-dependency on intltool, add one on libxrandr-dev.
+ * Add a ~ to build-depend on libgnomeui-dev.
+ * Rename the library package to libgnome-desktop-2-7.
+ * Ship the documentation in libgnome-desktop-dev.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 17 Nov 2008 21:43:38 +0100
+
gnome-desktop (2.22.3-2) unstable; urgency=low
* Ship files in /usr/share/omf in gnome-desktop-data. Closes: #492872.
Modified: desktop/experimental/gnome-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop/debian/control?rev=17632&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/control (original)
+++ desktop/experimental/gnome-desktop/debian/control Mon Nov 17 20:44:03 2008
@@ -2,13 +2,13 @@
Section: gnome
Priority: optional
Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.8.0
XS-Python-Version: >= 2.4
Build-Depends: debhelper (>= 5),
libglib2.0-dev (>= 2.15.4),
- intltool (>= 0.35.0),
- libgnomeui-dev (>= 2.14.1-1),
+ intltool (>= 0.40.0),
+ libgnomeui-dev (>= 2.14.1-1~),
scrollkeeper,
cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
@@ -16,6 +16,7 @@
docbook-xml,
gnome-doc-utils (>= 0.3.2),
libx11-dev,
+ libxrandr-dev (>= 1.2),
libgtk2.0-dev (>= 2.11.3),
libstartup-notification0-dev (>= 0.5),
libxml2-dev (>= 2.4.20),
@@ -55,12 +56,11 @@
This package includes some files that are shared between several GNOME 2
apps (Pixmaps, .desktop files and internationalization files).
-Package: libgnome-desktop-2
+Package: libgnome-desktop-2-7
Section: libs
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Replaces: libpanel-applet2 (<= 1.5.4-1)
Description: Utility library for loading .desktop files - runtime files
This library is used by GNOME 2 to load the .desktop files.
@@ -68,8 +68,9 @@
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libgnome-desktop-2 (= ${binary:Version}),
+ libgnome-desktop-2-7 (= ${binary:Version}),
libgnomeui-dev (>= 2.14.1-1),
+ libgtk2.0-dev (>= 2.11.3),
libstartup-notification0-dev (>= 0.5)
Replaces: libpanel-applet2-dev (<= 1.5.4-1)
Description: Utility library for loading .desktop files - development files
Modified: desktop/experimental/gnome-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop/debian/control.in?rev=17632&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/control.in (original)
+++ desktop/experimental/gnome-desktop/debian/control.in Mon Nov 17 20:44:03 2008
@@ -7,8 +7,8 @@
XS-Python-Version: >= 2.4
Build-Depends: debhelper (>= 5),
libglib2.0-dev (>= 2.15.4),
- intltool (>= 0.35.0),
- libgnomeui-dev (>= 2.14.1-1),
+ intltool (>= 0.40.0),
+ libgnomeui-dev (>= 2.14.1-1~),
scrollkeeper,
cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
@@ -16,6 +16,7 @@
docbook-xml,
gnome-doc-utils (>= 0.3.2),
libx11-dev,
+ libxrandr-dev (>= 1.2),
libgtk2.0-dev (>= 2.11.3),
libstartup-notification0-dev (>= 0.5),
libxml2-dev (>= 2.4.20),
@@ -55,12 +56,11 @@
This package includes some files that are shared between several GNOME 2
apps (Pixmaps, .desktop files and internationalization files).
-Package: libgnome-desktop-2
+Package: libgnome-desktop-2-7
Section: libs
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Replaces: libpanel-applet2 (<= 1.5.4-1)
Description: Utility library for loading .desktop files - runtime files
This library is used by GNOME 2 to load the .desktop files.
@@ -68,8 +68,9 @@
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libgnome-desktop-2 (= ${binary:Version}),
+ libgnome-desktop-2-7 (= ${binary:Version}),
libgnomeui-dev (>= 2.14.1-1),
+ libgtk2.0-dev (>= 2.11.3),
libstartup-notification0-dev (>= 0.5)
Replaces: libpanel-applet2-dev (<= 1.5.4-1)
Description: Utility library for loading .desktop files - development files
Propchange: desktop/experimental/gnome-desktop/debian/libgnome-desktop-2-7.install
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: desktop/experimental/gnome-desktop/debian/libgnome-desktop-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop/debian/libgnome-desktop-dev.install?rev=17632&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/libgnome-desktop-dev.install (original)
+++ desktop/experimental/gnome-desktop/debian/libgnome-desktop-dev.install Mon Nov 17 20:44:03 2008
@@ -2,3 +2,4 @@
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/lib/libgnome-desktop-2.a
debian/tmp/usr/lib/libgnome-desktop-2.so
+debian/tmp/usr/share/gtk-doc
Modified: desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch?rev=17632&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch Mon Nov 17 20:44:03 2008
@@ -27,6 +27,6 @@
+ fi
+ continue
+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/experimental/gnome-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop/debian/rules?rev=17632&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/rules (original)
+++ desktop/experimental/gnome-desktop/debian/rules Mon Nov 17 20:44:03 2008
@@ -6,8 +6,6 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-DEB_DH_MAKESHLIBS_ARGS_libgnome-desktop-2 += -V 'libgnome-desktop-2 (>= 2.22.0)'
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
More information about the pkg-gnome-commits
mailing list