From 5f40d24d1843a5b124c9f638bf9d57e7fead5b4f Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Wed, 24 Feb 2010 23:45:18 -0500 Subject: [PATCH] Rename executables and key files to support parallel installation Renamed glabels and glabels-batch to glabels-3 and glabels-3-batch to support parallel installation with other versions of glabels. Also renamed and reconciled man pages and icon files. --- .gitignore | 5 ++++- data/desktop/Makefile.am | 2 +- ...glabels.desktop.in => glabels-3.0.desktop.in} | 6 +++--- data/man/Makefile.am | 3 +-- data/man/glabels-3-batch.1 | 1 + data/man/{glabels.1 => glabels-3.1} | 12 ++++++------ data/mime/glabels.keys.in | 2 +- data/pixmaps/Makefile.am | 6 +++--- ...png => glabels-3.0-application-x-glabels.png} | Bin data/pixmaps/{glabels.png => glabels-3.0.png} | Bin src/Makefile.am | 15 ++++++++------- src/glabels.c | 2 +- src/template-designer.c | 2 +- 13 files changed, 30 insertions(+), 26 deletions(-) rename data/desktop/{glabels.desktop.in => glabels-3.0.desktop.in} (73%) create mode 100644 data/man/glabels-3-batch.1 rename data/man/{glabels.1 => glabels-3.1} (95%) rename data/pixmaps/{glabels-application-x-glabels.png => glabels-3.0-application-x-glabels.png} (100%) rename data/pixmaps/{glabels.png => glabels-3.0.png} (100%) diff --git a/.gitignore b/.gitignore index 76b59138..d23fe328 100644 --- a/.gitignore +++ b/.gitignore @@ -47,9 +47,12 @@ glabels-*.tar.gz /src/marshal.[ch] /src/stock-pixmaps/stockpixbufs.h /src/glabels +/src/glabels-3 /src/glabels-batch +/src/glabels-3-batch + +/data/desktop/glabels*.desktop -/data/desktop/glabels.desktop /data/mime/glabels.keys /data/mime/glabels.xml diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am index 0ade4eef..2be4ed6e 100644 --- a/data/desktop/Makefile.am +++ b/data/desktop/Makefile.am @@ -2,7 +2,7 @@ @INTLTOOL_DESKTOP_RULE@ -DESKTOP_IN_FILES = glabels.desktop.in +DESKTOP_IN_FILES = $(GLABELS_BRANCH).desktop.in DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop) desktopdir = $(datadir)/applications diff --git a/data/desktop/glabels.desktop.in b/data/desktop/glabels-3.0.desktop.in similarity index 73% rename from data/desktop/glabels.desktop.in rename to data/desktop/glabels-3.0.desktop.in index 6f0956cf..4d7d579f 100644 --- a/data/desktop/glabels.desktop.in +++ b/data/desktop/glabels-3.0.desktop.in @@ -1,9 +1,9 @@ [Desktop Entry] Encoding=UTF-8 -_Name=gLabels Label Designer +_Name=gLabels Label Designer 3 _Comment=Create labels, business cards and media covers -Exec=glabels %F -Icon=glabels.png +Exec=glabels-3 %F +Icon=glabels-3.0.png Terminal=false Type=Application Categories=GTK;Office; diff --git a/data/man/Makefile.am b/data/man/Makefile.am index 34051904..43fc5121 100644 --- a/data/man/Makefile.am +++ b/data/man/Makefile.am @@ -1,6 +1,5 @@ ## Process this file with automake to produce Makefile.in -man_MANS = glabels.1 +man_MANS = glabels-3.1 glabels-3-batch.1 EXTRA_DIST = $(man_MANS) - diff --git a/data/man/glabels-3-batch.1 b/data/man/glabels-3-batch.1 new file mode 100644 index 00000000..d9248d52 --- /dev/null +++ b/data/man/glabels-3-batch.1 @@ -0,0 +1 @@ +.so man1/glabels-3.1 diff --git a/data/man/glabels.1 b/data/man/glabels-3.1 similarity index 95% rename from data/man/glabels.1 rename to data/man/glabels-3.1 index 906dd2a5..5b5b4341 100644 --- a/data/man/glabels.1 +++ b/data/man/glabels-3.1 @@ -2,20 +2,20 @@ .SH NAME glabels \- Label and business card creation program for GNOME .SH SYNOPSIS -.B glabels +.B glabels-3 .RI [OPTIONS] .RI [label-filename...] .sp -.B glabels-batch +.B glabels-3-batch .RI [OPTIONS] .RI [label-filename...] .SH DESCRIPTION -.B glabels +.B glabels-3 is a lightweight program for creating labels and business cards for the GNOME desktop environment. It is designed to work with various laser/ink-jet peel-off label and business card sheets that you'll find at most office supply stores. -.B glabels +.B glabels-3 is pre-configured with templates for many of these products. It also provides an interactive template designer for creating new templates according to user specifications. @@ -23,9 +23,9 @@ templates according to user specifications. For full documentation see the \fBgLabels\fR online help. .PP -.B glabels-batch +.B glabels-3-batch is a command line utility to print labels previously prepared with -.B glabels. +.B glabels-3. .SH OPTIONS .TP \fB\-?\fR, \fB\-\-help\fR diff --git a/data/mime/glabels.keys.in b/data/mime/glabels.keys.in index 596c96c7..9eae5157 100644 --- a/data/mime/glabels.keys.in +++ b/data/mime/glabels.keys.in @@ -1,7 +1,7 @@ application/x-glabels: open=glabels %f _description=gLabels Project File - icon_filename=glabels-application-x-glabels.png + icon_filename=glabels-3.0-application-x-glabels.png default_action_type=application category=Documents short_list_application_ids_for_novice_user_level=glabels diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am index 39aefa0d..ed28b9be 100644 --- a/data/pixmaps/Makefile.am +++ b/data/pixmaps/Makefile.am @@ -14,12 +14,12 @@ glabels_pixmaps_DATA = \ glabels_app_icondir = $(datadir)/pixmaps glabels_app_icon_DATA = \ - glabels.png + $(GLABELS_BRANCH).png -glabels_mime_icondir = $(datadir)/pixmaps +glabels_mime_icondir = $(datadir)/icons/hicolor/48x48/mimetypes glabels_mime_icon_DATA = \ - glabels-application-x-glabels.png + $(GLABELS_BRANCH)-application-x-glabels.png EXTRA_DIST = $(glabels_pixmaps_DATA) \ $(glabels_app_icon_DATA) \ diff --git a/data/pixmaps/glabels-application-x-glabels.png b/data/pixmaps/glabels-3.0-application-x-glabels.png similarity index 100% rename from data/pixmaps/glabels-application-x-glabels.png rename to data/pixmaps/glabels-3.0-application-x-glabels.png diff --git a/data/pixmaps/glabels.png b/data/pixmaps/glabels-3.0.png similarity index 100% rename from data/pixmaps/glabels.png rename to data/pixmaps/glabels-3.0.png diff --git a/src/Makefile.am b/src/Makefile.am index 13147ca0..cf0b81a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS= pixmaps stock-pixmaps -bin_PROGRAMS = glabels glabels-batch +bin_PROGRAMS = glabels-3 glabels-3-batch INCLUDES = \ -I$(top_builddir)/libglabels \ @@ -13,12 +13,13 @@ INCLUDES = \ $(DISABLE_DEPRECATED_CFLAGS) \ -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" \ -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps"\" \ + -DGLABELS_ICON=\""$(GLABELS_BRANCH).png"\" \ -DGLABELS_DATA_DIR=\""$(datadir)/$(GLABELS_BRANCH)"\" \ -DG_LOG_DOMAIN=\""glabels\"" -glabels_LDFLAGS = -export-dynamic +glabels_3_LDFLAGS = -export-dynamic -glabels_LDADD = \ +glabels_3_LDADD = \ $(GLABELS_LIBS) \ ../libglabels/$(LIBGLABELS_BRANCH).la \ $(LIBEBOOK_LIBS) \ @@ -26,9 +27,9 @@ glabels_LDADD = \ $(LIBQRENCODE_LIBS) \ $(LIBIEC16022_LIBS) -glabels_batch_LDFLAGS = -export-dynamic +glabels_3_batch_LDFLAGS = -export-dynamic -glabels_batch_LDADD = \ +glabels_3_batch_LDADD = \ $(GLABELS_LIBS) \ ../libglabels/$(LIBGLABELS_BRANCH).la \ $(LIBEBOOK_LIBS) \ @@ -40,7 +41,7 @@ BUILT_SOURCES = \ marshal.c \ marshal.h -glabels_SOURCES = \ +glabels_3_SOURCES = \ glabels.c \ warning-handler.c \ warning-handler.h \ @@ -228,7 +229,7 @@ glabels_SOURCES = \ $(BUILT_SOURCES) -glabels_batch_SOURCES = \ +glabels_3_batch_SOURCES = \ glabels-batch.c \ file-util.h \ file-util.c \ diff --git a/src/glabels.c b/src/glabels.c index 85f207db..ce95ba54 100644 --- a/src/glabels.c +++ b/src/glabels.c @@ -98,7 +98,7 @@ main (int argc, char **argv) gl_warning_handler_init(); /* Set default icon */ - icon_file = g_build_filename (GLABELS_ICON_DIR, "glabels.png", NULL); + icon_file = g_build_filename (GLABELS_ICON_DIR, GLABELS_ICON, NULL); if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) { g_message ("Could not find %s", icon_file); diff --git a/src/template-designer.c b/src/template-designer.c index 03528b8a..95b2162a 100644 --- a/src/template-designer.c +++ b/src/template-designer.c @@ -396,7 +396,7 @@ gl_template_designer_construct (glTemplateDesigner *dialog) gtk_window_set_title (GTK_WINDOW(dialog), _("gLabels Template Designer")); - logo_filename = g_build_filename (GLABELS_ICON_DIR, "glabels.png", NULL); + logo_filename = g_build_filename (GLABELS_ICON_DIR, GLABELS_ICON, NULL); logo = gdk_pixbuf_new_from_file (logo_filename, NULL); g_free (logo_filename); -- 2.39.5