r26321 - /desktop/experimental/gnome-control-center/debian/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Jan 16 16:38:55 UTC 2011
Author: pochu
Date: Sun Jan 16 16:38:46 2011
New Revision: 26321
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26321
Log:
- Build depend on docbook-xml, needed to build the docs.
* debian/control.in,
debian/{capplets,gnome-control-center}-data.*,
debian/rules:
- Rename capplets-data to gnome-control-center-data.
Added:
desktop/experimental/gnome-control-center/debian/gnome-control-center-data.gconf-defaults
- copied unchanged from r26306, desktop/experimental/gnome-control-center/debian/capplets-data.gconf-defaults
desktop/experimental/gnome-control-center/debian/gnome-control-center-data.install
- copied unchanged from r26306, desktop/experimental/gnome-control-center/debian/capplets-data.install
desktop/experimental/gnome-control-center/debian/gnome-control-center-data.postinst
- copied unchanged from r26306, desktop/experimental/gnome-control-center/debian/capplets-data.postinst
Removed:
desktop/experimental/gnome-control-center/debian/capplets-data.gconf-defaults
desktop/experimental/gnome-control-center/debian/capplets-data.install
desktop/experimental/gnome-control-center/debian/capplets-data.postinst
Modified:
desktop/experimental/gnome-control-center/debian/changelog
desktop/experimental/gnome-control-center/debian/control
desktop/experimental/gnome-control-center/debian/control.in
desktop/experimental/gnome-control-center/debian/rules
Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=26321&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Sun Jan 16 16:38:46 2011
@@ -4,10 +4,15 @@
- Drop gnome-control-center breaks/replaces against gnome-media(-common),
they seem unneeded.
- capplets-data replaces gnome-media-common.
+ - Build depend on docbook-xml, needed to build the docs.
* debian/control.in,
debian/rules,
debian/source/format:
- Switch to source format 3.0 (quilt).
+ * debian/control.in,
+ debian/{capplets,gnome-control-center}-data.*,
+ debian/rules:
+ - Rename capplets-data to gnome-control-center-data.
-- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 15 Jan 2011 15:33:30 +0000
Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=26321&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Sun Jan 16 16:38:46 2011
@@ -15,6 +15,7 @@
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
docbook-to-man,
+ docbook-xml,
autotools-dev,
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.37.1),
@@ -45,8 +46,8 @@
Section: gnome
Depends: ${shlibs:Depends},
${misc:Depends},
- capplets-data (>= ${source:Version}),
- capplets-data (<< ${gnome:NextVersion}),
+ gnome-control-center-data (>= ${source:Version}),
+ gnome-control-center-data (<< ${gnome:NextVersion}),
gnome-settings-daemon (>= 2.91),
gnome-menus (>= 2.12.0),
gnome-desktop-data,
@@ -79,12 +80,14 @@
Description: utilities to configure the GNOME desktop
This package contains the file required to get the keydirs location
-Package: capplets-data
+Package: gnome-control-center-data
Architecture: all
Section: gnome
Depends: ${misc:Depends}
Recommends: gnome-control-center (>= ${source:Version})
-Replaces: gnome-media-common (<< 2.91)
+Provides: capplets-data
+Conflicts: capplets-data
+Replaces: capplets-data, gnome-media-common (<< 2.91)
Breaks: gnome-control-center (<< ${source:Version})
Description: configuration applets for GNOME - data files
This package contains data files (icons, pixmaps, locales files) needed by
Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=26321&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Sun Jan 16 16:38:46 2011
@@ -10,6 +10,7 @@
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
docbook-to-man,
+ docbook-xml,
autotools-dev,
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.37.1),
@@ -40,8 +41,8 @@
Section: gnome
Depends: ${shlibs:Depends},
${misc:Depends},
- capplets-data (>= ${source:Version}),
- capplets-data (<< ${gnome:NextVersion}),
+ gnome-control-center-data (>= ${source:Version}),
+ gnome-control-center-data (<< ${gnome:NextVersion}),
gnome-settings-daemon (>= 2.91),
gnome-menus (>= 2.12.0),
gnome-desktop-data,
@@ -74,12 +75,14 @@
Description: utilities to configure the GNOME desktop
This package contains the file required to get the keydirs location
-Package: capplets-data
+Package: gnome-control-center-data
Architecture: all
Section: gnome
Depends: ${misc:Depends}
Recommends: gnome-control-center (>= ${source:Version})
-Replaces: gnome-media-common (<< 2.91)
+Provides: capplets-data
+Conflicts: capplets-data
+Replaces: capplets-data, gnome-media-common (<< 2.91)
Breaks: gnome-control-center (<< ${source:Version})
Description: configuration applets for GNOME - data files
This package contains data files (icons, pixmaps, locales files) needed by
Modified: desktop/experimental/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/rules?rev=26321&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/rules [utf-8] Sun Jan 16 16:38:46 2011
@@ -13,8 +13,6 @@
DEB_AUTO_UPDATE_AUTOCONF=1
DEB_AUTO_UPDATE_AUTOHEADER=1
DEB_AUTO_UPDATE_AUTOMAKE=1.11
-
-GNOME_MODULE := gnome-control-center
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
@@ -33,9 +31,4 @@
clean::
rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
-binary-post-install/capplets-data::
- rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache
- rm -rf debian/capplets-data/usr/share/pkgconfig
- dh_installmime -p$(cdbs_curpkg)
-
common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list