r33537 - in /desktop/experimental/gjs/debian: control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Mar 26 03:58:24 2012
New Revision: 33537

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33537
Log:
Drop Conflicts/Replaces from gir1.2-gjs-1.0

since there is no actual file conflict.
The previous typelib files were in a package private directory.

Modified:
    desktop/experimental/gjs/debian/control
    desktop/experimental/gjs/debian/control.in

Modified: desktop/experimental/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/control?rev=33537&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/control [utf-8] (original)
+++ desktop/experimental/gjs/debian/control [utf-8] Mon Mar 26 03:58:24 2012
@@ -30,7 +30,8 @@
 
 Package: gjs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
  libraries using the Javascript language. It's mainly based on the
@@ -41,7 +42,8 @@
 Package: libgjs0b
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Conflicts: libgjs0, libgjs0a
 Replaces: libgjs0, libgjs0a
 Provides: ${gjs:Provides}
@@ -75,8 +77,6 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libgjs0b (<< 1.31.10)
-Replaces: libgjs0b (<< 1.31.10)
 Description: GObject introspection data for GJS
  Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform

Modified: desktop/experimental/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/control.in?rev=33537&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gjs/debian/control.in [utf-8] Mon Mar 26 03:58:24 2012
@@ -25,7 +25,8 @@
 
 Package: gjs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
  libraries using the Javascript language. It's mainly based on the
@@ -36,7 +37,8 @@
 Package: libgjs0b
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Conflicts: libgjs0, libgjs0a
 Replaces: libgjs0, libgjs0a
 Provides: ${gjs:Provides}
@@ -70,8 +72,6 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libgjs0b (<< 1.31.10)
-Replaces: libgjs0b (<< 1.31.10)
 Description: GObject introspection data for GJS
  Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform