Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-05-03 Ghee Teo <[email protected]>
authorgheet
Thu, 03 May 2007 18:37:52 +0000
changeset 9835 4ad5747268ce
parent 9834 f33d66d0a4c1
child 9836 8c953a7b34c8
2007-05-03 Ghee Teo <[email protected]> * patches/printman-01-menu-entry.diff patches/control-center-01-solaris-printmgr.diff: changed the solaris-printmgr.desktop and gnome-print-manager.desktop files to put that in according to UI spec to fix 6547683.
ChangeLog file | annotate | diff | comparison | revisions
patches/control-center-01-solaris-printmgr.diff file | annotate | diff | comparison | revisions
patches/printman-01-menu-entry.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Thu May 03 17:00:15 2007 +0000
+++ b/ChangeLog	Thu May 03 18:37:52 2007 +0000
@@ -1,3 +1,10 @@
+2007-05-03  Ghee Teo <[email protected]>
+
+        * patches/printman-01-menu-entry.diff
+          patches/control-center-01-solaris-printmgr.diff: changed the
+          solaris-printmgr.desktop and gnome-print-manager.desktop files
+          to put that in according to UI spec to fix 6547683.
+
 2007-05-04  Takao Fujiwara  <[email protected]>
 
 	* SUNWmyspell-dictionary-l10n.spec: Updated for typo
--- a/patches/control-center-01-solaris-printmgr.diff	Thu May 03 17:00:15 2007 +0000
+++ b/patches/control-center-01-solaris-printmgr.diff	Thu May 03 18:37:52 2007 +0000
@@ -1,5 +1,6 @@
---- control-center-2.16.1/capplets/Makefile.am-orig6	2006-10-20 14:21:56.533213000 +0100
-+++ control-center-2.16.1/capplets/Makefile.am	2006-10-20 14:23:34.205293000 +0100
+diff -urN -x'*.orig' -x '*~' control-center-2.18.1/capplets/Makefile.am ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/Makefile.am
+--- control-center-2.18.1/capplets/Makefile.am	2007-03-18 17:04:25.000000000 +0000
++++ ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/Makefile.am	2007-05-03 17:49:34.843098000 +0100
 @@ -3,7 +3,7 @@
  	default-applications font			\
  	background keyboard mouse sound			\
@@ -9,8 +10,9 @@
  
  SUBDIRS = $(always_built_SUBDIRS)
  
---- control-center-2.6.1/capplets/solaris-printmgr/Makefile.am.orig	2004-06-23 10:44:19.902010000 -0700
-+++ control-center-2.6.1/capplets/solaris-printmgr/Makefile.am	2004-06-23 10:48:22.398372000 -0700
+diff -urN -x'*.orig' -x '*~' control-center-2.18.1/capplets/solaris-printmgr/Makefile.am ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/solaris-printmgr/Makefile.am
+--- control-center-2.18.1/capplets/solaris-printmgr/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/solaris-printmgr/Makefile.am	2007-05-03 17:49:34.843442000 +0100
 @@ -0,0 +1,12 @@
 +libexec_SCRIPTS = solaris-printmgr-wrapper
 +solaris-printmgr-wrapper: solaris-printmgr-wrapper.sh
@@ -24,8 +26,9 @@
 +
 +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 +EXTRA_DIST = $(Desktop_in_files)
---- control-center-2.6.1/capplets/solaris-printmgr/solaris-printmgr-wrapper.sh.in.orig	2004-06-23 10:48:47.326091000 -0700
-+++ control-center-2.6.1/capplets/solaris-printmgr/solaris-printmgr-wrapper.sh.in	2004-06-23 10:46:44.070510000 -0700
+diff -urN -x'*.orig' -x '*~' control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr-wrapper.sh.in ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr-wrapper.sh.in
+--- control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr-wrapper.sh.in	1970-01-01 01:00:00.000000000 +0100
++++ ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr-wrapper.sh.in	2007-05-03 17:49:34.843681000 +0100
 @@ -0,0 +1,7 @@
 +#!/bin/bash
 +
@@ -34,23 +37,26 @@
 +
 +# SUN_BRANDING
 +gksu -g -t $"Print Manager" /usr/sbin/printmgr
