Changeset 4488

Timestamp:

11/12/08 18:15:50 (5 years ago)

Author:

alanbach-guest

Message:

• Merged updates from Debian 2.24.0-1

Location:

pkg/boss/main/nautilus/trunk/debian

Files:

• changelog (modified) (3 diffs)
• control (modified) (7 diffs)
• control.in (modified) (6 diffs)
• libnautilus-extension1.install (deleted)
• libnautilus-extension1a.install (added)
• mount-archive.desktop (deleted)
• mount-archive.desktop.in (deleted)
• nautilus.1 (modified) (1 diff)
• nautilus.install (modified) (1 diff)
• patches/10_location_titlebar.patch (added)
• patches/14_sidebar_network-protocol.patch (added)
• patches/20_open-with_install.patch (added)
• patches/99_ltmain_as-needed.patch (modified) (3 diffs)
• patches/series (modified) (1 diff)
• po-up (added)
• po-up/POTFILES.in (added)
• po-up/cs.po (added)
• po-up/de.po (added)
• po-up/eu.po (added)
• po-up/fi.po (added)
• po-up/fr.po (added)
• po-up/it.po (added)
• po-up/nb.po (added)
• po-up/nn.po (added)
• po-up/patches.pot (added)
• po-up/pt.po (added)
• po-up/ru.po (added)
• po-up/sv.po (added)
• po-up/vi.po (added)
• rules (modified) (2 diffs)

pkg/boss/main/nautilus/trunk/debian/changelog

@@ -1 @@
-nautilus (2.24.1-parsix3) unstable; urgency=low
-
-  * Added 15_nautilus-gvfs-desktop-key.patch, 16_rtl-fix.patch
-    and 17_background-no-delay.patch from Fedora Project
-
- -- Alan Baghumian <alan@technotux.org>  Tue, 11 Nov 2008 15:34:28 -0800
-
-nautilus (2.24.1-parsix2) unstable; urgency=low
-
-  * Do not recommend gnome-app-install
-
- -- Alan Baghumian <alan@technotux.org>  Mon, 03 Nov 2008 20:51:29 -0800
-
-nautilus (2.24.1-parsix1) unstable; urgency=low
-
-  * Merged updates from Ubuntu 1:2.24.1-0ubuntu1
-  * Bump standards version to 3.8.0.1
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 31 Oct 2008 23:00:07 -0700
-
-nautilus (2.22.5.1-parsix2) unstable; urgency=low
-
-  * Removed app-install-data from recommends
-
- -- Alan Baghumian <alan@memphis-mobile>  Sun, 13 Jul 2008 15:41:30 +0200
-
-nautilus (2.22.5.1-parsix1) unstable; urgency=low
-
-  * Merged updates from Debian 2.22.5.1-1
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 13 Jul 2008 14:55:33 +0200
+nautilus (2.24.1-parsix4) unstable; urgency=low
+
+  * Merged updates from Debian 2.24.0-1
+
+ -- Alan Baghumian <alan@technotux.org>  Wed, 12 Nov 2008 09:09:30 -0800
+
+nautilus (2.24.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/20_open-with_install.patch:
+  - updated to the new version
+
+ -- Gustavo Noronha Silva <kov@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@debian.org>  Sat, 26 Jul 2008 14:19:57 +0200
 
 nautilus (2.22.5.1-1) experimental; urgency=low
@@ -117 +106 @@
 
 nautilus (2.22.0-1) experimental; urgency=low
-
-  [ Loic Minier ]
-  * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that
-    nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0;
-    this might avoid a long list of Conflicts in nautilus when updating to
-    extensions-2.0 (nautilus >= 2.21.2).
-
-  [ Josselin Mouette ]
-  * Demote fam to a Suggests; only g-d-e really needs to recommend it.
 
   [ Sebastian Dröge ]
@@ -161 +141 @@
  -- Sebastian Dröge <slomo@debian.org>  Sun, 16 Mar 2008 20:30:48 +0100
 
+nautilus (2.20.0-7) unstable; urgency=low
+
+  * 25_disable_sighandler.patch: patch from upstream SVN. Disable the 
+    horrible signal handler that makes nautilus go wild while filling 
+    its debug log. Closes: #454764, #494788.
+  * Don’t require libselinux on non-linux OSes. Closes: #494645.
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 16 Sep 2008 08:15:05 +0200
+
+nautilus (2.20.0-6) unstable; urgency=low
+
+  * 24_smb_crash.patch: patch from upstream to handle NULL MIME types 
+    set by the SMB module gracefully, avoiding a lot of crashes.
+
+ -- Josselin Mouette <joss@debian.org>  Mon, 21 Jul 2008 17:09:01 +0200
+
+nautilus (2.20.0-5) unstable; urgency=low
+
+  * 05_places-sidebar_single-click.patch: replaced by upstream version 
+    of the patch, that does not activate items while right-clicking 
+    them. Closes: #414960.
+  * 06_dont_create_Desktop.patch, 
+    20_upstream_nautilus-dnd-user-owned.patch: make patches apply with 
+    -p1. Closes: #484953.
+  * Recommend app-install-data and synaptic now that libeel doesn’t 
+    anymore.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 18 Jul 2008 13:27:27 +0200
+
+nautilus (2.20.0-4) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that
+    nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0;
+    this might avoid a long list of Conflicts in nautilus when updating to
+    extensions-2.0 (nautilus >= 2.21.2).
+
+  [ Josselin Mouette ]
+  * Demote fam to a Suggests; only g-d-e really needs to recommend it.
+  * 02_trash_location.patch: new patch. When unmounting a volume with a 
+    non-empty trash, take into account that with the new location, the 
+    directory to remove is the parent of the one returned by gnome-vfs.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 28 May 2008 01:47:28 +0200
+
 nautilus (2.20.0-3) unstable; urgency=low
 

pkg/boss/main/nautilus/trunk/debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
@@ -11 +11 @@
                libgnomeui-dev (>= 2.16.0-2),
                libbonobo2-dev (>= 2.15),
-               libeel2-dev (>= 2.24.0),
+               libeel2-dev (>= 2.21.90),
                librsvg2-dev (>= 2.16.0-2),
                libgnome-desktop-dev (>= 2.9.91),
                libgconf2-dev (>= 2.6.1-2),
                librsvg2-common (>= 2.16.0-2),
+               desktop-base (>= 0.2),
                libxml-parser-perl,
-               gnome-pkg-tools (>= 0.10),
+               gnome-pkg-tools (>= 0.13),
                dpkg-dev (>= 1.13.19),
                libxt-dev,
@@ -25 +26 @@
                libstartup-notification0-dev (>= 0.8),
                docbook-utils,
-               libselinux1-dev,
-               libglib2.0-dev (>= 2.17.5),
+               libselinux1-dev | not+linux-gnu,
+               libglib2.0-dev (>= 2.15.6),
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),
                x11proto-core-dev,
