← Back to branch summary

~muktupavels/gnome-panel/fix-for-lp-1310929-and-lp-1222339

« back to all changes in this revision

Viewing changes to debian/patches/00-Add-the-GNOME-Flashback-session.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-19 11:49:35 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20130619114935-e912mx6nwxecoaib
Tags: 1:3.6.2-0ubuntu7
https://launchpad.net/bugs/1185873
* Sync with Debian svn (LP: #1185873). Remaining changes:
  - Use epoch
  - Add apport hook
  - debian/control:
    + Recommend indicator-complete
    + Don't depend on nautilus 3.8 yet
  - debian/patches/14_revert_timedate_change.patch:
    + Dropped, we're using timedated
  - debian/patches/40_unset_menuproxy.patch:
    + Make sure gnome-panel and the applets don't pick up menu proxies.
  - debian/patches/41_classic_layout.patch:
    + Change the defaults to be more "classic Ubuntu": Show indicators
      & show desktop, drop GNOME clock & notification area
  - debian/patches/85_disable_shutdown_on_ltsp.patch:
    + Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/50_ubuntu_sessions.patch:
  - Merge patch from gnome-session to split sessions into GNOME Flashback
    (No effects) using Metacity and GNOME Flashback using Compiz
* debian/patches/51_dont_require_nautilus38.patch:
  - Run Flashback without Nautilus 3.8 since it's not in Saucy yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00-Add-the-GNOME-Flashback-session.patch
 
1
From fcc9e21a70d390c3824559132a83a61461bcb88a Mon Sep 17 00:00:00 2001
 
2
From: Jeremy Bicha <jbicha@ubuntu.com>
 
3
Date: Sun, 24 Feb 2013 22:22:29 +0000
 
4
Subject: Add the GNOME Flashback session
 
5
 
 
6
This was removed from gnome-session 3.7.4 so let's it add it back here
 
7
(under new name)
 
8
 
 
9
https://bugzilla.gnome.org/show_bug.cgi?id=694625
 
10
---
 
11
diff --git a/data/Makefile.am b/data/Makefile.am
 
12
index 83f82e2..84e1954 100644
 
13
--- a/data/Makefile.am
 
14
+++ b/data/Makefile.am
 
15
@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
16
 
 
17
 @GSETTINGS_RULES@
 
18
 
 
19
+sessiondir = $(datadir)/gnome-session/sessions
 
20
+session_in_files = gnome-flashback.session.desktop.in
 
21
+session_DATA = $(session_in_files:.session.desktop.in=.session)
 
22
+
 
23
+xsessiondir = $(datadir)/xsessions
 
24
+xsession_in_files = gnome-flashback.desktop.in
 
25
+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
26
+
 
27
+%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
28
+
 
29
+@INTLTOOL_DESKTOP_RULE@
 
30
+
 
31
 default_layoutdir   = $(datadir)/gnome-panel
 
32
 default_layout_DATA = panel-default-layout.layout
 
33
 
 
34
 EXTRA_DIST =                           \
 
35
        $(gsettings_schemas_in_in)      \
 
36
+       $(session_in_files)             \
 
37
+       $(xsession_in_files)            \
 
38
        $(default_layout_DATA)
 
39
 
 
40
 CLEANFILES =                   \
 
41
        $(gsettings__enum_file) \
 
42
        $(gsettings_SCHEMAS_in) \
 
43
        $(gsettings_SCHEMAS)    \
 
44
-       *.gschema.valid
 
45
+       *.gschema.valid         \
 
46
+       $(session_DATA)         \
 
47
+       $(xsession_DATA)
 
48
 
 
49
 -include $(top_srcdir)/git.mk
 
50
diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in
 
51
new file mode 100644
 
52
index 0000000..4856f75
 
53
--- /dev/null
 
54
+++ b/data/gnome-flashback.desktop.in
 
55
@@ -0,0 +1,7 @@
 
56
+[Desktop Entry]
 
57
+_Name=GNOME Flashback
 
58
+_Comment=This session logs you into GNOME with the traditional panel
 
59
+Exec=gnome-session --session=gnome-flashback
 
60
+TryExec=gnome-session
 
61
+Icon=
 
62
+Type=Application
 
63
diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in
 
64
new file mode 100644
 
65
index 0000000..c012c58
 
66
--- /dev/null
 
67
+++ b/data/gnome-flashback.session.desktop.in
 
68
@@ -0,0 +1,3 @@
 
69
+[GNOME Session]
 
70
+_Name=GNOME Flashback
 
71
+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;
 
72
diff --git a/po/POTFILES.in b/po/POTFILES.in
 
73
index bc65c4c..a6aa6c7 100644
 
74
--- a/po/POTFILES.in
 
75
+++ b/po/POTFILES.in
 
76
@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c
 
77
 applets/wncklet/wncklet.c
 
78
 applets/wncklet/workspace-switcher.c
 
79
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
 
80
+data/gnome-flashback.desktop.in
 
81
+data/gnome-flashback.session.desktop.in
 
82
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
 
83
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
 
84
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
 
85