r25369 - in /desktop/experimental/gnome-desktop3: ./ debian/ debian/patches/
seb128 at users.alioth.debian.org
seb128 at users.alioth.debian.org
Thu Oct 14 12:26:05 UTC 2010
Author: seb128
Date: Thu Oct 14 12:25:57 2010
New Revision: 25369
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25369
Log:
* New upstream version
* Rename the source for the GNOME3 version since they are abi incompatible
* debian/control.in:
- clean some old conflicts and replaces
- don't build the gnome-about binary from this version
- updated for the source and binaries renaming
- updated the build-depends and depends
* Updated the .install for the new version
* debian/patches/99_ltmain_as-needed.patch:
- refreshed
* debian/rules:
- updated to the new library name
- use quilt as a patch system
- use --disable-gnome-about --disable-desktop-docs to avoid conflicting
with the gtk2 version
Added:
desktop/experimental/gnome-desktop3/
- copied from r25368, desktop/unstable/gnome-desktop/
desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install
- copied, changed from r25368, desktop/unstable/gnome-desktop/debian/gnome-desktop-data.install
desktop/experimental/gnome-desktop3/debian/libgnome-desktop-3-0.install
- copied unchanged from r25368, desktop/unstable/gnome-desktop/debian/libgnome-desktop-2-17.install
desktop/experimental/gnome-desktop3/debian/libgnome-desktop-3-dev.install
- copied, changed from r25368, desktop/unstable/gnome-desktop/debian/libgnome-desktop-dev.install
Removed:
desktop/experimental/gnome-desktop3/debian/gnome-desktop-data.install
desktop/experimental/gnome-desktop3/debian/libgnome-desktop-2-17.install
desktop/experimental/gnome-desktop3/debian/libgnome-desktop-dev.install
Modified:
desktop/experimental/gnome-desktop3/debian/changelog
desktop/experimental/gnome-desktop3/debian/control
desktop/experimental/gnome-desktop3/debian/control.in
desktop/experimental/gnome-desktop3/debian/patches/99_ltmain_as-needed.patch
desktop/experimental/gnome-desktop3/debian/rules
desktop/experimental/gnome-desktop3/debian/watch
Modified: desktop/experimental/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/changelog?rev=25369&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/changelog [utf-8] Thu Oct 14 12:25:57 2010
@@ -1,3 +1,23 @@
+gnome-desktop3 (2.91.0-1) UNRELEASED; urgency=low
+
+ * New upstream version
+ * Rename the source for the GNOME3 version since they are abi incompatible
+ * debian/control.in:
+ - clean some old conflicts and replaces
+ - don't build the gnome-about binary from this version
+ - updated for the source and binaries renaming
+ - updated the build-depends and depends
+ * Updated the .install for the new version
+ * debian/patches/99_ltmain_as-needed.patch:
+ - refreshed
+ * debian/rules:
+ - updated to the new library name
+ - use quilt as a patch system
+ - use --disable-gnome-about --disable-desktop-docs to avoid conflicting
+ with the gtk2 version
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Thu, 14 Oct 2010 10:44:10 +0200
+
gnome-desktop (2.30.2-1) unstable; urgency=low
* New upstream stable release.
Modified: desktop/experimental/gnome-desktop3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/control?rev=25369&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/control [utf-8] Thu Oct 14 12:25:57 2010
@@ -3,16 +3,17 @@
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-Source: gnome-desktop
+Source: gnome-desktop3
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-desktop
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-desktop
-Standards-Version: 3.9.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-desktop3
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gnome-desktop3
+Standards-Version: 3.9.1
XS-Python-Version: >= 2.4
Build-Depends: debhelper (>= 5),
+ quilt,
libglib2.0-dev (>= 2.19.1),
intltool (>= 0.40.0),
scrollkeeper,
@@ -23,7 +24,8 @@
gnome-doc-utils (>= 0.3.2),
libx11-dev,
libxrandr-dev (>= 1.2),
- libgtk2.0-dev (>= 2.18.0),
+ libgdk-pixbuf2.0-dev (>= 2.21.3),
+ libgtk3.0-dev (>= 2.90.2),
libstartup-notification0-dev (>= 0.5),
libxml2-dev (>= 2.4.20),
libgconf2-dev (>= 2.0.0),
@@ -32,27 +34,26 @@
libglib2.0-doc,
libgtk2.0-doc
-Package: gnome-about
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends},
- python-gtk2,
- python-gobject,
- python-gnome2,
- python-cairo,
- gnome-desktop-data (= ${source:Version})
-Description: The GNOME about box
- Informative little about thing that lets us brag to our friends as our name
- scrolls by, and lets users click to load the GNOME home pages.
+#Package: gnome-about
+#Architecture: all
+#Depends: ${misc:Depends},
+# ${python:Depends},
+# python-gtk2,
+# python-gobject,
+# python-cairo,
+# gnome-desktop-data (= ${source:Version})
+#Description: The GNOME about box
+# Informative little about thing that lets us brag to our friends as our name
+# scrolls by, and lets users click to load the GNOME home pages.
-Package: gnome-desktop-data
+Package: gnome-desktop3-data
Architecture: all
Depends: ${misc:Depends}
Description: Common files for GNOME desktop apps
This package includes some files that are shared between several GNOME
apps (Pixmaps, .desktop files and internationalization files).
-Package: libgnome-desktop-2-17
+Package: libgnome-desktop-3-0
Section: libs
Architecture: any
Depends: ${misc:Depends},
@@ -61,14 +62,13 @@
Description: Utility library for loading .desktop files - runtime files
This library is used by GNOME to load the .desktop files.
-Package: libgnome-desktop-dev
+Package: libgnome-desktop-3-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libgnome-desktop-2-17 (= ${binary:Version}),
- libgtk2.0-dev (>= 2.14.0),
+ libgnome-desktop-3-0 (= ${binary:Version}),
+ libgtk3.0-dev (>= 2.90.2),
libstartup-notification0-dev (>= 0.5)
-Replaces: libpanel-applet2-dev (<= 1.5.4-1)
Description: Utility library for loading .desktop files - development files
This package provides the include files and static library for the GNOME
desktop library functions.
Modified: desktop/experimental/gnome-desktop3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/control.in?rev=25369&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/control.in [utf-8] Thu Oct 14 12:25:57 2010
@@ -1,13 +1,14 @@
-Source: gnome-desktop
+Source: gnome-desktop3
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-desktop
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-desktop
-Standards-Version: 3.9.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-desktop3
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gnome-desktop3
+Standards-Version: 3.9.1
XS-Python-Version: >= 2.4
Build-Depends: debhelper (>= 5),
+ quilt,
libglib2.0-dev (>= 2.19.1),
intltool (>= 0.40.0),
scrollkeeper,
@@ -18,7 +19,8 @@
gnome-doc-utils (>= 0.3.2),
libx11-dev,
libxrandr-dev (>= 1.2),
- libgtk2.0-dev (>= 2.18.0),
+ libgdk-pixbuf2.0-dev (>= 2.21.3),
+ libgtk3.0-dev (>= 2.90.2),
libstartup-notification0-dev (>= 0.5),
libxml2-dev (>= 2.4.20),
libgconf2-dev (>= 2.0.0),
@@ -27,27 +29,26 @@
libglib2.0-doc,
libgtk2.0-doc
-Package: gnome-about
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends},
- python-gtk2,
- python-gobject,
- python-gnome2,
- python-cairo,
- gnome-desktop-data (= ${source:Version})
-Description: The GNOME about box
- Informative little about thing that lets us brag to our friends as our name
- scrolls by, and lets users click to load the GNOME home pages.
+#Package: gnome-about
+#Architecture: all
+#Depends: ${misc:Depends},
+# ${python:Depends},
+# python-gtk2,
+# python-gobject,
+# python-cairo,
+# gnome-desktop-data (= ${source:Version})
+#Description: The GNOME about box
+# Informative little about thing that lets us brag to our friends as our name
+# scrolls by, and lets users click to load the GNOME home pages.
-Package: gnome-desktop-data
+Package: gnome-desktop3-data
Architecture: all
Depends: ${misc:Depends}
Description: Common files for GNOME desktop apps
This package includes some files that are shared between several GNOME
apps (Pixmaps, .desktop files and internationalization files).
-Package: libgnome-desktop-2-17
+Package: libgnome-desktop-3-0
Section: libs
Architecture: any
Depends: ${misc:Depends},
@@ -56,14 +57,13 @@
Description: Utility library for loading .desktop files - runtime files
This library is used by GNOME to load the .desktop files.
-Package: libgnome-desktop-dev
+Package: libgnome-desktop-3-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libgnome-desktop-2-17 (= ${binary:Version}),
- libgtk2.0-dev (>= 2.14.0),
+ libgnome-desktop-3-0 (= ${binary:Version}),
+ libgtk3.0-dev (>= 2.90.2),
libstartup-notification0-dev (>= 0.5)
-Replaces: libpanel-applet2-dev (<= 1.5.4-1)
Description: Utility library for loading .desktop files - development files
This package provides the include files and static library for the GNOME
desktop library functions.
Copied: desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install (from r25368, desktop/unstable/gnome-desktop/debian/gnome-desktop-data.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install?rev=25369&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/gnome-desktop-data.install [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install [utf-8] Thu Oct 14 12:25:57 2010
@@ -1,5 +1,2 @@
-debian/tmp/usr/share/pixmaps
debian/tmp/usr/share/locale
-debian/tmp/usr/share/gnome
-debian/tmp/usr/share/gnome-about/*.xml
-debian/tmp/usr/share/omf
+
Copied: desktop/experimental/gnome-desktop3/debian/libgnome-desktop-3-dev.install (from r25368, desktop/unstable/gnome-desktop/debian/libgnome-desktop-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/libgnome-desktop-3-dev.install?rev=25369&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/libgnome-desktop-dev.install [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/libgnome-desktop-3-dev.install [utf-8] Thu Oct 14 12:25:57 2010
@@ -1,5 +1,5 @@
debian/tmp/usr/include
debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/libgnome-desktop-2.a
-debian/tmp/usr/lib/libgnome-desktop-2.so
+debian/tmp/usr/lib/libgnome-desktop-3.a
+debian/tmp/usr/lib/libgnome-desktop-3.so
debian/tmp/usr/share/gtk-doc
Modified: desktop/experimental/gnome-desktop3/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/patches/99_ltmain_as-needed.patch?rev=25369&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/patches/99_ltmain_as-needed.patch [utf-8] Thu Oct 14 12:25:57 2010
@@ -1,7 +1,7 @@
-Index: b/ltmain.sh
+Index: gnome-desktop3-2.91.0/ltmain.sh
===================================================================
---- a/ltmain.sh 2010-06-22 03:42:15.000000000 +0200
-+++ b/ltmain.sh 2010-07-17 04:32:56.584418726 +0200
+--- gnome-desktop3-2.91.0.orig/ltmain.sh 2010-10-04 23:28:15.000000000 +0200
++++ gnome-desktop3-2.91.0/ltmain.sh 2010-10-14 11:30:55.327642888 +0200
@@ -4716,6 +4716,11 @@
arg=$func_stripname_result
;;
Modified: desktop/experimental/gnome-desktop3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/rules?rev=25369&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/rules [utf-8] Thu Oct 14 12:25:57 2010
@@ -6,13 +6,16 @@
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-3-0 += -V 'libgnome-desktop-3-0 (>= 2.91.0)'
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS += \
--with-gnome-distributor=Debian \
--with-pnp-ids-path=/usr/share/hwdata/pnp.ids \
--disable-scrollkeeper \
- --disable-gtk-doc
+ --disable-gtk-doc \
+ --disable-gnome-about \
+ --disable-desktop-docs
-binary-install/gnome-about::
- dh_pysupport -pgnome-about
+#binary-install/gnome-about::
+# dh_pysupport -pgnome-about
Modified: desktop/experimental/gnome-desktop3/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/watch?rev=25369&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/watch [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/watch [utf-8] Thu Oct 14 12:25:57 2010
@@ -1,3 +1,3 @@
version=2
-http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/([\d\.]+)[02468]/ \
+http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/([\d\.]+[024689])/ \
gnome-desktop-(.*)\.tar\.gz
More information about the pkg-gnome-commits
mailing list