ooo-build r11937 - in trunk: . bin desktop man

[pmladek svn gnome org]

Author: pmladek
Date: Tue Mar 18 18:09:41 2008
New Revision: 11937
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11937&view=rev

Log:
2008-03-18  Petr Mladek  <pmladek suse cz>

	* bin/package-ooo, desktop/ooo-extension-manager.desktop.in.in:
	* man/unopkg.1.in, man/Makefile.am:
	  rename the new oounopkg wrapper to unopkg; Thanks Caolan for feedback
	* bin/generate-bash-completion: add bash completion support for unopkg
	  and .oxt



Added:
   trunk/man/unopkg.1.in
      - copied, changed from r11931, /trunk/man/oounopkg.1.in
Removed:
   trunk/man/oounopkg.1.in
Modified:
   trunk/ChangeLog
   trunk/bin/generate-bash-completion
   trunk/bin/package-ooo
   trunk/desktop/ooo-extension-manager.desktop.in.in
   trunk/man/Makefile.am

Modified: trunk/bin/generate-bash-completion
==============================================================================
--- trunk/bin/generate-bash-completion	(original)
+++ trunk/bin/generate-bash-completion	Tue Mar 18 18:09:41 2008
@@ -33,6 +33,8 @@
 	   "slk", "txt", "htm", "html", "wk1", "wks", "123", "xml", "ods", "ots",
 	   "fods", "csv");
 
+my @EXTENSIONS=("oxt");
+
 # default names of oowrappers
 # use "" if you want to disable any wrapper
 my %APPS = (
@@ -44,6 +46,7 @@
 	impress		=> "ooimpress",
 	math		=> "oomath",
 	template	=> "oofromtemplate",
+	unopkg		=> "unopkg",
 	web		=> "ooweb",
 	writer		=> "oowriter",
 );
@@ -63,6 +66,7 @@
     print "\t\t[--impress=wrapper_name]\n";
     print "\t\t[--math=wrapper_name]\n";
     print "\t\t[--template=wrapper_name]\n";
+    print "\t\t[--unopkg=wrapper_name]\n";
     print "\t\t[--web=wrapper_name]\n";
     print "\t\t[--writer=wrapper_name]\n";
     print "\t\tinput_file\n";
@@ -107,6 +111,8 @@
 		$APPS{'math'} = "$1";
 	} elsif ( $arg =~ /--template=(.*)/ ) {
 		$APPS{'template'} = "$1";
+	} elsif ( $arg =~ /--unopkg=(.*)/ ) {
+		$APPS{'unopkg'} = "$1";
 	} elsif ( $arg =~ /--web=(.*)/ ) {
 		$APPS{'web'} = "$1";
 	} elsif ( $arg =~ /--writer=(.*)/ ) {
@@ -179,6 +185,8 @@
 	if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
 	# ooffice should contain all...
 	if ($app eq "office") { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, @MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
+	# unopkg is a standalone tool
+	if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
     }
 }    
 

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Mar 18 18:09:41 2008
@@ -62,7 +62,7 @@
 done
 create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "slot:5500" || exit 1;
 create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
-create_unopkg_wrapper "$PREFIX/bin/oounopkg${BINSUFFIX}" "" || exit 1;
+create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
 if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
     -o "z$VENDORNAME" = "zDebian" \
     -o "z$VENDORNAME" = "zMandriva"; then
@@ -110,9 +110,9 @@
 	fi
 	sed -e "s|@BINSUFFIX@|$BINSUFFIX|g" $man_page_in \
 		>| "$MANDIR/man1/openoffice$BINSUFFIX.1" || exit 1;
-	# oounopkg
-	sed -e "s|@BINSUFFIX@|$BINSUFFIX|g" $TOOLSDIR/man/oounopkg.1.in \
-		>| "$MANDIR/man1/oounopkg$BINSUFFIX.1" || exit 1;
+	# unopkg
+	sed -e "s|@BINSUFFIX@|$BINSUFFIX|g" $TOOLSDIR/man/unopkg.1.in \
+		>| "$MANDIR/man1/unopkg$BINSUFFIX.1" || exit 1;
 fi
 
 mkdir -p $OOINSTDIR/program

Modified: trunk/desktop/ooo-extension-manager.desktop.in.in
==============================================================================
--- trunk/desktop/ooo-extension-manager.desktop.in.in	(original)
+++ trunk/desktop/ooo-extension-manager.desktop.in.in	Tue Mar 18 18:09:41 2008
@@ -2,8 +2,8 @@
 X-SuSE-translate=false
 Version=1.0
 Terminal=false
-TryExec=oounopkg OOO_BINSUFFIX@
-Exec=oounopkg OOO_BINSUFFIX@ gui %U
+TryExec=unopkg OOO_BINSUFFIX@
+Exec=unopkg OOO_BINSUFFIX@ gui %U
 NoDisplay=true
 Type=Application
 StartupNotify=false

Modified: trunk/man/Makefile.am
==============================================================================
--- trunk/man/Makefile.am	(original)
+++ trunk/man/Makefile.am	Tue Mar 18 18:09:41 2008
@@ -1 +1 @@
-EXTRA_DIST=openoffice.1.in openoffice.1_*.in oounopkg.1.in
+EXTRA_DIST=openoffice.1.in openoffice.1_*.in unopkg.1.in

Copied: trunk/man/unopkg.1.in (from r11931, /trunk/man/oounopkg.1.in)
==============================================================================
--- /trunk/man/oounopkg.1.in	(original)
+++ trunk/man/unopkg.1.in	Tue Mar 18 18:09:41 2008
@@ -1,23 +1,23 @@
-.TH oounopkg "1" "2008-03-18" "OpenOffice.org Extension Manager" "User Command"
+.TH unopkg "1" "2008-03-18" "OpenOffice.org Extension Manager" "User Command"
 .SH "Name"
-oounopkg BINSUFFIX@ \- OpenOffice.org Extension Manager
+unopkg BINSUFFIX@ \- OpenOffice.org Extension Manager
 .SH SYNOPSIS
-.B oounopkg BINSUFFIX@
+.B unopkg BINSUFFIX@
 [\fBadd\fR] <\fIoptions\fR> \fIextension-path...\fR
 .br
-.B oounopkg BINSUFFIX@
+.B unopkg BINSUFFIX@
 [\fBremove\fR] <\fIoptions\fR> \fIextension-identifier...\fR
 .br
-.B oounopkg BINSUFFIX@
+.B unopkg BINSUFFIX@
 [\fBlist\fR] <\fIoptions\fR> \fIextension-identifier...\fR
 .br
-.B oounopkg BINSUFFIX@
+.B unopkg BINSUFFIX@
 [\fBreinstall\fR] <\fIoptions\fR>
 .br
-.B oounopkg BINSUFFIX@
+.B unopkg BINSUFFIX@
 [\fBgui\fR]
 .br
-.B oounopkg BINSUFFIX@
+.B unopkg BINSUFFIX@
 [\fB--help\fR|\fB-h\fR]
 
 .SH DESCRIPTION