r13050 - in /desktop/unstable/glibmm2.4/debian: changelog control docs libglibmm-2.4-dev.doc-base.glibmm2.4-reference libglibmm-2.4-doc.doc-base.glibmm2.4-reference libglibmm-2.4-doc.docs rules watch

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Tue Oct 9 16:48:19 UTC 2007


Author: manphiz-guest
Date: Tue Oct  9 16:48:19 2007
New Revision: 13050

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13050
Log:
Change ownership to Debian GNOME Team;
Change debian/control layout, added -doc package, and rearranged corresponding libglibmm-2.4-doc.* files;
Add build-indep rules for -doc package;
Update watch file URL.

Added:
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
      - copied, changed from r13049, desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs
Removed:
    desktop/unstable/glibmm2.4/debian/docs
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference
Modified:
    desktop/unstable/glibmm2.4/debian/changelog
    desktop/unstable/glibmm2.4/debian/control
    desktop/unstable/glibmm2.4/debian/rules
    desktop/unstable/glibmm2.4/debian/watch

Modified: desktop/unstable/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/changelog?rev=13050&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Tue Oct  9 16:48:19 2007
@@ -3,8 +3,17 @@
   * New upstream version. Closes: #442828
     - Fixed shadowed member warning. Closes: #415464
   * Update glib2.0 dependency to 2.14.0 and later.
-
- -- Deng Xiyue <manphiz at gmail.com>  Tue, 09 Oct 2007 15:29:36 +0800
+  * Refine dependency fields in debian/control.
+  * Move documentation and examples to -doc package.
+  * Use named shlib version in debian/rules.
+  * Update watch file URL to 2.14 releases.
+  * Migrated ownership to Debian GNOME Team.
+    - Added myself as maintainer with consensus from Debian GNOME Team.
+    - Origianl maintainer Bradley Bell is also a member of Debian GNOME
+      Team now. Thanks Bradley.
+    - Added Debian GNOME Team as uploaders.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 10 Oct 2007 00:40:37 +0800
 
 glibmm2.4 (2.12.10-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=13050&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Tue Oct  9 16:48:19 2007
@@ -1,36 +1,12 @@
 Source: glibmm2.4
 Section: libs
 Priority: optional
-Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 5), libglib2.0-dev (>= 2.14.0=1), libsigc++-2.0-dev (>= 2.0.16-2)
+Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Marc 'HE' Brockschmidt <he at debian.org>, Sebastian Dröge <slomo at debian.org>, Sebastien Bacher <seb128 at debian.org>
+Build-Depends: debhelper (>= 5),
+               libglib2.0-dev (>= 2.14.0-1),
+               libsigc++-2.0-dev (>= 2.0.17-1)
 Standards-Version: 3.7.2
-
-Package: libglibmm-2.4-dev
-Section: libdevel
-Architecture: any
-Depends: libglibmm-2.4-1c2a (= ${Source-Version}), libglib2.0-dev (>= 2.14.0=1), libsigc++-2.0-dev (>= 2.0.16-2)
-Suggests: libgtkmm-2.4-dev, libgtkmm-2.4-doc
-Conflicts: libglibmm2.3-dev
-Replaces: libglibmm2.3-dev
-Description: C++ wrapper for the GLib toolkit (development files)
- GLib is a low-level general-purpose library used mainly by GTK+/GNOME
- applications, but is useful for other programs as well.
- glibmm is the C++ wrapper for GLib.
- .
- This package contains development files, reference documentation, and
- examples.
-
-Package: libglibmm-2.4-1c2a-dbg
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libglibmm-2.4-1c2a (= ${Source-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.
- glibmm is the C++ wrapper for GLib.
- .
- This package contains debug symbols for debugging applications using glibmm.
 
 Package: libglibmm-2.4-1c2a
 Section: libs
@@ -44,3 +20,42 @@
  glibmm is the C++ wrapper for GLib.
  .
  This package contains shared libraries.
+
+Package: libglibmm-2.4-dev
+Section: libdevel
+Architecture: any
+Depends: libglibmm-2.4-1c2a (= ${binary:Version}),
+         pkg-config (>= 0.14.0)
+Suggests: libgtkmm-2.4-dev, libgtkmm-2.4-doc
+Conflicts: libglibmm2.3-dev
+Replaces: libglibmm2.3-dev
+Description: C++ wrapper for the GLib toolkit (development files)
+ GLib is a low-level general-purpose library used mainly by GTK+/GNOME
+ applications, but is useful for other programs as well.
+ glibmm is the C++ wrapper for GLib.
+ .
+ This package contains development files. 
+
+Package: libglibmm-2.4-1c2a-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libglibmm-2.4-1c2a (= ${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.
+ glibmm is the C++ wrapper for GLib.
+ .
+ This package contains debug symbols for debugging applications using glibmm.
+
+Package: libglibmm-2.4-doc
+Section: doc
+Architecture: all
+Depends: lynx | www-browser
+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.
+ glibmm is the C++ wrapper for GLib.
+ .
+ This package contains reference documentation, and examples.
+

Copied: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference (from r13049, desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference?rev=13050&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference Tue Oct  9 16:48:19 2007
@@ -5,5 +5,5 @@
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/libglibmm-2.4-dev/reference/html/index.html
-Files: /usr/share/doc/libglibmm-2.4-dev/reference/html/*.html
+Index: /usr/share/doc/libglibmm-2.4-doc/reference/html/index.html
+Files: /usr/share/doc/libglibmm-2.4-doc/reference/html/*.html

Added: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs?rev=13050&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs (added)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs Tue Oct  9 16:48:19 2007
@@ -1,0 +1,13 @@
+NEWS
+README
+CHANGES
+docs/images
+docs/internal
+docs/reference
+examples/README
+examples/child_watch
+examples/iochannel_stream
+examples/markup
+examples/options
+examples/regex
+examples/thread

Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=13050&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules (original)
+++ desktop/unstable/glibmm2.4/debian/rules Tue Oct  9 16:48:19 2007
@@ -53,7 +53,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub scripts/config.sub
 endif
@@ -76,7 +76,25 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+	dh_testdir
+	dh_testroot
+	dh_install -i
+	dh_installchangelogs -i ChangeLog ChangeLog.*
+	dh_installdocs -i -XMakefile -XDoxyfile
+	for file in debian/libglibmm-2.4-doc/usr/share/doc/libglibmm-2.4-doc/reference/html/*.html; do \
+		sed 's/\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
+		mv $$file.fixed $$file; \
+		sed 's/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
+		mv $$file.fixed $$file; \
+	done
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -84,12 +102,6 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs -XMakefile -XDoxyfile
-	for file in debian/libglibmm-2.4-dev/usr/share/doc/libglibmm-2.4-dev/reference/html/*.html; do \
-		sed 's/\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-		sed 's/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
@@ -108,7 +120,7 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs
+	dh_makeshlibs -plibglibmm-2.4-1c2a -V "libglibmm-2.4-1c2a (>= 2.14.0)"
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Modified: desktop/unstable/glibmm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/watch?rev=13050&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/watch (original)
+++ desktop/unstable/glibmm2.4/debian/watch Tue Oct  9 16:48:19 2007
@@ -3,4 +3,4 @@
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
 version=2
-ftp://ftp.gnome.org/pub/gnome/sources/glibmm/2.12/glibmm-(.*)\.tar\.gz	debian	uupdate
+ftp://ftp.gnome.org/pub/gnome/sources/glibmm/2.14/glibmm-(.*)\.tar\.gz	debian	uupdate




More information about the pkg-gnome-commits mailing list