r9560 - in /desktop/experimental/control-center/debian:
capplets-data.install changelog control libslab-dev.install
libslab0.install rules
giskard at users.alioth.debian.org
giskard at users.alioth.debian.org
Sat Apr 7 13:38:44 UTC 2007
Author: giskard
Date: Sat Apr 7 13:38:43 2007
New Revision: 9560
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9560
Log:
* Added 07_default_keys.patch (patch taken from the ubuntu package)
* Added 91_from_svn_fix_gstreamer_warning.patch:
patch from SVN, "Initialise threads early, and fix option context
translation". (patch taken from the ubuntu package)
Removed:
desktop/experimental/control-center/debian/libslab-dev.install
desktop/experimental/control-center/debian/libslab0.install
Modified:
desktop/experimental/control-center/debian/capplets-data.install
desktop/experimental/control-center/debian/changelog
desktop/experimental/control-center/debian/control
desktop/experimental/control-center/debian/rules
Modified: desktop/experimental/control-center/debian/capplets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/capplets-data.install?rev=9560&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/capplets-data.install (original)
+++ desktop/experimental/control-center/debian/capplets-data.install Sat Apr 7 13:38:43 2007
@@ -3,11 +3,11 @@
debian/tmp/usr/share/control-center/glade
debian/tmp/usr/share/control-center/icons
debian/tmp/usr/share/control-center/pixmaps/
+debian/tmp/usr/share/control-center/gnome-default-applications.xml
debian/tmp/usr/share/icons/hicolor
debian/tmp/usr/share/pixmaps/*.png
debian/tmp/usr/share/locale
debian/tmp/usr/share/mime/packages
-debian/tmp/usr/share/mime/application
debian/tmp/usr/share/gnome
debian/tmp/etc/gnome-vfs-2.0/modules
debian/tmp/etc/gconf/schemas
Modified: desktop/experimental/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/changelog?rev=9560&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/changelog (original)
+++ desktop/experimental/control-center/debian/changelog Sat Apr 7 13:38:43 2007
@@ -1,4 +1,4 @@
-control-center (1:2.18.0-1) UNRELEASE; urgency=low
+control-center (1:2.18.0-1) UNRELEASED; urgency=low
[ Marco Cabizza ]
* New upstream release:
@@ -24,8 +24,12 @@
* Updated 04_path_xtra.patch, 02_xrdb.patch
* Added 05_autotools.patch
* Dropped 30_pulseaudio.patch, merged upstream.
-
- -- Marco Cabizza <marco87 at gmail.com> Sun, 18 Mar 2007 12:34:20 +0100
+ * Added 07_default_keys.patch (patch taken from the ubuntu package)
+ * Added 91_from_svn_fix_gstreamer_warning.patch:
+ patch from SVN, "Initialise threads early, and fix option context
+ translation". (patch taken from the ubuntu package)
+
+ -- Riccardo Setti <giskard at debian.org> Sat, 07 Apr 2007 15:11:34 +0200
control-center (1:2.16.3-1) experimental; urgency=low
Modified: desktop/experimental/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control?rev=9560&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control (original)
+++ desktop/experimental/control-center/debian/control Sat Apr 7 13:38:43 2007
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Marco Cabizza <marco87 at gmail.com>
-Uploaders: Marc Dequènes (Duck) <Duck at DuckCorp.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Marc Dequènes (Duck) <Duck at DuckCorp.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
Standards-Version: 3.7.2
Build-Depends: cdbs, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10), libgnomeui-dev (>= 2.16.0-2), intltool, libglade2-dev (>= 2.4.0-1), libgnome-desktop-dev (>= 2.7.92-1), zlib1g-dev, flex,liborbit2-dev (>= 2.10.2-1.1), libmetacity-dev (>= 1:2.8.1-3), libxcursor-dev, libbonobo2-dev (>= 2.6.2-6), libnautilus-extension-dev, libxklavier11-dev (>= 2.91), libxrandr-dev, docbook-to-man, libgstreamer0.10-dev (>= 0.10.1.2), libgstreamer-plugins-base0.10-dev (>= 0.10.1.2), autotools-dev, type-handling (>= 0.2.8), libasound2-dev (>= 1.0.3b-1) | not+linux-gnu, libxss-dev, libxinerama-dev, libxft-dev (>= 2.1.2), libxxf86misc-dev, libxkbfile-dev, libebook1.2-dev (>= 1.7.90), desktop-file-utils, gnome-doc-utils (>= 0.3.2), libgnome-menu-dev (>= 2.12.0), libx11-dev, libxrender-dev, libgconf2-dev, libbonoboui2-dev, libesd0-dev, libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxt-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32), librsvg2-dev, libpanel-applet2-dev, libgnomekbd-dev, shared-mime-info, libslab-dev
Modified: desktop/experimental/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/rules?rev=9560&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/rules (original)
+++ desktop/experimental/control-center/debian/rules Sat Apr 7 13:38:43 2007
@@ -12,12 +12,13 @@
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_BUILDDIR = $(CURDIR)/debian/build
+#DEB_BUILDDIR = $(CURDIR)/debian/build
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
DEB_CONFIGURE_EXTRA_FLAGS += --disable-mime-cache \
--disable-scrollkeeper \
--enable-aboutme \
- --enable-gstreamer=0.10
+ --enable-gstreamer=0.10 \
+ --disable-update-mimedb
DEB_CONFIGURE_LOCALSTATEDIR := /var/lib
@@ -36,4 +37,4 @@
clean::
rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
- rm -rf $(DEB_BUILDDIR)
+# rm -rf $(DEB_BUILDDIR)
More information about the pkg-gnome-commits
mailing list