+               libtrackerclient-dev (>= 0.0.1),
+               libbeagle-dev,
                libexempi-dev (>= 1.99.5),
                intltool (>= 0.35.0)
@@ -35 +38 @@
 VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/
 VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/nautilus/
-Standards-Version: 3.8.0.1
+Standards-Version: 3.8.0
 
 Package: nautilus
@@ -48 +51 @@
          gvfs-backends
 Provides: nautilus-extensions-2.0
-Recommends: eject,
+Recommends: desktop-base (>= 0.2),
+            eject,
             nautilus-cd-burner (>= 2.6),
             librsvg2-common,
-            xdg-user-dirs
+            xdg-user-dirs,
+            synaptic,
+            app-install-data
 Suggests: eog,
           evince | pdf-viewer,
           totem | mp3-decoder,
-          gamin | fam
+          tracker,
+          fam
 Conflicts: libnautilus2-2,
            libnautilus2-dev
@@ -85 +92 @@
  debugging symbols needed by gdb.
  
-Package: libnautilus-extension1
+Package: libnautilus-extension1a
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libnautilus2-2
-Replaces: libnautilus2-2
+Conflicts: libnautilus2-2, libnautilus-extension1
+Replaces: libnautilus2-2, libnautilus-extension1
 Description: libraries for nautilus components - runtime version
  Nautilus is the official file manager and graphical shell for the
@@ -101 +108 @@
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.17.5),
+Depends: libnautilus-extension1a (= ${binary:Version}),
+         libglib2.0-dev (>= 2.15.6),
          libgtk2.0-dev (>= 2.10.0),
          ${shlibs:Depends}

pkg/boss/main/nautilus/trunk/debian/control.in

@@ -11 +11 @@
                libgnomeui-dev (>= 2.16.0-2),
                libbonobo2-dev (>= 2.15),
-               libeel2-dev (>= 2.24.0),
+               libeel2-dev (>= 2.21.90),
                librsvg2-dev (>= 2.16.0-2),
                libgnome-desktop-dev (>= 2.9.91),
                libgconf2-dev (>= 2.6.1-2),
                librsvg2-common (>= 2.16.0-2),
