r13956 - in /desktop/unstable/gnome-vfsmm2.6/debian: changelog control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Dec 18 17:13:27 2007
New Revision: 13956

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13956
Log:
* Wrap conflicts and replaces.

Modified:
    desktop/unstable/gnome-vfsmm2.6/debian/changelog
    desktop/unstable/gnome-vfsmm2.6/debian/control.in
    desktop/unstable/gnome-vfsmm2.6/debian/rules

Modified: desktop/unstable/gnome-vfsmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfsmm2.6/debian/changelog?rev=13956&op=diff
==============================================================================
--- desktop/unstable/gnome-vfsmm2.6/debian/changelog (original)
+++ desktop/unstable/gnome-vfsmm2.6/debian/changelog Tue Dec 18 17:13:27 2007
@@ -1,5 +1,6 @@
 gnome-vfsmm2.6 (2.20.0-3) unstable; urgency=low
 
+  [ Deng Xiyue ]
   * debian/control, debian/control.in:
     + Bump standard version to 3.7.3. No change required.
     + Bump cdbs version to >= 0.4.41, reason given below.
@@ -25,6 +26,9 @@
       be shortened.
   * debian/watch:
     + Use spaces instead of tabs when indent.
+
+  [ Loic Minier ]
+  * Wrap conflicts and replaces.
 
  -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Mon, 17 Dec 2007 16:57:21 +0800
 

Modified: desktop/unstable/gnome-vfsmm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfsmm2.6/debian/control.in?rev=13956&op=diff
==============================================================================
--- desktop/unstable/gnome-vfsmm2.6/debian/control.in (original)
+++ desktop/unstable/gnome-vfsmm2.6/debian/control.in Tue Dec 18 17:13:27 2007
@@ -34,8 +34,10 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgnome-vfsmm-2.6-1, libgnome-vfsmm-2.6-1c2
-Replaces: libgnome-vfsmm-2.6-1, libgnome-vfsmm-2.6-1c2
+Conflicts: libgnome-vfsmm-2.6-1,
+           libgnome-vfsmm-2.6-1c2
+Replaces: libgnome-vfsmm-2.6-1,
+          libgnome-vfsmm-2.6-1c2
 Description: C++ wrappers for GnomeVFS (shared library)
  GnomeVFS is the GNOME filesystem abstraction library. Gnome-vfsmm is
  the C++ wrapper for GnomeVFS.

Modified: desktop/unstable/gnome-vfsmm2.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfsmm2.6/debian/rules?rev=13956&op=diff
==============================================================================
--- desktop/unstable/gnome-vfsmm2.6/debian/rules (original)
+++ desktop/unstable/gnome-vfsmm2.6/debian/rules Tue Dec 18 17:13:27 2007
@@ -7,7 +7,6 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
 
 GNOME_MODULE := libgnomecanvasmm
 
@@ -26,7 +25,7 @@
 	-V"libgnome-vfsmm-2.6-1c2a (>= 2.16.1)"
 
 DEB_INSTALL_DOCS_libgnome-vfsmm-2.6-doc += \
-        -XMakefile -XDoxyfile -Xfragment -X.in -X.am
+	-XMakefile -XDoxyfile -Xfragment -X.in -X.am
 
 DEB_INSTALL_EXAMPLES_libgnome-vfsmm-2.6-doc += \
 	-Xfragment -X.deps -X.libs -X.o -X.in -X.am