r17683 - in /desktop/experimental/nautilus/debian: changelog control control.in libnautilus-extension1.install libnautilus-extension1a.install rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov 23 22:08:56 2008
New Revision: 17683

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17683
Log:
Revert libnautilus-extension1a move, we’ll do it with conflicts instead.

Added:
    desktop/experimental/nautilus/debian/libnautilus-extension1.install
      - copied unchanged from r16657, desktop/experimental/nautilus/debian/libnautilus-extension1.install
Removed:
    desktop/experimental/nautilus/debian/libnautilus-extension1a.install
Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/control
    desktop/experimental/nautilus/debian/control.in
    desktop/experimental/nautilus/debian/rules

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=17683&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Sun Nov 23 22:08:56 2008
@@ -5,13 +5,6 @@
   - updated to the new version
 
  -- Gustavo Noronha Silva <kov at debian.org>  Tue, 23 Sep 2008 00:05:26 -0300
-
-nautilus (2.22.5.1-2) UNRELEASED; urgency=low
-
-  * Rename libnautilus-extension1 to libnautilus-extension1a as the ABI 
-    has changed in an incompatible way. Closes: #493665.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 26 Jul 2008 14:19:57 +0200
 
 nautilus (2.22.5.1-1) experimental; urgency=low
 

Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=17683&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control (original)
+++ desktop/experimental/nautilus/debian/control Sun Nov 23 22:08:56 2008
@@ -91,13 +91,13 @@
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
  
-Package: libnautilus-extension1a
+Package: libnautilus-extension1
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libnautilus2-2, libnautilus-extension1
-Replaces: libnautilus2-2, libnautilus-extension1
+Conflicts: libnautilus2-2
+Replaces: libnautilus2-2
 Description: libraries for nautilus components - runtime version
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.
@@ -107,7 +107,7 @@
 Package: libnautilus-extension-dev
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1a (= ${binary:Version}),
+Depends: libnautilus-extension1 (= ${binary:Version}),
          libglib2.0-dev (>= 2.15.6),
          libgtk2.0-dev (>= 2.10.0),
          ${shlibs:Depends}

Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=17683&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in (original)
+++ desktop/experimental/nautilus/debian/control.in Sun Nov 23 22:08:56 2008
@@ -91,13 +91,13 @@
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
  
-Package: libnautilus-extension1a
+Package: libnautilus-extension1
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libnautilus2-2, libnautilus-extension1
-Replaces: libnautilus2-2, libnautilus-extension1
+Conflicts: libnautilus2-2
+Replaces: libnautilus2-2
 Description: libraries for nautilus components - runtime version
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.
@@ -107,7 +107,7 @@
 Package: libnautilus-extension-dev
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1a (= ${binary:Version}),
+Depends: libnautilus-extension1 (= ${binary:Version}),
          libglib2.0-dev (>= 2.15.6),
          libgtk2.0-dev (>= 2.10.0),
          ${shlibs:Depends}

Modified: desktop/experimental/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/rules?rev=17683&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/rules (original)
+++ desktop/experimental/nautilus/debian/rules Sun Nov 23 22:08:56 2008
@@ -15,7 +15,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus --disable-update-mimedb
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1a += -V 'libnautilus-extension1 (>= 2.21.6)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.21.6)'
 
 binary-post-install/nautilus-data::
 	dh_installmime -p$(cdbs_curpkg)