r25434 - in /packages/unstable/gtranslator/debian: changelog control control.in copyright
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Mon Oct 25 18:45:29 UTC 2010
Author: jordi
Date: Mon Oct 25 18:45:22 2010
New Revision: 25434
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25434
Log:
Reverse merge r25424 to revert experimental changes.
Modified:
packages/unstable/gtranslator/debian/changelog
packages/unstable/gtranslator/debian/control
packages/unstable/gtranslator/debian/control.in
packages/unstable/gtranslator/debian/copyright
Modified: packages/unstable/gtranslator/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/changelog?rev=25434&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/changelog [utf-8] (original)
+++ packages/unstable/gtranslator/debian/changelog [utf-8] Mon Oct 25 18:45:22 2010
@@ -1,11 +1,6 @@
-gtranslator (1.9.12-1) UNRELEASED; urgency=low
-
- * New upstream release.
- * Bump Build-Depends for GLib and GTK+2, gtranslator has migrated to
- gsettings.
- * Update copyright. Thanks to Nacho Casal for pointing it out.
+gtranslator (1.9.11-2) UNRELEASED; urgency=low
+
* Remove Build-Depends on libdb-dev, gtranslator now uses libgda.
- * Bump Standards-Version to 3.9.1, no changes required.
-- Jordi Mallach <jordi at debian.org> Fri, 14 May 2010 10:43:31 +0200
Modified: packages/unstable/gtranslator/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/control?rev=25434&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/control [utf-8] (original)
+++ packages/unstable/gtranslator/debian/control [utf-8] Mon Oct 25 18:45:22 2010
@@ -14,19 +14,19 @@
gnome-doc-utils (>= 0.3.2),
gtk-doc-tools,
libgconf2-dev (>= 2.18.0),
- libgda-4.0-dev,
libgdl-1-dev (>= 2.26.0),
libgdict-1.0-dev (>= 0.11.0),
- libglib2.0-dev (>= 2.27),
+ libglib2.0-dev (>= 2.15.5),
libgtksourceview2.0-dev (>= 2.4.0),
- libgtk2.0-dev (>= 2.22),
+ libgtk2.0-dev (>= 2.18),
libgtkspell-dev (>= 2.0.2),
libgucharmap2-dev (>= 2.23.0),
libsoup2.4-dev (>= 2.4.0),
libunique-dev,
+ libgda-4.0-dev,
libxml2 (>= 2.4.12),
gnome-pkg-tools
-Standards-Version: 3.9.1
+Standards-Version: 3.8.4
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gtranslator
Homepage: http://gtranslator.sourceforge.net/
@@ -36,9 +36,9 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Description: PO-file editor for the GNOME Desktop
- GTranslator is a po file editor which makes translating gettext applications
+ Gtranslator is a po file editor which makes translating gettext applications
as easy as possible, even for people with no translation experience.
.
It supports the usage of translation memories, syntax highlighting, spell
- checking, undoing of insertions and deletions, and general integration with
+ checking, undoing of insertions and deletions and general integration with
the GNOME Desktop.
Modified: packages/unstable/gtranslator/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/control.in?rev=25434&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/control.in [utf-8] (original)
+++ packages/unstable/gtranslator/debian/control.in [utf-8] Mon Oct 25 18:45:22 2010
@@ -9,19 +9,19 @@
gnome-doc-utils (>= 0.3.2),
gtk-doc-tools,
libgconf2-dev (>= 2.18.0),
- libgda-4.0-dev,
libgdl-1-dev (>= 2.26.0),
libgdict-1.0-dev (>= 0.11.0),
- libglib2.0-dev (>= 2.27),
+ libglib2.0-dev (>= 2.15.5),
libgtksourceview2.0-dev (>= 2.4.0),
- libgtk2.0-dev (>= 2.22),
+ libgtk2.0-dev (>= 2.18),
libgtkspell-dev (>= 2.0.2),
libgucharmap2-dev (>= 2.23.0),
libsoup2.4-dev (>= 2.4.0),
libunique-dev,
+ libgda-4.0-dev,
libxml2 (>= 2.4.12),
gnome-pkg-tools
-Standards-Version: 3.9.1
+Standards-Version: 3.8.4
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gtranslator
Homepage: http://gtranslator.sourceforge.net/
@@ -31,9 +31,9 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Description: PO-file editor for the GNOME Desktop
- GTranslator is a po file editor which makes translating gettext applications
+ Gtranslator is a po file editor which makes translating gettext applications
as easy as possible, even for people with no translation experience.
.
It supports the usage of translation memories, syntax highlighting, spell
- checking, undoing of insertions and deletions, and general integration with
+ checking, undoing of insertions and deletions and general integration with
the GNOME Desktop.
Modified: packages/unstable/gtranslator/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/copyright?rev=25434&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/copyright [utf-8] (original)
+++ packages/unstable/gtranslator/debian/copyright [utf-8] Mon Oct 25 18:45:22 2010
@@ -22,7 +22,26 @@
Licence:
-The core of the package is licenced under the GNU GPL version 3:
+The core of the package is licenced under the GNU GPL version 2:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+On Debian systems, the complete text of the GNU General Public License,
+version 2, can be found in `/usr/share/common-licenses/GPL-2'.
+
+Some of the new code and plugins is licenced under the GNU GPL version 3:
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -37,25 +56,17 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
-Some plugins include code from the Gedit and libegg projects, and
-are licenced under the GNU GPL version 2:
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
-On Debian systems, the complete text of the GNU General Public License,
-version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-
On Debian systems, the complete text of the GNU General Public License,
version 3, can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Subversion plugin in plugins/subversion includes the following additional
+exception to allow linking against OpenSSL:
+
+ This plugin released under version 3 of General Public License.
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ The subversion plugin uses the OpenSSL library (c) Eric Young.
+ In addition, as a special exception, the copyright holders of this
+ plugin give permission to link the code of portions of this plugin with
+ the OpenSSL library.
More information about the pkg-gnome-commits
mailing list