[gnome-desktop] Remove gnome-about
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] Remove gnome-about
- Date: Sat, 27 Nov 2010 02:14:48 +0000 (UTC)
commit af40f93ebf8eab71794f02797b87f2e9144c5cc3
Author: William Jon McCann <jmccann redhat com>
Date: Fri Nov 26 21:01:18 2010 -0500
Remove gnome-about
The System Information panel in the System Settings will provide
similar functionality.
Makefile.am | 14 +-
configure.ac | 48 +-
gnome-about/ChangeLog.pre-git | 1269 -------------------------
gnome-about/Makefile.am | 36 -
gnome-about/contributors.list | 557 -----------
gnome-about/gnome-64.png | Bin 4385 -> 0 bytes
gnome-about/gnome-about.desktop.in.in | 15 -
gnome-about/gnome-about.in | 1045 --------------------
gnome-about/headers/Makefile.am | 15 -
gnome-about/headers/header-bg-ancient01a.png | Bin 14085 -> 0 bytes
gnome-about/headers/header-bg-city01.png | Bin 11179 -> 0 bytes
gnome-about/headers/header-bg-clouds01.png | Bin 15767 -> 0 bytes
gnome-about/headers/header-bg-clouds02.png | Bin 10460 -> 0 bytes
gnome-about/headers/header-bg-hills01.png | Bin 18907 -> 0 bytes
gnome-about/headers/header-bg-landscape01.png | Bin 14119 -> 0 bytes
gnome-about/headers/header-bg-mountains01.png | Bin 12371 -> 0 bytes
gnome-about/headers/header-bg-snow01.png | Bin 20281 -> 0 bytes
gnome-about/headers/header-bg-sunset01.png | Bin 13348 -> 0 bytes
gnome-version.xml.in.in | 30 -
man/Makefile.am | 9 -
man/gnome-about.1 | 24 -
po/POTFILES.in | 3 -
po/POTFILES.skip | 2 -
23 files changed, 2 insertions(+), 3065 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7f1de39..c804999 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,5 @@
-SUBDIRS = libgnome-desktop man docs po
+SUBDIRS = libgnome-desktop docs po
-if GNOME_ABOUT_ENABLED
-SUBDIRS += gnome-about
-endif
if DESKTOP_DOCS_ENABLED
SUBDIRS += desktop-docs
endif
@@ -11,11 +8,6 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
-if GNOME_ABOUT_ENABLED
-versiondir = $(datadir)/gnome-about
-version_DATA = gnome-version.xml
-endif
-
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
@@ -23,12 +15,8 @@ EXTRA_DIST = \
HACKING \
MAINTAINERS \
ChangeLog.pre-git \
- gnome-version.xml.in.in \
gnome-doc-utils.make
-CLEANFILES = \
- $(version_DATA)
-
DISTCLEANFILES = \
gnome-doc-utils.make
diff --git a/configure.ac b/configure.ac
index 17e8d3f..ca978d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,38 +44,6 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
-GNOME_PLATFORM=gnome_platform
-GNOME_MINOR=gnome_minor
-GNOME_MICRO=gnome_micro
-GNOME_DISTRIBUTOR="GNOME.Org"
-GNOME_DATE=`date +"%Y-%m-%d"`
-
-AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor])
-
-if test "x$with_gnome_distributor" != x ; then
- GNOME_DISTRIBUTOR=$with_gnome_distributor
-fi
-
-AC_ARG_ENABLE([date-in-gnome-version],
- [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
- [],[enable_date_in_gnome_version=yes])
-if test "$enable_date_in_gnome_version" = "no"; then
- GNOME_DATE=
- GNOME_DATE_COMMENT_START="<!--"
- GNOME_DATE_COMMENT_END="-->"
-else
- GNOME_DATE_COMMENT_START=
- GNOME_DATE_COMMENT_END=
-fi
-
-AC_SUBST(GNOME_PLATFORM)
-AC_SUBST(GNOME_MINOR)
-AC_SUBST(GNOME_MICRO)
-AC_SUBST(GNOME_DISTRIBUTOR)
-AC_SUBST(GNOME_DATE)
-AC_SUBST(GNOME_DATE_COMMENT_START)
-AC_SUBST(GNOME_DATE_COMMENT_END)
-
GNOME_COMMON_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
@@ -91,12 +59,8 @@ if test "x$enable_deprecation_flags" = "xyes"; then
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
-# Should we build gnome-about or the shared desktop docs? Useful for people who
+# Should we build shared desktop docs? Useful for people who
# need to build two gnome-desktop using two different versions of GTK+
-AC_ARG_ENABLE([gnome-about],
- [AS_HELP_STRING([--disable-gnome-about],[don't build gnome-about])],
- [],[enable_gnome_about=yes])
-AM_CONDITIONAL(GNOME_ABOUT_ENABLED, test "x$enable_gnome_about" = "xyes")
AC_ARG_ENABLE([desktop-docs],
[AS_HELP_STRING([--disable-desktop-docs],[don't build desktop-wide help documents])],
[],[enable_desktop_docs=yes])
@@ -188,9 +152,6 @@ dnl pkg-config dependency checks
PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE gsettings-desktop-schemas)
-dnl for gnome-about
-AM_PATH_PYTHON
-
dnl gnome-doc-utils stuff
GNOME_DOC_INIT
@@ -226,22 +187,17 @@ GTK_DOC_CHECK([1.4])
AC_CONFIG_FILES([
Makefile
-gnome-about/Makefile
-gnome-about/gnome-about.desktop.in
-gnome-about/headers/Makefile
libgnome-desktop/Makefile
libgnome-desktop/gnome-desktop-3.0.pc
libgnome-desktop/gnome-desktop-3.0-uninstalled.pc
docs/Makefile
docs/reference/Makefile
docs/reference/gnome-desktop3/Makefile
-gnome-version.xml.in
po/Makefile.in
desktop-docs/Makefile
desktop-docs/fdl/Makefile
desktop-docs/gpl/Makefile
desktop-docs/lgpl/Makefile
-man/Makefile
])
AC_OUTPUT
@@ -269,9 +225,7 @@ echo "
Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags}
GNOME Distributor: ${GNOME_DISTRIBUTOR}
- Build gnome-about: ${enable_gnome_about}
Build desktop-wide docs: ${enable_desktop_docs}
- Date in gnome-version.xml: ${enable_date_in_gnome_version}
Use external pnp.ids: ${EXTERNAL_PNP_IDS}
Startup notification support: ${have_startup_notification}
XRandr support: ${have_randr}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7da0e73..d725882 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,5 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-gnome-about/gnome-about.desktop.in.in
-gnome-about/gnome-about.in
-gnome-version.xml.in.in
# When adding a file here, make sure that the entry point in the API of this
# file calls _gnome_desktop_init_i18n ()
libgnome-desktop/display-name.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0eaf659..46ff19e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,3 @@
# List of source files containing translatable strings that should not be
# translated.
# Please keep this file sorted alphabetically.
-gnome-about/gnome-about.desktop.in
-gnome-version.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]