File pcmanfm-rename-to-pcmanfm.patch of Package pcmanfm

Overview Repositories Revisions Requests Users Attributes Meta

File pcmanfm-rename-to-pcmanfm.patch of Package pcmanfm (Revision afea5c6a1fd14da761afd3f7f99a81de)

Currently displaying revision afea5c6a1fd14da761afd3f7f99a81de , Show latest

diff -uNr pcmanfm2/configure.ac pcmanfm/configure.ac
--- pcmanfm2/configure.ac	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/configure.ac	2010-03-01 11:11:01.754281802 +0100
@@ -88,7 +88,7 @@
 AC_SUBST(MENU_CACHE_CFLAGS)
 AC_SUBST(MENU_CACHE_LIBS)
 
-GETTEXT_PACKAGE=pcmanfm2
+GETTEXT_PACKAGE=pcmanfm
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
@@ -100,7 +100,7 @@
     data/Makefile
     data/ui/Makefile
     data/ui/about.glade
-    data/pcmanfm2.desktop
+    data/pcmanfm.desktop
 ])
 
 AC_OUTPUT
diff -uNr pcmanfm2/data/Makefile.am pcmanfm/data/Makefile.am
--- pcmanfm2/data/Makefile.am	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/data/Makefile.am	2010-03-01 11:11:01.754281802 +0100
@@ -4,5 +4,5 @@
 
 desktopdir=$(datadir)/applications
 desktop_DATA= \
-	pcmanfm2.desktop \
+	pcmanfm.desktop \
 	$(NULL)
diff -uNr pcmanfm2/data/pcmanfm2.desktop.in pcmanfm/data/pcmanfm2.desktop.in
--- pcmanfm2/data/pcmanfm2.desktop.in	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/data/pcmanfm2.desktop.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-[Desktop Entry]
-Type=Application
-Icon=system-file-manager
-Name=File Manager
-Name[zh_TW]=檔案管理程式
-Name[fi]=Tiedostonhallinta
-Name[et]=Failihaldur
-Name[ja]=ファイルマネージャ
-Name[ru]=Файловый менеджер
-GenericName=File Manager
-GenericName[ru]=Файловый менеджер
-GenericName[zh_TW]=檔案管理程式
-GenericName[fi]=Tiedostonhallinta
-GenericName[et]=Failihaldur
-GenericName[ja]=ファイルマネージャ
-Comment=Browse the file system and manage the files
-Comment[zh_TW]=瀏覽檔案系統及管理檔案
-Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
-Comment[et]=Lehitse failisüsteemi ja halda faile
-Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
-Categories=Application;Utility;Core;GTK;
-Exec=pcmanfm2 %U
-StartupNotify=true
-Terminal=false
-MimeType=x-directory/normal;inode/directory;
diff -uNr pcmanfm2/data/pcmanfm.desktop.in pcmanfm/data/pcmanfm.desktop.in
--- pcmanfm2/data/pcmanfm.desktop.in	1970-01-01 01:00:00.000000000 +0100
+++ pcmanfm/data/pcmanfm.desktop.in	2010-03-01 11:11:01.755281580 +0100
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Icon=system-file-manager
+Name=File Manager
+Name[zh_TW]=檔案管理程式
+Name[fi]=Tiedostonhallinta
+Name[et]=Failihaldur
+Name[ja]=ファイルマネージャ
+Name[ru]=Файловый менеджер
+GenericName=File Manager
+GenericName[ru]=Файловый менеджер
+GenericName[zh_TW]=檔案管理程式
+GenericName[fi]=Tiedostonhallinta
+GenericName[et]=Failihaldur
+GenericName[ja]=ファイルマネージャ
+Comment=Browse the file system and manage the files
+Comment[zh_TW]=瀏覽檔案系統及管理檔案
+Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
+Comment[et]=Lehitse failisüsteemi ja halda faile
+Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
+Categories=Application;Utility;Core;GTK;
+Exec=pcmanfm %U
+StartupNotify=true
+Terminal=false
+MimeType=x-directory/normal;inode/directory;
diff -uNr pcmanfm2/data/ui/Makefile.am pcmanfm/data/ui/Makefile.am
--- pcmanfm2/data/ui/Makefile.am	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/data/ui/Makefile.am	2010-03-01 11:11:01.756281777 +0100
@@ -1,7 +1,7 @@
 NULL=
 
 # GtkBuilder UI definition files
-uidir=$(datadir)/pcmanfm2/ui
+uidir=$(datadir)/pcmanfm/ui
 ui_in_files= \
 	about.glade \
 	pref.glade \
diff -uNr pcmanfm2/po/el.po pcmanfm/po/el.po
--- pcmanfm2/po/el.po	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/po/el.po	2010-03-01 11:11:01.757002749 +0100
@@ -1,7 +1,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: pcmanfm2\n"
+"Project-Id-Version: pcmanfm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-02-28 04:12+0000\n"
 "PO-Revision-Date: \n"
diff -uNr pcmanfm2/po/es.po pcmanfm/po/es.po
--- pcmanfm2/po/es.po	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/po/es.po	2010-03-01 11:11:01.758015378 +0100
@@ -1,11 +1,11 @@
-# Spanish (Castilian) translation for pcmanfm2 package.
+# Spanish (Castilian) translation for pcmanfm package.
 # Copyright (C) 2010 the LXDE team
