r31385 - in /desktop/unstable/seahorse/debian: ./ patches/

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Mon Nov 14 00:11:35 UTC 2011


Author: jordi
Date: Mon Nov 14 00:11:34 2011
New Revision: 31385

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31385
Log:
* New upstream release.
* Bump Build-Deps for GCK and GCR.
* Remove obsolete Replaces.
* Drop libcryptui and gir1.2 packages (moved to its own source).
* Drop our manpage, it was merged upstream ages ago.
* Update copyright file, remove full GFDL text and point to common
  licenses.
* Watch for .xz tarballs.
* Don't request GTK+3.0 on configure, its the only version supported.
* Likewise for libnotify, it's gone with libcryptui.
* Drop seahorse.install, as it's the only binary.
* Drop 01_autostart_path.patch: obsolete.

Removed:
    desktop/unstable/seahorse/debian/gir1.2-cryptui-0.0.install
    desktop/unstable/seahorse/debian/libcryptui-dev.install
    desktop/unstable/seahorse/debian/libcryptui0a.install
    desktop/unstable/seahorse/debian/patches/01_autostart_path.patch
    desktop/unstable/seahorse/debian/seahorse.1
    desktop/unstable/seahorse/debian/seahorse.install
    desktop/unstable/seahorse/debian/seahorse.manpages
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/control
    desktop/unstable/seahorse/debian/control.in
    desktop/unstable/seahorse/debian/copyright
    desktop/unstable/seahorse/debian/patches/08_force_ssh.patch
    desktop/unstable/seahorse/debian/patches/series
    desktop/unstable/seahorse/debian/rules
    desktop/unstable/seahorse/debian/watch

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Mon Nov 14 00:11:34 2011
@@ -1,3 +1,20 @@
+seahorse (3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Bump Build-Deps for GCK and GCR.
+  * Remove obsolete Replaces.
+  * Drop libcryptui and gir1.2 packages (moved to its own source).
+  * Drop our manpage, it was merged upstream ages ago.
+  * Update copyright file, remove full GFDL text and point to common
+    licenses.
+  * Watch for .xz tarballs.
+  * Don't request GTK+3.0 on configure, its the only version supported.
+  * Likewise for libnotify, it's gone with libcryptui.
+  * Drop seahorse.install, as it's the only binary.
+  * Drop 01_autostart_path.patch: obsolete.
+
+ -- Jordi Mallach <jordi at debian.org>  Sun, 13 Nov 2011 22:59:32 +0100
+
 seahorse (3.0.2-1) unstable; urgency=low
 
   * New upstream stable release.

Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Mon Nov 14 00:11:34 2011
@@ -13,8 +13,8 @@
                dh-autoreconf,
                scrollkeeper,
                libgpgme11-dev (>= 1.0.0),
-               libgck-dev (>= 3.0.0),
-               libgcr-3-dev (>= 3.0.0),
+               libgck-dev (>= 3.1.2),
+               libgcr-3-dev (>= 3.1.5),
                intltool (>= 0.35),
                libsoup2.4-dev,
                libldap2-dev,
@@ -26,7 +26,7 @@
                libgnome-keyring-dev (>= 3.0.0),
                libglib2.0-dev (>= 2.10.0),
                libgtk-3-dev (>= 2.90.0),
-#               libnotify-dev (>= 0.7),
+               libnotify-dev (>= 0.7),
                libgconf2-dev,
                gobject-introspection (>= 0.6.4),
                libgirepository1.0-dev (>= 0.6.4),

Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Mon Nov 14 00:11:34 2011
@@ -1,15 +1,15 @@
 Source: seahorse
 Section: gnome
 Priority: optional
-Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
-               cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.41),
+               debhelper (>= 8),
                dh-autoreconf,
                scrollkeeper,
                libgpgme11-dev (>= 1.0.0),
-               libgck-dev (>= 3.0.0),
-               libgcr-3-dev (>= 3.0.0),
+               libgck-dev (>= 3.1.2),
+               libgcr-3-dev (>= 3.1.5),
                intltool (>= 0.35),
                libsoup2.4-dev,
                libldap2-dev,
@@ -21,16 +21,11 @@
                libgnome-keyring-dev (>= 3.0.0),
                libglib2.0-dev (>= 2.10.0),
                libgtk-3-dev (>= 2.90.0),
-#               libnotify-dev (>= 0.7),
-               libgconf2-dev,
-               gobject-introspection (>= 0.6.4),
-               libgirepository1.0-dev (>= 0.6.4),
-               gir1.2-gtk-3.0,
                gnome-pkg-tools
 Build-Conflicts: gnupg2
 Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/seahorse/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/
 Homepage: http://live.gnome.org/Seahorse
 
 Package: seahorse
@@ -46,56 +41,3 @@
  communications and data storage.  Data encryption and digital signature
  creation can easily be performed through a GUI and Key Management
  operations can easily be carried out through an intuitive interface.
