]> git.sur5r.net Git - glabels/commitdiff
Rename executables and key files to support parallel installation
authorJim Evins <evins@snaught.com>
Thu, 25 Feb 2010 04:45:18 +0000 (23:45 -0500)
committerJim Evins <evins@snaught.com>
Thu, 25 Feb 2010 04:45:18 +0000 (23:45 -0500)
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.

17 files changed:
.gitignore
data/desktop/Makefile.am
data/desktop/glabels-3.0.desktop.in [new file with mode: 0644]
data/desktop/glabels.desktop.in [deleted file]
data/man/Makefile.am
data/man/glabels-3-batch.1 [new file with mode: 0644]
data/man/glabels-3.1 [new file with mode: 0644]
data/man/glabels.1 [deleted file]
data/mime/glabels.keys.in
data/pixmaps/Makefile.am
data/pixmaps/glabels-3.0-application-x-glabels.png [new file with mode: 0644]
data/pixmaps/glabels-3.0.png [new file with mode: 0644]
data/pixmaps/glabels-application-x-glabels.png [deleted file]
data/pixmaps/glabels.png [deleted file]
src/Makefile.am
src/glabels.c
src/template-designer.c

index 76b591382ad8813e423c4b992f9eac53438282bf..d23fe3284f348a49e0276daa44cf023cd22e84b0 100644 (file)
@@ -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
 