-# This file is distributed under the same license as the pcmanfm2 package.
+# This file is distributed under the same license as the pcmanfm package.
 # Hugo Florentino <sysadmin@cips.cu>, 2010.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: pcmanfm2 0.1\n"
+"Project-Id-Version: pcmanfm 0.9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-02-28 04:12+0000\n"
 "PO-Revision-Date: 2010-02-09 13:26-0500\n"
diff -uNr pcmanfm2/po/pl.po pcmanfm/po/pl.po
--- pcmanfm2/po/pl.po	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/po/pl.po	2010-03-01 11:11:01.762002408 +0100
@@ -1,11 +1,11 @@
-# pcmanfm2 polish translation
+# pcmanfm polish translation
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Piotr Sokół <piotr.sokol@10g.pl>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pcmanfm2\n"
+"Project-Id-Version: pcmanfm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-02-27 04:12+0000\n"
 "PO-Revision-Date: 2010-02-28 10:42+0100\n"
diff -uNr pcmanfm2/po/POTFILES.skip pcmanfm/po/POTFILES.skip
--- pcmanfm2/po/POTFILES.skip	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/po/POTFILES.skip	2010-03-01 11:11:01.762002408 +0100
@@ -1,3 +1,3 @@
-data/pcmanfm2.desktop.in
+data/pcmanfm.desktop.in
 #we transtale .in file
 data/ui/about.glade
diff -uNr pcmanfm2/po/pt.po pcmanfm/po/pt.po
--- pcmanfm2/po/pt.po	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/po/pt.po	2010-03-01 11:11:01.764003431 +0100
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pcmanfm2\n"
+"Project-Id-Version: pcmanfm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-02-27 07:50+0800\n"
 "PO-Revision-Date: 2010-02-23 14:04-0000\n"
diff -uNr pcmanfm2/po/uk.po pcmanfm/po/uk.po
--- pcmanfm2/po/uk.po	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/po/uk.po	2010-03-01 11:11:01.765003070 +0100
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pcmanfm2\n"
+"Project-Id-Version: pcmanfm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-02-27 07:50+0800\n"
 "PO-Revision-Date: 2010-02-04 19:17+0100\n"
diff -uNr pcmanfm2/src/main-win.c pcmanfm/src/main-win.c
--- pcmanfm2/src/main-win.c	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/src/main-win.c	2010-03-01 11:11:01.767002277 +0100
@@ -582,9 +582,9 @@
         return;
     }
     if(strstr(app_config->su_cmd, "%s")) /* FIXME: need to rename to pcmanfm when we reach stable release. */
-        cmd = g_strdup_printf(app_config->su_cmd, "pcmanfm2 %U");
+        cmd = g_strdup_printf(app_config->su_cmd, "pcmanfm %U");
     else
-        cmd = g_strconcat(app_config->su_cmd, " ", "pcmanfm2 %U", NULL);
+        cmd = g_strconcat(app_config->su_cmd, " ", "pcmanfm %U", NULL);
     app = g_app_info_create_from_commandline(cmd, NULL, 0, NULL);
     g_free(cmd);
     if(app)
diff -uNr pcmanfm2/src/Makefile.am pcmanfm/src/Makefile.am
--- pcmanfm2/src/Makefile.am	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/src/Makefile.am	2010-03-01 11:11:18.486003729 +0100
@@ -1,13 +1,13 @@
 NULL=
 
 AM_CPPFLAGS = \
-	-DPACKAGE_DATA_DIR=\""$(datadir)/pcmanfm2"\" \
-	-DPACKAGE_UI_DIR=\""$(datadir)/pcmanfm2/ui"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)/pcmanfm"\" \
+	-DPACKAGE_UI_DIR=\""$(datadir)/pcmanfm/ui"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
-bin_PROGRAMS = pcmanfm2
+bin_PROGRAMS = pcmanfm
 
-pcmanfm2_SOURCES = \
+pcmanfm_SOURCES = \
 	pcmanfm.c pcmanfm.h \
 	app-config.c app-config.h \
 	main-win.c main-win.h \
@@ -22,7 +22,7 @@
 	desktop-ui.c \
 	$(NULL)
 
-pcmanfm2_CFLAGS = \
+pcmanfm_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GMODULE_CFLAGS) \
@@ -33,7 +33,7 @@
 	-Werror-implicit-function-declaration \
 	$(NULL)
 
-pcmanfm2_LDADD = \
+pcmanfm_LDADD = \
 	$(GTK_LIBS) \
 	$(GIO_LIBS) \
 	$(GMODULE_LIBS) \
diff -uNr pcmanfm2/src/pcmanfm.c pcmanfm/src/pcmanfm.c
--- pcmanfm2/src/pcmanfm.c	2010-03-01 10:57:58.000000000 +0100
+++ pcmanfm/src/pcmanfm.c	2010-03-01 11:11:01.770002589 +0100
@@ -287,7 +287,7 @@
 void get_socket_name( char* buf, int len )
 {
     char* dpy = gdk_get_display();
-    g_snprintf( buf, len, "/tmp/.pcmanfm2-socket%s-%s", dpy, g_get_user_name() );
+    g_snprintf( buf, len, "/tmp/.pcmanfm-socket%s-%s", dpy, g_get_user_name() );
     g_free( dpy );
 }

Places

File pcmanfm-rename-to-pcmanfm.patch of Package pcmanfm (Revision afea5c6a1fd14da761afd3f7f99a81de)

Places