-
-Package: libcryptui0a
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Replaces: seahorse (<< 2.23.6-0ubuntu2)
-Conflicts: libcryptui0
-Description: UI library for DBUS functions exported by seahorse
- Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
- that integrates to the GNOME desktop. It is a tool for secure
- communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
- operations can easily be carried out through an intuitive interface.
- .
- This package contains the shared library.
-
-Package: libcryptui-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libglib2.0-dev (>= 2.10.0),
-         libgtk-3-dev (>= 2.90.0),
-         libgconf2-dev,
-         libcryptui0a (= ${binary:Version}),
-         gir1.2-cryptui-0.0 (= ${binary:Version})
-Description: UI library for DBUS functions exported by seahorse (development)
- Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
- that integrates to the GNOME desktop. It is a tool for secure
- communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
- operations can easily be carried out through an intuitive interface.
- .
- This package contains the development files for the library.
-
-Package: gir1.2-cryptui-0.0
-Architecture: any
-Section: libs
-Depends: ${gir:Depends},
-         ${misc:Depends}
-Description: GObject introspection data for the Seahorse CryptUI library
- Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
- that integrates to the GNOME desktop. It is a tool for secure
- communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key Management
- operations can easily be carried out through an intuitive interface.
- .
- This package contains introspection data for the Seahorse CryptUI
- library.
- .
- It can be used by packages using the GIRepository format to generate
- dynamic bindings.

Modified: desktop/unstable/seahorse/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/copyright?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/copyright [utf-8] (original)
+++ desktop/unstable/seahorse/debian/copyright [utf-8] Mon Nov 14 00:11:34 2011
@@ -1,15 +1,16 @@
 This package was debianized by Jose Carlos Garcia Sogo <jsogo at debian.org> on
 Mon, 17 Jan 2003 20:14:10 +0100.
 
-It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse
+It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse/
 
 Upstream Authors: Nate Nielsen <nielsen at memberwebs.com>, Adam Schreiber <sadam at clemson.edu>
 
-Copyright (C) 2001, 2002 Jose Carlos Garcia Sogo
-Copyright (C) 2002, 2003 Jacob Perkins
-Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber
+Copyright © 2001, 2002 Jose Carlos Garcia Sogo
+Copyright © 2002, 2003 Jacob Perkins
+Copyright © 2004, 2006 Nate Nielsen, Adam Schreiber
+Copyright © 2005-2011 Stef Walter
 
-Main License (everything except docs and libcryptui):
+Main License (everything except docs):
 
     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
@@ -28,382 +29,14 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The libcryptui code is covered by LGPL-2.1:
+Documentation and help files are covered by GFDL 1.1 license, with no
+invariant sections of front or back-covers.
 
-   This program is free software; you can redistribute it and/or modify 
-   it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-    
-   This program 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
-   Lesser General Public License for more details.
-    
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301, USA.
+    Copyright © 2005-2011 Stef Walter.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.1
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, Front-Cover or Back-Cover Texts.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-Documentation and help files are covered by GFDL 1.1 license.
-
-GFDL License:
-
-                GNU Free Documentation License
-                   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL-1.1'.

Modified: desktop/unstable/seahorse/debian/patches/08_force_ssh.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/08_force_ssh.patch?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/08_force_ssh.patch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/08_force_ssh.patch [utf-8] Mon Nov 14 00:11:34 2011
@@ -1,7 +1,7 @@
-Index: seahorse-3.0.2/configure.in
+Index: seahorse/configure.ac
 ===================================================================
---- seahorse-3.0.2.orig/configure.in	2011-05-22 14:48:49.000000000 +0200
-+++ seahorse-3.0.2/configure.in	2011-06-02 22:45:57.575607389 +0200
+--- seahorse/configure.ac	2011-05-22 14:48:49.000000000 +0200
++++ seahorse/configure.ac	2011-06-02 22:45:57.575607389 +0200
 @@ -496,16 +496,16 @@
      echo "disabling ssh support"
  else

Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series [utf-8] Mon Nov 14 00:11:34 2011
@@ -1,4 +1,3 @@
-01_autostart_path.patch
 08_force_ssh.patch
 30_preferences_menu.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/seahorse/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/rules?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/rules [utf-8] (original)
+++ desktop/unstable/seahorse/debian/rules [utf-8] Mon Nov 14 00:11:34 2011
@@ -12,6 +12,4 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mime-database \
 			     --disable-schemas-install \
 			     --disable-scrollkeeper \
-			     --disable-libnotify \
-			     --enable-pgp \
-			     --with-gtk=3.0
+			     --enable-pgp

Modified: desktop/unstable/seahorse/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/watch?rev=31385&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/watch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/watch [utf-8] Mon Nov 14 00:11:34 2011
@@ -1,2 +1,2 @@
-version=2
-http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+)[02468]/seahorse-([\d\.]+)\.tar\.bz2
+version=3
+http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+)[02468]/seahorse-([\d\.]+)\.tar\.xz




More information about the pkg-gnome-commits mailing list