[25662] in Source-Commits
/svn/athena r25151 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jun 20 23:15:56 2011
Date: Mon, 20 Jun 2011 23:15:50 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106210315.p5L3Fogw032761@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-20 23:15:50 -0400 (Mon, 20 Jun 2011)
New Revision: 25151
Modified:
trunk/debathena/config/gdm-config/debian/debathena-branding.glade
trunk/debathena/config/gdm-config/debian/rules
Log:
Move the dh_install to the right place (that is, new-gdm)
Modified: trunk/debathena/config/gdm-config/debian/debathena-branding.glade
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-branding.glade 2011-06-20 18:55:29 UTC (rev 25150)
+++ trunk/debathena/config/gdm-config/debian/debathena-branding.glade 2011-06-21 03:15:50 UTC (rev 25151)
@@ -1,108 +1,62 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
<glade-interface>
-
-<widget class="GtkWindow" id="winWelcome">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">False</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="imgDebathena">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span font_desc="Trebuchet MS Bold 20">Welcome to Athena</span></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="winBranding">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">False</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkLabel" id="lblBranding">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><workstation information></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- </child>
-</widget>
-
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <widget class="GtkWindow" id="winWelcome">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="accept_focus">False</property>
+ <property name="focus_on_map">False</property>
+ <property name="decorated">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="imgDebathena">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes"><span font_desc="Trebuchet MS Bold 20">Welcome to Athena</span></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkWindow" id="winBranding">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="resizable">False</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="accept_focus">False</property>
+ <property name="focus_on_map">False</property>
+ <property name="decorated">False</property>
+ <child>
+ <widget class="GtkLabel" id="lblBranding">
+ <property name="visible">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes"><workstation information></property>
+ <property name="justify">center</property>
+ </widget>
+ </child>
+ </widget>
</glade-interface>
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2011-06-20 18:55:29 UTC (rev 25150)
+++ trunk/debathena/config/gdm-config/debian/rules 2011-06-21 03:15:50 UTC (rev 25151)
@@ -36,11 +36,11 @@
ifneq ($(NEW_GDM),y)
install/debathena-gdm-config::
dh_install debian/default.desktop.debathena usr/share/gdm/BuiltInSessions
- dh_install debian/athena.desktop usr/share/xsessions
else
install/debathena-gdm-config::
dh_install debian/background.jpg usr/share/debathena-gdm-config
dh_install debian/%gconf-tree.xml var/lib/gdm/.gconf.debathena-gdm-config
+ dh_install debian/athena.desktop usr/share/xsessions
install -m 660 debian/gconf.path.debathena debian/$(cdbs_curpkg)/var/lib/gdm/.gconf.path.debathena
dh_install debian/debathena-branding usr/lib/debathena-branding
