r17897 - in /desktop/experimental/seahorse-plugins/debian: changelog control control.in rules seahorse-plugins.Xsession seahorse.Xsession

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Dec  9 21:48:47 2008
New Revision: 17897

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17897
Log:
* Rename 60seahorse-plugins to 60seahorse so that the file can be 
  transparently replaced across packages. (We already replace seahorse 
  < 2.24).
* Require nautilus 2.22 and epiphany 2.24 to be sure to build the 
  plugins for the correct versions.
* Depend on seahorse.

Added:
    desktop/experimental/seahorse-plugins/debian/seahorse.Xsession   (props changed)
      - copied unchanged from r17893, desktop/experimental/seahorse-plugins/debian/seahorse-plugins.Xsession
Removed:
    desktop/experimental/seahorse-plugins/debian/seahorse-plugins.Xsession
Modified:
    desktop/experimental/seahorse-plugins/debian/changelog
    desktop/experimental/seahorse-plugins/debian/control
    desktop/experimental/seahorse-plugins/debian/control.in
    desktop/experimental/seahorse-plugins/debian/rules

Modified: desktop/experimental/seahorse-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/changelog?rev=17897&op=diff
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/changelog (original)
+++ desktop/experimental/seahorse-plugins/debian/changelog Tue Dec  9 21:48:47 2008
@@ -1,5 +1,6 @@
 seahorse-plugins (2.24.1-1) experimental; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * Initial upload to Debian (Closes: #506895).
   * debian/control.in: Update description, maintainer, add Vcs-* and
     Homepage fields, update build-dependencies.
@@ -8,7 +9,15 @@
   * debian/rules: Add missing hack to remove the mime catalog, from the
     seahorse package.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 25 Nov 2008 19:53:27 +0100
+  [ Josselin Mouette ]
+  * Rename 60seahorse-plugins to 60seahorse so that the file can be 
+    transparently replaced across packages. (We already replace seahorse 
+    < 2.24).
+  * Require nautilus 2.22 and epiphany 2.24 to be sure to build the 
+    plugins for the correct versions.
+  * Depend on seahorse.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 09 Dec 2008 22:42:45 +0100
 
 seahorse-plugins (2.24.1-0ubuntu1) intrepid; urgency=low
 

Modified: desktop/experimental/seahorse-plugins/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/control?rev=17897&op=diff
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/control (original)
+++ desktop/experimental/seahorse-plugins/debian/control Tue Dec  9 21:48:47 2008
@@ -21,8 +21,8 @@
                libxml2-dev (>= 2.6.0),
                libebook1.2-dev (>= 1.7.90),
                gnome-pkg-tools,
-               libnautilus-extension-dev (>= 2.12.0),
-               epiphany-browser-dev (>= 2.22.2),
+               libnautilus-extension-dev (>= 2.22),
+               epiphany-browser-dev (>= 2.24),
                xulrunner-dev (>= 1.9~rc1)
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/seahorse-plugins
@@ -33,8 +33,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: openssh-client,
-            seahorse (>= 2.24.0)
+         seahorse (>= 2.24.0)
+Recommends: openssh-client
 Replaces: seahorse (<< 2.24.0)
 Description: seahorse plugins and utilities for encryption in GNOME
  Seahorse is a front end for GnuPG - the Gnu Privacy Guard program -

Modified: desktop/experimental/seahorse-plugins/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/control.in?rev=17897&op=diff
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/control.in (original)
+++ desktop/experimental/seahorse-plugins/debian/control.in Tue Dec  9 21:48:47 2008
@@ -21,8 +21,8 @@
                libxml2-dev (>= 2.6.0),
                libebook1.2-dev (>= 1.7.90),
                gnome-pkg-tools,
-               libnautilus-extension-dev (>= 2.12.0),
-               epiphany-browser-dev (>= 2.22.2),
+               libnautilus-extension-dev (>= 2.22),
+               epiphany-browser-dev (>= 2.24),
                xulrunner-dev (>= 1.9~rc1)
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/seahorse-plugins
@@ -33,8 +33,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: openssh-client,
-            seahorse (>= 2.24.0)
+         seahorse (>= 2.24.0)
+Recommends: openssh-client
 Replaces: seahorse (<< 2.24.0)
 Description: seahorse plugins and utilities for encryption in GNOME
  Seahorse is a front end for GnuPG - the Gnu Privacy Guard program -

Modified: desktop/experimental/seahorse-plugins/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/rules?rev=17897&op=diff
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/rules (original)
+++ desktop/experimental/seahorse-plugins/debian/rules Tue Dec  9 21:48:47 2008
@@ -14,8 +14,8 @@
 
 binary-post-install/seahorse-plugins::
 	mkdir -p $(CURDIR)/debian/seahorse-plugins/etc/X11/Xsession.d
-	cp debian/seahorse-plugins.Xsession \
-		$(CURDIR)/debian/seahorse-plugins/etc/X11/Xsession.d/60seahorse-plugins
+	cp debian/seahorse.Xsession \
+		$(CURDIR)/debian/seahorse-plugins/etc/X11/Xsession.d/60seahorse
 	find debian/seahorse-plugins -name '*.a' -exec rm -f {} \;
 	find debian/seahorse-plugins -name '*.la' -exec rm -f {} \;
 	# Remove mime-type catalog, it's in shared-mime-info since 0.20

Propchange: desktop/experimental/seahorse-plugins/debian/seahorse.Xsession
------------------------------------------------------------------------------
    svn:mergeinfo =