r13878 - in /desktop/unstable/libgnomemm2.6/debian: changelog control control.in rules

[manphiz-guest at users.alioth.debian.org]

Author: manphiz-guest
Date: Sat Dec 15 09:04:11 2007
New Revision: 13878

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13878
Log:
  + Conflicts with libgnomemm-2.6-1c2a to help sync with Ubuntu.

Modified:
    desktop/unstable/libgnomemm2.6/debian/changelog
    desktop/unstable/libgnomemm2.6/debian/control
    desktop/unstable/libgnomemm2.6/debian/control.in
    desktop/unstable/libgnomemm2.6/debian/rules

Modified: desktop/unstable/libgnomemm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/changelog?rev=13878&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/changelog (original)
+++ desktop/unstable/libgnomemm2.6/debian/changelog Sat Dec 15 09:04:11 2007
@@ -3,6 +3,7 @@
   * 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.
+    + Conflicts with libgnomemm-2.6-1c2a to help sync with Ubuntu.
   * debian/copyright:
     + Update download URL.
     + Update upstream authors' email addresses.
@@ -26,7 +27,7 @@
     + Use spaces instead of tabs when indent.
     (Thanks Loïc Minier for reviewing and the suggestions)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Sat, 15 Dec 2007 16:01:47 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Sat, 15 Dec 2007 17:02:33 +0800
 
 libgnomemm2.6 (2.20.0-2) unstable; urgency=high
 

Modified: desktop/unstable/libgnomemm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/control?rev=13878&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/control (original)
+++ desktop/unstable/libgnomemm2.6/debian/control Sat Dec 15 09:04:11 2007
@@ -36,8 +36,10 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgnomemm-2.6-1
+Conflicts: libgnomemm-2.6-1,
+           libgnomemm-2.6-1c2a
 Replaces: libgnomemm-2.6-1
+          libgnomemm-2.6-1c2a
 Description: C++ wrappers for libgnome (shared library)
  Gnomemm is a powerful C++ binding for the GNOME libraries.
  Gnomemm includes bindings for all the popular GNOME interfaces like

Modified: desktop/unstable/libgnomemm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/control.in?rev=13878&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/control.in (original)
+++ desktop/unstable/libgnomemm2.6/debian/control.in Sat Dec 15 09:04:11 2007
@@ -36,8 +36,10 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgnomemm-2.6-1
+Conflicts: libgnomemm-2.6-1,
+           libgnomemm-2.6-1c2a
 Replaces: libgnomemm-2.6-1
+          libgnomemm-2.6-1c2a
 Description: C++ wrappers for libgnome (shared library)
  Gnomemm is a powerful C++ binding for the GNOME libraries.
  Gnomemm includes bindings for all the popular GNOME interfaces like

Modified: desktop/unstable/libgnomemm2.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/rules?rev=13878&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/rules (original)
+++ desktop/unstable/libgnomemm2.6/debian/rules Sat Dec 15 09:04:11 2007
@@ -17,7 +17,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
 
-DEB_DH_BUILDDEB_ARGS += -XDoxyfile -X.in -X.am -Xfragment
+DEB_DH_BUILDDEB_ARGS += -XDoxyfile -Xfragment -X.deps -X.libs -X.o -X.in -X.am
 
 DEB_DH_INSTALL_SOURCEDIR += debian/tmp