r13055 - in /desktop/unstable/glibmm2.4/debian: ./ control libglibmm-2.4-doc.doc-base.glibmm2.4-reference rules watch

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

Author: manphiz-guest
Date: Wed Oct 10 06:14:38 2007
New Revision: 13055

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13055
Log:
Documents ARE generated by Doxygen, my bad. Revert author;
Let -doc Suggests: libgtkmm-2.4-doc since it has external links to the latter;
Tighten -dev dependency on libglib2.0-dev (>= 2.14.0-1), and Suggests: libgtkmm-2.4-dev (>= 2.12.0-1);
Comment residual dh_installdocs in Build-dep rules;
Refine watch file URL, copied from glib2.0's;
Set svn properties {svn-bp:tagsUrl,mergeWithUpstream}.

Modified:
    desktop/unstable/glibmm2.4/debian/   (props changed)
    desktop/unstable/glibmm2.4/debian/control
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
    desktop/unstable/glibmm2.4/debian/rules
    desktop/unstable/glibmm2.4/debian/watch

Propchange: desktop/unstable/glibmm2.4/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: desktop/unstable/glibmm2.4/debian/
------------------------------------------------------------------------------
    svn-bp:tagsUrl = svn+ssh://svn.debian.org/svn/pkg-gnome/tags/glibmm2.4

Modified: desktop/unstable/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control?rev=13055&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Wed Oct 10 06:14:38 2007
@@ -5,7 +5,9 @@
 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)
+               libsigc++-2.0-dev (>= 2.0.17-1),
+               pkg-config,
+               doc-base
 Standards-Version: 3.7.2
 
 Package: libglibmm-2.4-1c2a
@@ -25,9 +27,10 @@
 Section: libdevel
 Architecture: any
 Depends: libglibmm-2.4-1c2a (= ${binary:Version}),
-         pkg-config (>= 0.14.0),
-         libsigc++-2.0-dev (>= 2.0.17-1)
-Suggests: libglibmm-2.4-doc
+         libglib2.0-dev (>= 2.14.0-1),
+         libsigc++-2.0-dev (>= 2.0.17-1),
+         pkg-config
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>= 2.12.0-1)
 Conflicts: libglibmm2.3-dev
 Replaces: libglibmm2.3-dev
 Description: C++ wrapper for the GLib toolkit (development files)
@@ -53,6 +56,7 @@
 Section: doc
 Architecture: all
 Depends: lynx | www-browser, doc-base
+Suggests: libgtkmm-2.4-doc
 Conflicts: libglibmm-2.4-dev (<< 2.14.0)
 Description: C++ wrapper for the GLib toolkit (shared libraries)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME

Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.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=13055&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference Wed Oct 10 06:14:38 2007
@@ -1,6 +1,6 @@
 Document: glibmm2.4-reference
 Title: glibmm 2.4 Reference Manual
-Author: Murray Cumming et al.
+Author: Doxygen
 Abstract: Reference Manual for glibmm 2.4 (C++ bindings for GLib)
 Section: Apps/Programming
 

Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=13055&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules (original)
+++ desktop/unstable/glibmm2.4/debian/rules Wed Oct 10 06:14:38 2007
@@ -101,7 +101,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
-	dh_installdocs -XMakefile -XDoxyfile
+#	dh_installdocs -XMakefile -XDoxyfile
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
 #	dh_installmenu

Modified: desktop/unstable/glibmm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/watch?rev=13055&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/watch (original)
+++ desktop/unstable/glibmm2.4/debian/watch Wed Oct 10 06:14:38 2007
@@ -3,4 +3,6 @@
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
 version=2
-ftp://ftp.gnome.org/pub/gnome/sources/glibmm/2.14/glibmm-(.*)\.tar\.gz	debian	uupdate
+ftp://download.gnome.org/sources/glibmm/([\d\.]+)[02468]/
+	glibmm-(.*)\.tar\.gz \
+	debian uupdate