r17713 - in /desktop/experimental/vinagre/debian: changelog control control.in vinagre-common.install vinagre.install

[pochu-guest at users.alioth.debian.org]

Author: pochu-guest
Date: Tue Nov 25 12:20:30 2008
New Revision: 17713

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17713
Log:
revert vinagre-common split

Removed:
    desktop/experimental/vinagre/debian/vinagre-common.install
    desktop/experimental/vinagre/debian/vinagre.install
Modified:
    desktop/experimental/vinagre/debian/changelog
    desktop/experimental/vinagre/debian/control
    desktop/experimental/vinagre/debian/control.in

Modified: desktop/experimental/vinagre/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/changelog?rev=17713&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/changelog (original)
+++ desktop/experimental/vinagre/debian/changelog Tue Nov 25 12:20:30 2008
@@ -2,13 +2,8 @@
 
   * New upstream release.
     - Update build dependencies.
-  * debian/control.in, debian/rules, debian/vinagre.install,
-    debian-common.install:
-    - Add a vinagre-common package for the arch:all files, but keep
-      installing the manpage and the desktop files in the vinagre package,
-      together with the binary.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Mon, 24 Nov 2008 00:24:55 +0100
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 25 Nov 2008 12:00:14 +0100
 
 vinagre (2.23.4-1) experimental; urgency=low
 

Modified: desktop/experimental/vinagre/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/control?rev=17713&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/control (original)
+++ desktop/experimental/vinagre/debian/control Tue Nov 25 12:20:30 2008
@@ -26,8 +26,7 @@
 Package: vinagre
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         vinagre-common (= ${source:Version})
+         ${misc:Depends}
 Description: VNC client for the GNOME Desktop
  Vinagre is a VNC client integrated into the GNOME Desktop.
  .
@@ -39,22 +38,3 @@
  A Virtual Network Computing (VNC) server is a computer sharing its
  screen to the network, so anyone with enough permissions can control
  it remotely.
-
-Package: vinagre-common
-Architecture: all
-Replaces: vinagre (<= 2.23.4-1)
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: VNC client for the GNOME Desktop (common files)
- Vinagre is a VNC client integrated into the GNOME Desktop.
- .
- With Vinagre you can have several connections open simultaneously,
- bookmark your servers thanks to the Favorites support, store the
- passwords in the GNOME keyring, and browse the network to look for
- VNC servers.
- .
- A Virtual Network Computing (VNC) server is a computer sharing its
- screen to the network, so anyone with enough permissions can control
- it remotely.
- .
- This package contains the help files and other common files.

Modified: desktop/experimental/vinagre/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vinagre/debian/control.in?rev=17713&op=diff
==============================================================================
--- desktop/experimental/vinagre/debian/control.in (original)
+++ desktop/experimental/vinagre/debian/control.in Tue Nov 25 12:20:30 2008
@@ -26,8 +26,7 @@
 Package: vinagre
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         vinagre-common (= ${source:Version})
+         ${misc:Depends}
 Description: VNC client for the GNOME Desktop
  Vinagre is a VNC client integrated into the GNOME Desktop.
  .
@@ -39,22 +38,3 @@
  A Virtual Network Computing (VNC) server is a computer sharing its
  screen to the network, so anyone with enough permissions can control
  it remotely.
-
-Package: vinagre-common
-Architecture: all
-Replaces: vinagre (<= 2.23.4-1)
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: VNC client for the GNOME Desktop (common files)
- Vinagre is a VNC client integrated into the GNOME Desktop.
- .
- With Vinagre you can have several connections open simultaneously,
- bookmark your servers thanks to the Favorites support, store the
- passwords in the GNOME keyring, and browse the network to look for
- VNC servers.
- .
- A Virtual Network Computing (VNC) server is a computer sharing its
- screen to the network, so anyone with enough permissions can control
- it remotely.
- .
- This package contains the help files and other common files.