r21757 - in /desktop/unstable/gnome-system-tools/debian: changelog pixmaps/boot.xpm pixmaps/disks.xpm rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Oct  3 12:47:53 2009
New Revision: 21757

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21757
Log:
* debian/pixmaps/boot.xpm,
  debian/pixmaps/disks.xpm,
  debian/rules:
  - boot-admin and disks-admin are gone for good, remove related stuff.

Removed:
    desktop/unstable/gnome-system-tools/debian/pixmaps/boot.xpm
    desktop/unstable/gnome-system-tools/debian/pixmaps/disks.xpm
Modified:
    desktop/unstable/gnome-system-tools/debian/changelog
    desktop/unstable/gnome-system-tools/debian/rules

Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=21757&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog [utf-8] Sat Oct  3 12:47:53 2009
@@ -25,6 +25,10 @@
   * 02_dont_check_for_nautilus_when_not_building_it.patch,
     40_more-groups.patch:
     - Add headers.
+  * debian/pixmaps/boot.xpm,
+    debian/pixmaps/disks.xpm,
+    debian/rules:
+    - boot-admin and disks-admin are gone for good, remove related stuff.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 01 Oct 2009 15:31:46 +0200
 

Modified: desktop/unstable/gnome-system-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/rules?rev=21757&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/rules [utf-8] Sat Oct  3 12:47:53 2009
@@ -9,7 +9,6 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-schemas-install \
-	--enable-disks \
 	--disable-nautilus \
 	--disable-scrollkeeper
 
@@ -17,10 +16,3 @@
 
 binary-install/gnome-system-tools::
 	rm -rfv debian/gnome-system-tools/var/scrollkeeper
-	# boot-admin is disabled (see #309932), also remove some associated files
-	$(RM) -rfv debian/gnome-system-tools/usr/share/omf/boot-admin
-	$(RM) -rfv debian/gnome-system-tools/usr/share/gnome/help/boot-admin
-	$(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/interfaces/boot.glade
-	$(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.png
-	$(RM) -rfv debian/gnome-system-tools/usr/share/gnome-system-tools/pixmaps/boot.xpm
-