index 0ade4eefa9e0d982ea34673ecae78561598fc18a..2be4ed6e358fda7192bf6ad1e756106b2e328f84 100644 (file)
@@ -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-3.0.desktop.in b/data/desktop/glabels-3.0.desktop.in
new file mode 100644 (file)
index 0000000..4d7d579
--- /dev/null
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=gLabels Label Designer 3
+_Comment=Create labels, business cards and media covers
+Exec=glabels-3 %F
+Icon=glabels-3.0.png
+Terminal=false
+Type=Application
+Categories=GTK;Office;
+StartupNotify=true
+MimeType=application/x-glabels;
diff --git a/data/desktop/glabels.desktop.in b/data/desktop/glabels.desktop.in
deleted file mode 100644 (file)
index 6f0956c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=gLabels Label Designer
-_Comment=Create labels, business cards and media covers
-Exec=glabels %F
-Icon=glabels.png
-Terminal=false
-Type=Application
-Categories=GTK;Office;
-StartupNotify=true
-MimeType=application/x-glabels;
index 340519046374f4de83e6597563aeb02c1c6cdcf5..43fc5121d7412d2736832ff8bfaca1eebdd5c979 100644 (file)
@@ -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 (file)
index 0000000..d9248d5
--- /dev/null
@@ -0,0 +1 @@
+.so man1/glabels-3.1
diff --git a/data/man/glabels-3.1 b/data/man/glabels-3.1
new file mode 100644 (file)
index 0000000..5b5b434
--- /dev/null
@@ -0,0 +1,67 @@
+.TH glabels 1 "Jun 28, 2004"
+.SH NAME
+glabels \- Label and business card creation program for GNOME
+.SH SYNOPSIS
+.B glabels-3
+.RI [OPTIONS]
+.RI [label-filename...]
+.sp
+.B glabels-3-batch
+.RI [OPTIONS]
+.RI [label-filename...]
+.SH DESCRIPTION
+.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-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.
+.PP
+For full documentation see the \fBgLabels\fR online help.
+
+.PP
+.B glabels-3-batch
+is a command line utility to print labels previously prepared with
+.B glabels-3.
+.SH OPTIONS
+.TP
+\fB\-?\fR, \fB\-\-help\fR
+Display a summary of available command-line options.
+.TP
+\fB\-\-usage\fR
+Display a short usage summary.
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print program version information.
+.PP
+.B Options specific to glabels-batch
+.TP
+\fB\-o\fR \fIfilename\fR, \fB\-\-output\fR=\fIfilename\fR
+Set output filename to \fIfilename\fR. (default="output.ps")
+.TP
+\fB\-s\fR \fIn\fR, \fB\-\-sheets\fR=\fIn\fR
+Set number of sheets to \fIn\fR. (default=1)
+.TP
+\fB\-c\fR \fIn\fR, \fB\-\-copies\fR=\fIn\fR
+Set number of copies to \fIn\fR. (default=1)
+.TP
+\fB\-f\fR \fIn\fR, \fB\-\-first\fR=\fIn\fR
+Set label on first sheet to start printing from to \fIn\fR. (default=1)
+.TP
+\fB\-l\fR, \fB\-\-outline\fR
+Print outlines around labels.  This is useful for testing printer alignment
+or printing proof sheets.
+.TP
+\fB\-r\fR, \fB\-\-reverse\fR
+Print mirror image of labels.  This is useful for clear labels intended to be
+seen from the back through glass.
+
+.SH FILES
+The $HOME/.glabels directory contains all user-defined templates.
+.SH SEE ALSO
+The gLabels homepage at <http://glabels.org/>.
+.SH AUTHOR
+Jim Evins <evins@snaught.com>
diff --git a/data/man/glabels.1 b/data/man/glabels.1
deleted file mode 100644 (file)
index 906dd2a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH glabels 1 "Jun 28, 2004"
-.SH NAME
-glabels \- Label and business card creation program for GNOME
-.SH SYNOPSIS
-.B glabels
-.RI [OPTIONS]
-.RI [label-filename...]
-.sp
-.B glabels-batch
-.RI [OPTIONS]
-.RI [label-filename...]
-.SH DESCRIPTION
-.B glabels
-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
-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.
-.PP
-For full documentation see the \fBgLabels\fR online help.
-
-.PP
-.B glabels-batch
-is a command line utility to print labels previously prepared with
-.B glabels.
-.SH OPTIONS
-.TP
-\fB\-?\fR, \fB\-\-help\fR
-Display a summary of available command-line options.
-.TP
-\fB\-\-usage\fR
-Display a short usage summary.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Print program version information.
-.PP
-.B Options specific to glabels-batch
-.TP
-\fB\-o\fR \fIfilename\fR, \fB\-\-output\fR=\fIfilename\fR
-Set output filename to \fIfilename\fR. (default="output.ps")
-.TP
-\fB\-s\fR \fIn\fR, \fB\-\-sheets\fR=\fIn\fR
-Set number of sheets to \fIn\fR. (default=1)
-.TP
-\fB\-c\fR \fIn\fR, \fB\-\-copies\fR=\fIn\fR
-Set number of copies to \fIn\fR. (default=1)
-.TP
-\fB\-f\fR \fIn\fR, \fB\-\-first\fR=\fIn\fR
-Set label on first sheet to start printing from to \fIn\fR. (default=1)
-.TP
-\fB\-l\fR, \fB\-\-outline\fR
-Print outlines around labels.  This is useful for testing printer alignment
-or printing proof sheets.
-.TP
-\fB\-r\fR, \fB\-\-reverse\fR
-Print mirror image of labels.  This is useful for clear labels intended to be
-seen from the back through glass.
-
-.SH FILES
-The $HOME/.glabels directory contains all user-defined templates.
-.SH SEE ALSO
-The gLabels homepage at <http://glabels.org/>.
-.SH AUTHOR
-Jim Evins <evins@snaught.com>
index 596c96c7e70ea20b7f8147a5f9d9cf3fdaf1f2cc..9eae5157b9ae4c4e85c638252bddbab849dd2c46 100644 (file)
@@ -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
index 39aefa0d5f3e945e4b64cdb6c8ac69c95aacf24c..ed28b9be3f7cbfbd60ab0319b3975aadcdbd0be0 100644 (file)
@@ -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-3.0-application-x-glabels.png b/data/pixmaps/glabels-3.0-application-x-glabels.png
new file mode 100644 (file)
index 0000000..59c749f
Binary files /dev/null and b/data/pixmaps/glabels-3.0-application-x-glabels.png differ
diff --git a/data/pixmaps/glabels-3.0.png b/data/pixmaps/glabels-3.0.png
new file mode 100644 (file)
index 0000000..afb7ecf
Binary files /dev/null and b/data/pixmaps/glabels-3.0.png differ
diff --git a/data/pixmaps/glabels-application-x-glabels.png b/data/pixmaps/glabels-application-x-glabels.png
deleted file mode 100644 (file)
index 59c749f..0000000
Binary files a/data/pixmaps/glabels-application-x-glabels.png and /dev/null differ
diff --git a/data/pixmaps/glabels.png b/data/pixmaps/glabels.png
deleted file mode 100644 (file)
index afb7ecf..0000000
Binary files a/data/pixmaps/glabels.png and /dev/null differ
index 13147ca0957bf436e4a2da249b378315021bd35c..cf0b81a5ffda3c0a5ec514b32dfca6417a5be56a 100644 (file)
@@ -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                     \
index 85f207db26fb518b2fc2bf61dfcb0963c31f2c19..ce95ba54a0c7f7472384bdd113c54c854a9af861 100644 (file)
@@ -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);
index 03528b8af26f10a34a9839773321a9b19d8c181b..95b2162a23f7d7e00b19cb4f95f9b03f4c3d1152 100644 (file)
@@ -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);