---- control-center-2.6.1/capplets/solaris-printmgr/solaris-printmgr.desktop.in.in.orig	2004-06-23 10:44:19.902763000 -0700
-+++ control-center-2.6.1/capplets/solaris-printmgr/solaris-printmgr.desktop.in.in	2004-06-23 10:48:36.801965000 -0700
-@@ -0,0 +1,11 @@
+diff -urN -x'*.orig' -x '*~' control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr.desktop.in.in ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr.desktop.in.in
+--- control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
++++ ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/capplets/solaris-printmgr/solaris-printmgr.desktop.in.in	2007-05-03 18:00:11.682817000 +0100
+@@ -0,0 +1,12 @@
 +[Desktop Entry]
 +Encoding=UTF-8
 +# SUN_BRANDING
-+_Name=Add/Remove Printer
++_Name=Print Manager
 +# SUN_BRANDING
-+_Comment=Manages printer queues
++_Comment=Add and remove printers and queues
 +Exec=@libexecdir@/solaris-printmgr-wrapper
 +Icon=print-manager
 +Terminal=false
 +Type=Application
-+Categories=Application;Settings;DesktopSettings;
---- control-center-2.6.1/configure.in.orig	2004-06-23 11:12:34.000000000 -0700
-+++ control-center-2.6.1/configure.in	2004-06-23 11:21:35.709873000 -0700
-@@ -531,6 +531,9 @@
++StartupNotify=true
++Categories=Application;System;Settings
+diff -urN -x'*.orig' -x '*~' control-center-2.18.1/configure.in ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/configure.in
+--- control-center-2.18.1/configure.in	2007-05-03 17:56:09.849674000 +0100
++++ ../SUNWgnome-desktop-prefs-2.18.0.hacked/control-center-2.18.1/configure.in	2007-05-03 17:49:34.855469000 +0100
+@@ -604,6 +604,9 @@
  capplets/windows/Makefile
  capplets/about-me/Makefile
  help/Makefile
--- a/patches/printman-01-menu-entry.diff	Thu May 03 17:00:15 2007 +0000
+++ b/patches/printman-01-menu-entry.diff	Thu May 03 18:37:52 2007 +0000
@@ -1,6 +1,6 @@
-diff -urN printman-0.0.2/Makefile.am printman-0.0.2-hacked/Makefile.am
---- printman-0.0.2/Makefile.am	2004-06-14 12:42:25.000000000 +1200
-+++ printman-0.0.2-hacked/Makefile.am	2006-06-02 14:14:35.302926000 +1200
+diff -urN -x'*.orig' printman-0.0.2/Makefile.am ../SUNWgnome-print-2.18.0.hacked/printman-0.0.2/Makefile.am
+--- printman-0.0.2/Makefile.am	2004-06-14 01:42:25.000000000 +0100
++++ ../SUNWgnome-print-2.18.0.hacked/printman-0.0.2/Makefile.am	2007-05-03 18:01:28.843989000 +0100
 @@ -20,7 +20,7 @@
  
  SUBDIRS = src help art po
@@ -10,9 +10,9 @@
  Desktop_in_files = gnome-print-manager.desktop.in
  Desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
  
-diff -urN printman-0.0.2/gnome-print-manager.desktop printman-0.0.2-hacked/gnome-print-manager.desktop
---- printman-0.0.2/gnome-print-manager.desktop	2004-06-14 12:42:47.000000000 +1200
-+++ printman-0.0.2-hacked/gnome-print-manager.desktop	2006-06-02 14:14:54.658176000 +1200
+diff -urN -x'*.orig' printman-0.0.2/gnome-print-manager.desktop ../SUNWgnome-print-2.18.0.hacked/printman-0.0.2/gnome-print-manager.desktop
+--- printman-0.0.2/gnome-print-manager.desktop	2004-06-14 01:42:47.000000000 +0100
++++ ../SUNWgnome-print-2.18.0.hacked/printman-0.0.2/gnome-print-manager.desktop	2007-05-03 18:24:21.801286000 +0100
 @@ -1,5 +1,5 @@
  [Desktop Entry]
 -Name=Print Manager
@@ -29,9 +29,10 @@
  Comment[be]=Адлюстроўвае друкаркі й дакумэнты ў чэргах друкарак
  Comment[ca]=Mostra les impressores i els documents de les cues d'impressió
  Comment[cs]=Zobrazuje tiskárny a dokumenty ve frontách tiskáren
-@@ -64,4 +64,4 @@
+@@ -64,4 +64,5 @@
  Terminal=0
  Type=Application
  Icon=print-manager.png
 -Categories=Application;System;
-+Categories=GNOME;Application;System;
++StartupNotify=true
++Categories=GNOME;Application;System;Settings
sustaining/oi_151a/spec-files