r13136 - in /desktop/unstable/glibmm2.4/debian: changelog control control.in rules

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Mon Oct 15 13:04:03 UTC 2007


Author: manphiz-guest
Date: Mon Oct 15 13:04:03 2007
New Revision: 13136

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13136
Log:
* Rename libglibmm-2.4-1c2a to libglibmm-2.4-1, as the transition has been
  done long ago;
* Drop tag-move script, as it turns out to be unnecessary at all,
* Exclude unneeded stuff in -doc through -X in DEB_INSTALL_DOCS_ALL.

Modified:
    desktop/unstable/glibmm2.4/debian/changelog
    desktop/unstable/glibmm2.4/debian/control
    desktop/unstable/glibmm2.4/debian/control.in
    desktop/unstable/glibmm2.4/debian/rules

Modified: desktop/unstable/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/changelog?rev=13136&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Mon Oct 15 13:04:03 2007
@@ -1,6 +1,8 @@
 glibmm2.4 (2.14.1-1) UNRELEASED; urgency=low
 
   * Build system migrated to cdbs.
+  * Rename libglibmm-2.4-1c2a to libglibmm-2.4-1, as the transition has been
+    done long ago.
   * Refine dependency fields in debian/control.
   * Split documentation from -dev to -doc package, and make it conflict with
     older -dev versions.
@@ -13,7 +15,7 @@
       Team now. Thanks Bradley.
     - Add Debian GNOME Team as uploaders.
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Sat, 13 Oct 2007 00:25:29 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Mon, 15 Oct 2007 20:25:53 +0800
 
 glibmm2.4 (2.14.1-0.1) unstable; urgency=low
 

Modified: desktop/unstable/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control?rev=13136&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Mon Oct 15 13:04:03 2007
@@ -7,18 +7,18 @@
                debhelper (>= 5),
                doc-base,
                gnome-pkg-tools (>= 0.11),
-               libglib2.0-dev (>> 2.14.1),
+               libglib2.0-dev (>= 2.14.1),
                libsigc++-2.0-dev (>= 2.0.17-1),
                pkg-config
 Standards-Version: 3.7.2
 
-Package: libglibmm-2.4-1c2a
+Package: libglibmm-2.4-1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libglibmm-2.4-1, libglibmm-2.4-1c2
-Replaces: libglibmm-2.4-1, libglibmm-2.4-1c2
+Conflicts: libglibmm-2.4-1 (<< 2.14.1-1), libglibmm-2.4-1c2, libglibmm-2.4-1c2a
+Replaces: libglibmm-2.4-1 (<< 2.14.1-1), libglibmm-2.4-1c2, libglibmm-2.4-1c2a
 Description: C++ wrapper for the GLib toolkit (shared libraries)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME
  applications, but is useful for other programs as well.
@@ -30,11 +30,11 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libglibmm-2.4-1c2a (= ${binary:Version}),
-         libglib2.0-dev (>> 2.14.1),
+         libglibmm-2.4-1 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.14.1),
          libsigc++-2.0-dev (>= 2.0.17-1),
          pkg-config
-Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>> 2.12.1)
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>= 2.12.1)
 Conflicts: libglibmm2.3-dev
 Replaces: libglibmm2.3-dev
 Description: C++ wrapper for the GLib toolkit (development files)
@@ -44,12 +44,12 @@
  .
  This package contains development files. 
 
-Package: libglibmm-2.4-1c2a-dbg
+Package: libglibmm-2.4-1-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
-         libglibmm-2.4-1c2a (= ${binary:Version})
+         libglibmm-2.4-1 (= ${binary:Version})
 Description: C++ wrapper for the GLib toolkit (debug symbols)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME
  applications, but is useful for other programs as well.

Modified: desktop/unstable/glibmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control.in?rev=13136&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control.in (original)
+++ desktop/unstable/glibmm2.4/debian/control.in Mon Oct 15 13:04:03 2007
@@ -7,18 +7,18 @@
                debhelper (>= 5),
                doc-base,
                gnome-pkg-tools (>= 0.11),
-               libglib2.0-dev (>> 2.14.1),
+               libglib2.0-dev (>= 2.14.1),
                libsigc++-2.0-dev (>= 2.0.17-1),
                pkg-config
 Standards-Version: 3.7.2
 
-Package: libglibmm-2.4-1c2a
+Package: libglibmm-2.4-1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libglibmm-2.4-1, libglibmm-2.4-1c2
-Replaces: libglibmm-2.4-1, libglibmm-2.4-1c2
+Conflicts: libglibmm-2.4-1 (<< 2.14.1-1), libglibmm-2.4-1c2, libglibmm-2.4-1c2a
+Replaces: libglibmm-2.4-1 (<< 2.14.1-1), libglibmm-2.4-1c2, libglibmm-2.4-1c2a
 Description: C++ wrapper for the GLib toolkit (shared libraries)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME
  applications, but is useful for other programs as well.
@@ -30,11 +30,11 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libglibmm-2.4-1c2a (= ${binary:Version}),
-         libglib2.0-dev (>> 2.14.1),
+         libglibmm-2.4-1 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.14.1),
          libsigc++-2.0-dev (>= 2.0.17-1),
          pkg-config
-Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>> 2.12.1)
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>= 2.12.1)
 Conflicts: libglibmm2.3-dev
 Replaces: libglibmm2.3-dev
 Description: C++ wrapper for the GLib toolkit (development files)
@@ -44,12 +44,12 @@
  .
  This package contains development files. 
 
-Package: libglibmm-2.4-1c2a-dbg
+Package: libglibmm-2.4-1-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
-         libglibmm-2.4-1c2a (= ${binary:Version})
+         libglibmm-2.4-1 (= ${binary:Version})
 Description: C++ wrapper for the GLib toolkit (debug symbols)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME
  applications, but is useful for other programs as well.

Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=13136&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules (original)
+++ desktop/unstable/glibmm2.4/debian/rules Mon Oct 15 13:04:03 2007
@@ -10,17 +10,15 @@
 
 GNOME_MODULE := glibmm
 
-DEB_COMPRESS_EXCLUDE := doxygen_tags
-
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS+=" -Wl,-z,defs -Wl,-O1"
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
 
-DEB_DH_MAKESHLIBS_ARGS_libglibmm-2.4-1c2a := -V"libglibmm-2.4-1c2a (>= 2.14.0)"
+DEB_DH_MAKESHLIBS_ARGS_libglibmm-2.4-1 := -V"libglibmm-2.4-1 (>= 2.14.0)"
 
 DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
 
-DEB_INSTALL_DOCS_ALL := -XMakefile -XDoxyfile
+DEB_INSTALL_DOCS_ALL := -XMakefile -XDoxyfile -X*.in -X*tags* -X*fragment*
 
 binary-post-install/libglibmm-2.4-doc::
 	# fix external doc paths
@@ -30,8 +28,3 @@
 		sed 's/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
 		mv $$file.fixed $$file; \
 	done
-	# mv glibmm_doxygen_tags to -dev package 
-	# to eliminate build rdepends on -doc package
-	mkdir -p debian/libglibmm-2.4-dev/usr/share/doc/libglibmm-2.4-dev/reference
-	mv debian/libglibmm-2.4-doc/usr/share/doc/libglibmm-2.4-doc/reference/glibmm_doxygen_tags \
-		debian/libglibmm-2.4-dev/usr/share/doc/libglibmm-2.4-dev/reference




More information about the pkg-gnome-commits mailing list