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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue May 31 21:40:09 UTC 2011


Author: joss
Date: Tue May 31 21:40:08 2011
New Revision: 28142

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28142
Log:
Rename libnautilus-extension1 to libnautilus-extension1a, and add 
appropriate Replaces/Conflicts. Closes: #627361.

Added:
    desktop/experimental/nautilus/debian/libnautilus-extension1a.install
      - copied unchanged from r28139, desktop/experimental/nautilus/debian/libnautilus-extension1.install
Removed:
    desktop/experimental/nautilus/debian/libnautilus-extension1.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=28142&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Tue May 31 21:40:08 2011
@@ -1,3 +1,10 @@
+nautilus (3.0.2-2) experimental; urgency=low
+
+  * Rename libnautilus-extension1 to libnautilus-extension1a, and add 
+    appropriate Replaces/Conflicts. Closes: #627361.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 31 May 2011 23:39:28 +0200
+
 nautilus (3.0.2-1) experimental; urgency=low
 
   * Rebuild against a cdbs+debhelper with dh_installgsettings.

Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=28142&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control [utf-8] Tue May 31 21:40:08 2011
@@ -102,30 +102,14 @@
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
  
-Package: libnautilus-extension1
+Package: libnautilus-extension1a
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libnautilus2-2
-Breaks: nautilus (<< 3.0),
-        gnome-disk-utility (<< 3.0),
-        brasero (<< 2.91),
-        gnome-mount (<< 0.8),
-        nautilus-cd-burner (<< 2.22),
-        file-roller (<< 3.0),
-        python-nautilus (<< 0.5),
-        nautilus-sendto (<< 3),
-        nautilus-open-terminal (<< 0.9),
-        nautilus-image-converter (<< 0.3),
-        nautilus-filename-repairer (<< 0.0.5-2),
-        eiciel (<< 0.9.6.1-3),
-        diff-ext (<= 0.2.3-3),
-        nautilus-gksu (<< 2.0.2-2+b1),
-        nautilus-actions (<< 1.4.1-1+b1),
-        nautilus-share (<< 0.7.2-4+b1),
-        seahorse-plugins (<< 2.24.1-3+b1)
-Replaces: libnautilus2-2
+Conflicts: libnautilus-extension1
+Replaces: libnautilus-extension1
+Breaks: nautilus (<< 3.0)
 Description: libraries for nautilus components - runtime version
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.
@@ -135,7 +119,7 @@
 Package: libnautilus-extension-dev
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1 (= ${binary:Version}),
+Depends: libnautilus-extension1a (= ${binary:Version}),
          gir1.2-nautilus-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.27.5),
          libgtk-3-dev (>= 3.0.0),

Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=28142&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control.in [utf-8] Tue May 31 21:40:08 2011
@@ -97,30 +97,14 @@
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
  
-Package: libnautilus-extension1
+Package: libnautilus-extension1a
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libnautilus2-2
-Breaks: nautilus (<< 3.0),
-        gnome-disk-utility (<< 3.0),
-        brasero (<< 2.91),
-        gnome-mount (<< 0.8),
-        nautilus-cd-burner (<< 2.22),
-        file-roller (<< 3.0),
-        python-nautilus (<< 0.5),
-        nautilus-sendto (<< 3),
-        nautilus-open-terminal (<< 0.9),
-        nautilus-image-converter (<< 0.3),
-        nautilus-filename-repairer (<< 0.0.5-2),
-        eiciel (<< 0.9.6.1-3),
-        diff-ext (<= 0.2.3-3),
-        nautilus-gksu (<< 2.0.2-2+b1),
-        nautilus-actions (<< 1.4.1-1+b1),
-        nautilus-share (<< 0.7.2-4+b1),
-        seahorse-plugins (<< 2.24.1-3+b1)
-Replaces: libnautilus2-2
+Conflicts: libnautilus-extension1
+Replaces: libnautilus-extension1
+Breaks: nautilus (<< 3.0)
 Description: libraries for nautilus components - runtime version
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.
@@ -130,7 +114,7 @@
 Package: libnautilus-extension-dev
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1 (= ${binary:Version}),
+Depends: libnautilus-extension1a (= ${binary:Version}),
          gir1.2-nautilus-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.27.5),
          libgtk-3-dev (>= 3.0.0),

Modified: desktop/experimental/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/rules?rev=28142&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/rules [utf-8] (original)
+++ desktop/experimental/nautilus/debian/rules [utf-8] Tue May 31 21:40:08 2011
@@ -14,7 +14,7 @@
                              --disable-packagekit \
                              --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.91)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1a += -V 'libnautilus-extension1a (>= 2.91)'
 DEB_DH_MAKESHLIBS_ARGS_nautilus += -Xusr/lib/nautilus/extensions-3.0/
 
 binary-post-install/nautilus-data::




More information about the pkg-gnome-commits mailing list