+               desktop-base (>= 0.2),
                libxml-parser-perl,
-               gnome-pkg-tools (>= 0.10),
+               gnome-pkg-tools (>= 0.13),
                dpkg-dev (>= 1.13.19),
                libxt-dev,
@@ -25 +26 @@
                libstartup-notification0-dev (>= 0.8),
                docbook-utils,
-               libselinux1-dev,
-               libglib2.0-dev (>= 2.17.5),
+               libselinux1-dev | not+linux-gnu,
+               libglib2.0-dev (>= 2.15.6),
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),
                x11proto-core-dev,
+               libtrackerclient-dev (>= 0.0.1),
+               libbeagle-dev,
                libexempi-dev (>= 1.99.5),
                intltool (>= 0.35.0)
@@ -35 +38 @@
 VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/
 VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/nautilus/
-Standards-Version: 3.8.0.1
+Standards-Version: 3.8.0
 
 Package: nautilus
@@ -48 +51 @@
          gvfs-backends
 Provides: nautilus-extensions-2.0
-Recommends: eject,
+Recommends: desktop-base (>= 0.2),
+            eject,
             nautilus-cd-burner (>= 2.6),
             librsvg2-common,
-            xdg-user-dirs
+            xdg-user-dirs,
+            synaptic,
+            app-install-data
 Suggests: eog,
           evince | pdf-viewer,
           totem | mp3-decoder,
-          gamin | fam
+          tracker,
+          fam
 Conflicts: libnautilus2-2,
            libnautilus2-dev
@@ -85 +92 @@
  debugging symbols needed by gdb.
  
-Package: libnautilus-extension1
+Package: libnautilus-extension1a
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libnautilus2-2
-Replaces: libnautilus2-2
+Conflicts: libnautilus2-2, libnautilus-extension1
+Replaces: libnautilus2-2, libnautilus-extension1
 Description: libraries for nautilus components - runtime version
  Nautilus is the official file manager and graphical shell for the
@@ -101 +108 @@
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.17.5),
+Depends: libnautilus-extension1a (= ${binary:Version}),
+         libglib2.0-dev (>= 2.15.6),
          libgtk2.0-dev (>= 2.10.0),
          ${shlibs:Depends}

pkg/boss/main/nautilus/trunk/debian/nautilus.1

@@ -17 +17 @@
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-nautilus \- the GNOME File Manager
+Nautilus \- the GNOME File Manager
 .SH SYNOPSIS
 .B nautilus

pkg/boss/main/nautilus/trunk/debian/nautilus.install

@@ -1 @@
-debian/mount-archive.desktop usr/share/applications
 debian/tmp/usr/bin
 debian/tmp/usr/share/applications

pkg/boss/main/nautilus/trunk/debian/patches/99_ltmain_as-needed.patch

@@ -1 @@
-Index: nautilus-2.23.4/ltmain.sh
-===================================================================
---- nautilus-2.23.4.orig/ltmain.sh      2008-02-08 01:54:46.000000000 +0100
-+++ nautilus-2.23.4/ltmain.sh   2008-06-17 10:01:06.000000000 +0200
-@@ -1807,6 +1807,11 @@
+--- a/ltmain.sh 2007-10-09 07:38:25.000000000 +0200
++++ b/ltmain.sh 2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
         arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
         ;;
@@ -10 +8 @@
 +       deplibs="$deplibs $arg"
 +       continue
-+       ;;      
++       ;;
 +
        -Wl,*)
         args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
         arg=
-@@ -2150,6 +2155,16 @@
+@@ -2137,6 +2142,15 @@
         lib=
         found=no
@@ -28 +26 @@
 +         continue
 +         ;;
-+
         -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
           if test "$linkmode,$pass" = "prog,link"; then

pkg/boss/main/nautilus/trunk/debian/patches/series

@@ -1 @@
-07_desktop_file_activation.patch
+#07_desktop_file_activation.patch
+#10_location_titlebar.patch
 12_list-view_expand.patch
+14_sidebar_network-protocol.patch
 15_nautilus-gvfs-desktop-key.patch
 16_rtl-fix.patch
 17_background-no-delay.patch
+20_open-with_install.patch
 99_ltmain_as-needed.patch

pkg/boss/main/nautilus/trunk/debian/rules

@@ -8 +8 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
@@ -15 +16 @@
 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-extension1 += -V 'libnautilus-extension1 (>= 2.22.2)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1a += -V 'libnautilus-extension1 (>= 2.21.6)'
 
 binary-post-install/nautilus-data::