r13079 - in /desktop/unstable/glibmm2.4/debian: changelog control control.in 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
Fri Oct 12 17:14:18 UTC 2007 

Author: manphiz-guest
Date: Fri Oct 12 17:14:17 2007
New Revision: 13079

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13079
Log:
Reload the upstream NMU files as new start point.

Added:
    desktop/unstable/glibmm2.4/debian/docs
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference
Removed:
    desktop/unstable/glibmm2.4/debian/control.in
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs
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=13079&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Fri Oct 12 17:14:17 2007
@@ -1,20 +1,10 @@
-glibmm2.4 (2.14.1-1) UNRELEASED; urgency=low
-
-  * New upstream version. Closes: #442828
-    - Fixed shadowed member warning. Closes: #415464
-  * Refine dependency fields in debian/control.
-  * Removed documentation from -dev for preparation of -doc package.
-  * Use named shlibs version in debian/rules.
-  * Refine watch file URL to upstream releases.
-  * No longer ignore "make distclean" errors, per lintian.
-  * Use ${binary:Version} instead of the deprecated ${Source-Version}.
-  * Migrate ownership to Debian GNOME Team.
-    - Add myself as maintainer with consensus from Debian GNOME Team.
-    - Origianl maintainer Bradley Bell is also a member of Debian GNOME
-      Team now. Thanks Bradley.
-    - Add Debian GNOME Team as uploaders.
-
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 10 Oct 2007 16:58:02 +0800
+glibmm2.4 (2.14.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release. Closes: #442828
+    - Fixes a declaration shadowing another variable. Closes: #415464
+
+ -- Guus Sliepen <guus at debian.org>  Fri, 12 Oct 2007 13:04:54 +0200
 
 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=13079&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Fri Oct 12 17:14:17 2007
@@ -1,14 +1,36 @@
 Source: glibmm2.4
 Section: libs
 Priority: optional
-Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 5),
-               libglib2.0-dev (>= 2.14.0-1),
-               libsigc++-2.0-dev (>= 2.0.17-1),
-               pkg-config,
-               doc-base
+Maintainer: Bradley Bell <btb at debian.org>
+Build-Depends: debhelper (>= 5), libglib2.0-dev (>> 2.14.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.1), libsigc++-2.0-dev (>= 2.0.17-1)
+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
@@ -22,46 +44,3 @@
  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}),
-         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)
- 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, 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
-# applications, but is useful for other programs as well.
-# glibmm is the C++ wrapper for GLib.
-# .
-# This package contains reference documentation.
-

Added: desktop/unstable/glibmm2.4/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/docs?rev=13079&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/docs (added)
+++ desktop/unstable/glibmm2.4/debian/docs Fri Oct 12 17:14:17 2007
@@ -1,0 +1,6 @@
+NEWS
+README
+CHANGES
+docs/images
+docs/internal
+docs/reference

Added: 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-dev.doc-base.glibmm2.4-reference?rev=13079&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference (added)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.doc-base.glibmm2.4-reference Fri Oct 12 17:14:17 2007
@@ -1,0 +1,9 @@
+Document: glibmm2.4-reference
+Title: glibmm 2.4 Reference Manual
+Author: Doxygen
+Abstract: Reference Manual for glibmm 2.4 (C++ bindings for GLib)
+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

Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=13079&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules (original)
+++ desktop/unstable/glibmm2.4/debian/rules Fri Oct 12 17:14:17 2007
@@ -6,11 +6,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DISABLE_UPDATE_UPLOADERS := 1
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-GNOME_MODULE := glibmm
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -58,7 +53,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
+	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub scripts/config.sub
 endif
@@ -81,56 +76,44 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-#	dh_testdir
-#	dh_testroot
-#	dh_install -i
-#	dh_installchangelogs -i 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 \
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	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_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
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -s ChangeLog
-	dh_installdocs -s -XMakefile -XDoxyfile
-	dh_installexamples -s 
-	dh_install -s --sourcedir=debian/tmp
-#	dh_installmenu -s
-#	dh_installdebconf -s	
-#	dh_installlogrotate -s
-#	dh_installemacsen -s
-#	dh_installpam -s
-#	dh_installmime -s
-#	dh_installinit -s
-#	dh_installcron -s
-#	dh_installinfo -s
-	dh_installman -s
-	dh_link -s
-	dh_strip -s --dbg-package=libglibmm-2.4-1c2a-dbg
-	dh_compress -s -Xdoxygen_tags
-	dh_fixperms -s
-#	dh_perl -s
-#	dh_python -s
-	dh_makeshlibs -s -plibglibmm-2.4-1c2a -V "libglibmm-2.4-1c2a (>= 2.14.0)"
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip --dbg-package=libglibmm-2.4-1c2a-dbg
+	dh_compress -Xdoxygen_tags
+	dh_fixperms
+#	dh_perl
+#	dh_python
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

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

More information about the pkg-gnome-commits mailing list