[Xfce4-commits] <xfce4-clipman-plugin:master> === Release 1.2.2 ===
Mike Massonnet
noreply at xfce.org
Tue Nov 1 18:12:01 CET 2011
Updating branch refs/heads/master
to 4543a3a0c397dc18c9ca4a9cca39138124ae6a92 (commit)
from 2e6a58e362aed09009eff3e3ab1c633f7f5b5e49 (commit)
commit 4543a3a0c397dc18c9ca4a9cca39138124ae6a92
Author: Mike Massonnet <mmassonnet at xfce.org>
Date: Tue Nov 1 18:02:07 2011 +0100
=== Release 1.2.2 ===
ChangeLog | 12 ++
NEWS | 7 +
configure.ac.in | 2 +-
doc | 2 +-
po/xfce4-clipman-plugin.pot | 294 -------------------------------------------
5 files changed, 21 insertions(+), 296 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 80becdb..2aa941a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-01 Mike Massonnet
+=== Release 1.2.2 ===
+
+2011-11-01 Mike Massonnet
+build-env: Update rules for libclipman.so
+
+ Use new libtool syntax in autoconf script and depend on version 2.2.6.
+ Update automake rule for libclipman.la with -avoid-version -module.
+
+2011-11-01 Mike Massonnet
+build-env: Add hard-dependency to xproto
+
2011-10-31 Mike Massonnet
=== Release 1.2.1 ===
diff --git a/NEWS b/NEWS
index 9cd36e1..61e147b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 1.2.2 - 2011-11-01
+
+- Update build environment.
+ * Bug 8093: Add package check for xproto.
+ * Build libclipman with -avoid-version and -module.
+ * Bump Libtool version and disable static libraries (part of bug 6920).
+
Version 1.2.1 - 2011-10-31
- New options in the settings dialog under the tab "Tweaks".
diff --git a/configure.ac.in b/configure.ac.in
index f62f81b..8515dd1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -13,7 +13,7 @@ m4_define([project_version_major], [1])
m4_define([project_version_minor], [2])
m4_define([project_version_micro], [2])
m4_define([project_version_build], [@REVISION@])
-m4_define([project_version_tag], [git]) # leave empty for release
+m4_define([project_version_tag], []) # leave empty for release
m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])])
dnl ***************************
diff --git a/doc b/doc
index d010e13..a123eb8 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit d010e1353ceaefda74fa9b34ce62c6958f253471
+Subproject commit a123eb8a67c4e1cb407d73b9438c9a096ab2fea0
diff --git a/po/xfce4-clipman-plugin.pot b/po/xfce4-clipman-plugin.pot
deleted file mode 100644
index c42cdd5..0000000
--- a/po/xfce4-clipman-plugin.pot
+++ /dev/null
@@ -1,294 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-28 15:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../panel-plugin/xfce4-clipman.desktop.in.h:1
-#: ../panel-plugin/xfce4-clipman-plugin.desktop.in.h:1
-#: ../panel-plugin/xfce4-clipman-plugin-autostart.desktop.in.h:1
-msgid "Clipboard manager"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman.desktop.in.h:2
-#: ../panel-plugin/xfce4-clipman-plugin.desktop.in.h:2
-#: ../panel-plugin/xfce4-clipman-plugin-autostart.desktop.in.h:2
-#: ../panel-plugin/main-panel-plugin.c:70
-#: ../panel-plugin/main-status-icon.c:61 ../panel-plugin/main-status-icon.c:94
-#: ../panel-plugin/plugin.c:335
-msgid "Clipman"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:1
-msgid "Bugz"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:2
-msgid "Edit with Gimp"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:3
-msgid "GNOME Bug"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:4
-msgid "Image"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:5
-msgid "Long URL"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:6
-msgid "Shrink the URL"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:7
-msgid "View with Ristretto"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-actions.xml.in.h:8
-msgid "Xfce Bug"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-settings.c:190
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: Keyboard shortcut
-#: ../panel-plugin/xfce4-clipman-settings.c:192
-msgid "Ctrl+V"
-msgstr ""
-
-#. TRANSLATORS: Keyboard shortcut
-#: ../panel-plugin/xfce4-clipman-settings.c:194
-msgid "Shift+Insert"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-settings.c:517
-msgid "<b>Reset actions</b>"
-msgstr ""
-
-#: ../panel-plugin/xfce4-clipman-settings.c:519
-msgid ""
-"Are you sure you want to reset the actions to the system default values?"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:1
-msgid "<b>Action</b>"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:2
-msgid "<b>Behavior</b>"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:3
-msgid "<b>Commands</b>"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:4
-msgid "<b>History</b>"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:5
-msgid "Actions"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:6
-msgid "Activate only on manual copy"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:7
-msgid "Automatically paste a selected item from the history"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:8
-msgid ""
-"By default the action is triggerred by a selection, check this option to "
-"trigger the action only when you make a manual copy"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:9
-msgid "Command:"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:10
-msgid "Configure the plugin"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:11
-msgid "Edit Action"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:12
-msgid "Enable _actions"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:13
-msgid "General"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:14
-msgid ""
-"If checked, the clipboard texts will be matched against regular expressions "
-"and a menu will display possible actions"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:15
-msgid ""
-"If checked, the selections will be synced with the default clipboard in a "
-"way that you can paste what you select"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:16
-msgid ""
-"If checked, the selections won't affect the history except the manual copies"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:17
-msgid "If checked, this option allows to store one image inside the history"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:18
-msgid ""
-"If checked, this option will restore the history on every new Xfce session"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:19
-msgid "Ignore s_elections"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:20
-msgid "Name:"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:21
-msgid "P_osition menu at mouse pointer"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:22
-msgid "Pattern:"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:23
-msgid ""
-"Popup the menu at the mouse pointer position, only for the xfce4-popup-"
-"clipman command"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:24
-msgid ""
-"Push last copied text to the top of the history, useful to reorder old items"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:25
-msgid "Re_verse history order"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:26
-msgid "Regular expression"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:27
-msgid "Reverse order of the history shown in the menu"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:28
-msgid "Save on _quit"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:29
-msgid "Size of the _history:"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:30
-msgid "Store last copied _image"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:31
-msgid "Sync _selections"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:32
-msgid "The pattern is always anchored within the special characters ^$"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:33
-msgid "Tweaks"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:34
-msgid ""
-"When the selection is done (mouse or keyboard) and the Control key is still "
-"pressed down, the popup menu for matched actions will be skipped"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:35
-msgid ""
-"You can use the substitution parameters \"\\1\", \"\\2\" and so on in the "
-"commands. The parameter \"\\0\" represents the complete text. If you don't "
-"know regular expressions, have a look at the documentation of Clipman that "
-"has an introdution for them."
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:36
-msgid "_Paste instantly:"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:37
-msgid "_Reorder history items"
-msgstr ""
-
-#: ../panel-plugin/settings-dialog.ui.h:38
-msgid "_Skip actions by holding Control"
-msgstr ""
-
-#: ../panel-plugin/actions.c:370
-#, c-format
-msgid ""
-"Unable to execute the command \"%s\"\n"
-"\n"
-"%s"
-msgstr ""
-
-#: ../panel-plugin/menu.c:189
-msgid "Are you sure you want to clear the history?"
-msgstr ""
-
-#. Insert empty menu item
-#: ../panel-plugin/menu.c:272
-msgid "Clipboard is empty"
-msgstr ""
-
-#: ../panel-plugin/menu.c:360
-msgid "_Disable"
-msgstr ""
-
-#: ../panel-plugin/plugin.c:323
-msgid "Contributors:"
-msgstr ""
-
-#: ../panel-plugin/plugin.c:337
-msgid "Clipboard Manager for Xfce"
-msgstr ""
-
-#: ../panel-plugin/plugin.c:346
-msgid "translator-credits"
-msgstr ""
-
-#: ../panel-plugin/plugin.c:360
-msgid "Unable to open the settings dialog"
-msgstr ""
More information about the Xfce4-commits
mailing list