r17717 - in /desktop/experimental/seahorse/debian: changelog control control.in install libcryptui-dev.install libcryptui0.install rules seahorse.Xsession seahorse.install seahorse.preinst

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Tue Nov 25 17:35:29 UTC 2008 

Author: pochu-guest
Date: Tue Nov 25 17:35:29 2008
New Revision: 17717

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17717
Log:
 * Remove mentions to the gone code from the description.
 * Add libgcrypt{0,-dev} packages. Taken from Ubuntu.
 * seahorse suggests seahorse-plugins.
 * debian/seahorse.Xsession,
   debian/seahorse.preinst:
   - Remove the Xsession file, as the agent is now in seahorse-plugins.
     Also, remove the conffile on upgrades. Taken from Ubuntu.

Added:
    desktop/experimental/seahorse/debian/libcryptui-dev.install
    desktop/experimental/seahorse/debian/libcryptui0.install
    desktop/experimental/seahorse/debian/seahorse.install
    desktop/experimental/seahorse/debian/seahorse.preinst
Removed:
    desktop/experimental/seahorse/debian/install
    desktop/experimental/seahorse/debian/seahorse.Xsession
Modified:
    desktop/experimental/seahorse/debian/changelog
    desktop/experimental/seahorse/debian/control
    desktop/experimental/seahorse/debian/control.in
    desktop/experimental/seahorse/debian/rules

Modified: desktop/experimental/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/changelog?rev=17717&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/changelog (original)
+++ desktop/experimental/seahorse/debian/changelog Tue Nov 25 17:35:29 2008
@@ -14,8 +14,15 @@
     - debian/patches/70_relibtoolize.patch:
       + Turn it into 90_autoconf.patch and generate it running autoconf.
     - Enable key sharing support.
-
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 25 Nov 2008 11:46:00 +0100
+   * Remove mentions to the gone code from the description.
+   * Add libgcrypt{0,-dev} packages. Taken from Ubuntu.
+   * seahorse suggests seahorse-plugins.
+   * debian/seahorse.Xsession,
+     debian/seahorse.preinst:
+     - Remove the Xsession file, as the agent is now in seahorse-plugins.
+       Also, remove the conffile on upgrades. Taken from Ubuntu.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 25 Nov 2008 18:34:18 +0100
 
 seahorse (2.22.3-2) unstable; urgency=low
 

Modified: desktop/experimental/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/control?rev=17717&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/control (original)
+++ desktop/experimental/seahorse/debian/control Tue Nov 25 17:35:29 2008
@@ -31,14 +31,41 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnupg (>= 1.4.7)
-Recommends: openssh-client
+Recommends: openssh-client,
+Suggests: seahorse-plugins
 Description: GNOME front end for GnuPG
- 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 
+ 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.
+
+Package: libcryptui0
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Section: libs
+Replaces: seahorse (<< 2.23.6-0ubuntu2)
+Description: the 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.
  .
- In addition it includes a Gedit plugin, can handle files using Nautilus,
- an applet for manging stuff put in the clipboard and an agent for storing 
- private passphrases, as well as a GnuPG and OpenSSH key manager.
+ This package contains the shared library.
+
+Package: libcryptui-dev
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libcryptui0 (= ${binary:Version})
+Section: libdevel
+Description: the 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

Modified: desktop/experimental/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/control.in?rev=17717&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/control.in (original)
+++ desktop/experimental/seahorse/debian/control.in Tue Nov 25 17:35:29 2008
@@ -31,14 +31,41 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnupg (>= 1.4.7)
-Recommends: openssh-client
+Recommends: openssh-client,
+Suggests: seahorse-plugins
 Description: GNOME front end for GnuPG
- 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 
+ 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.
+
+Package: libcryptui0
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Section: libs
+Replaces: seahorse (<< 2.23.6-0ubuntu2)
+Description: the 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.
  .
- In addition it includes a Gedit plugin, can handle files using Nautilus,
- an applet for manging stuff put in the clipboard and an agent for storing 
- private passphrases, as well as a GnuPG and OpenSSH key manager.
+ This package contains the shared library.
+
+Package: libcryptui-dev
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libcryptui0 (= ${binary:Version})
+Section: libdevel
+Description: the 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

Added: desktop/experimental/seahorse/debian/libcryptui-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/libcryptui-dev.install?rev=17717&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/libcryptui-dev.install (added)
+++ desktop/experimental/seahorse/debian/libcryptui-dev.install Tue Nov 25 17:35:29 2008
@@ -1,0 +1,3 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/pkgconfig

Added: desktop/experimental/seahorse/debian/libcryptui0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/libcryptui0.install?rev=17717&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/libcryptui0.install (added)
+++ desktop/experimental/seahorse/debian/libcryptui0.install Tue Nov 25 17:35:29 2008
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libcryptui.so.*

Modified: desktop/experimental/seahorse/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/rules?rev=17717&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/rules (original)
+++ desktop/experimental/seahorse/debian/rules Tue Nov 25 17:35:29 2008
@@ -15,8 +15,6 @@
 			     --enable-pgp
 
 binary-post-install/seahorse::
-	mkdir -p $(CURDIR)/debian/seahorse/etc/X11/Xsession.d
-	cp debian/seahorse.Xsession $(CURDIR)/debian/seahorse/etc/X11/Xsession.d/60seahorse
 	# Remove mime-type catalog, it's in shared-mime-info since 0.20
 	rm -f debian/seahorse/usr/share/mime/packages/seahorse.xml
 	# Remove library link

Added: desktop/experimental/seahorse/debian/seahorse.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/seahorse.install?rev=17717&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/seahorse.install (added)
+++ desktop/experimental/seahorse/debian/seahorse.install Tue Nov 25 17:35:29 2008
@@ -1,0 +1,5 @@
+debian/seahorse.xpm /usr/share/pixmaps
+debian/tmp/etc
+debian/tmp/usr/bin
+debian/tmp/usr/lib/seahorse
+debian/tmp/usr/share

Added: desktop/experimental/seahorse/debian/seahorse.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/seahorse.preinst?rev=17717&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/seahorse.preinst (added)
+++ desktop/experimental/seahorse/debian/seahorse.preinst Tue Nov 25 17:35:29 2008
@@ -1,0 +1,29 @@
+#!/bin/sh
+set -e
+
+rm_conffile() {
+    PKGNAME="$1"
+    CONFFILE="$2"
+
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+	old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`"
+        if [ "$md5sum" != "$old_md5sum" ]; then
+            echo "Obsolete conffile $CONFFILE has been modified by you."
+            echo "Saving as $CONFFILE.dpkg-bak ..."
+            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+        else
+            echo "Removing obsolete conffile $CONFFILE ..."
+            rm -f "$CONFFILE"
+        fi
+    fi
+}
+
+case "$1" in
+    install|upgrade)
+    if dpkg --compare-versions "$2" le "2.23.5-0ubuntu1"; then
+       rm_conffile seahorse "/etc/X11/Xsession.d/60seahorse"
+    fi
+esac
+
+#DEBHELPER#

More information about the pkg-gnome-commits mailing list