r13080 - /desktop/unstable/glibmm2.4/debian/

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Fri Oct 12 17:29:24 UTC 2007


Author: manphiz-guest
Date: Fri Oct 12 17:29:24 2007
New Revision: 13080

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13080
Log:
Build system migrated to cdbs;
Drop useless docs and *.dirs files;
Specify install path in detail in .install files;
Split docs from -dev to -doc package.

Added:
    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
Removed:
    desktop/unstable/glibmm2.4/debian/docs
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.dirs
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.dirs
    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/libglibmm-2.4-1c2a.install
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install
    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=13080&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Fri Oct 12 17:29:24 2007
@@ -1,3 +1,20 @@
+glibmm2.4 (2.14.1-1) UNRELEASED; urgency=low
+
+  * Build system migrated to cdbs.
+  * Refine dependency fields in debian/control.
+  * Split documentation from -dev to -doc package, and make it conflict with
+    older -dev versions.
+  * Use named shlibs version in debian/rules.
+  * Refine watch file URL.
+  * 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>  Sat, 13 Oct 2007 00:25:29 +0800
+
 glibmm2.4 (2.14.1-0.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: desktop/unstable/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control?rev=13080&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Fri Oct 12 17:29:24 2007
@@ -1,41 +1,22 @@
 Source: glibmm2.4
 Section: libs
 Priority: optional
-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)
+Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: cdbs,
+               debhelper (>= 5),
+               doc-base,
+               gnome-pkg-tools (>= 0.11),
+               libglib2.0-dev (>> 2.14.0),
+               libsigc++-2.0-dev (>= 2.0.17-1),
+               pkg-config
 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
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Conflicts: libglibmm-2.4-1, libglibmm-2.4-1c2
 Replaces: libglibmm-2.4-1, libglibmm-2.4-1c2
 Description: C++ wrapper for the GLib toolkit (shared libraries)
@@ -44,3 +25,49 @@
  glibmm is the C++ wrapper for GLib.
  .
  This package contains shared libraries.
+
+Package: libglibmm-2.4-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+         libglibmm-2.4-1c2a (= ${binary:Version}),
+         libglib2.0-dev (>> 2.14.0),
+         libsigc++-2.0-dev (>= 2.0.17-1),
+         pkg-config
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>> 2.12.0)
+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: ${misc: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: ${misc:Depends},
+         lynx | www-browser, doc-base
+Suggests: libgtkmm-2.4-doc
+Conflicts: libglibmm-2.4-dev (<< 2.14.0-1)
+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/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control.in?rev=13080&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control.in (added)
+++ desktop/unstable/glibmm2.4/debian/control.in Fri Oct 12 17:29:24 2007
@@ -1,0 +1,73 @@
+Source: glibmm2.4
+Section: libs
+Priority: optional
+Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: cdbs,
+               debhelper (>= 5),
+               doc-base,
+               gnome-pkg-tools (>= 0.11),
+               libglib2.0-dev (>> 2.14.0),
+               libsigc++-2.0-dev (>= 2.0.17-1),
+               pkg-config
+Standards-Version: 3.7.2
+
+Package: libglibmm-2.4-1c2a
+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
+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 shared libraries.
+
+Package: libglibmm-2.4-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+         libglibmm-2.4-1c2a (= ${binary:Version}),
+         libglib2.0-dev (>> 2.14.0),
+         libsigc++-2.0-dev (>= 2.0.17-1),
+         pkg-config
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-dev (>> 2.12.0)
+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: ${misc: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: ${misc:Depends},
+         lynx | www-browser, doc-base
+Suggests: libgtkmm-2.4-doc
+Conflicts: libglibmm-2.4-dev (<< 2.14.0-1)
+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.
+

Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install?rev=13080&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-1c2a.install Fri Oct 12 17:29:24 2007
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+debian/tmp/usr/lib/lib*.so.* usr/lib

Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install?rev=13080&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-dev.install Fri Oct 12 17:29:24 2007
@@ -1,7 +1,6 @@
-usr/include/*
-usr/lib/glibmm-2.4
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/aclocal/*
+debian/tmp/usr/include/* usr/include
+debian/tmp/usr/lib/glibmm-2.4 usr/lib
+debian/tmp/usr/lib/lib*.{a,so} usr/lib
+debian/tmp/usr/lib/pkgconfig/* usr/lib
+debian/tmp/usr/lib/*.la usr/lib
+debian/tmp/usr/share/aclocal/* usr/share/aclocal

Added: 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=13080&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference (added)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference Fri Oct 12 17:29:24 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-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=13080&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs (added)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs Fri Oct 12 17:29:24 2007
@@ -1,0 +1,6 @@
+NEWS
+README
+CHANGES
+docs/images
+docs/internal
+docs/reference

Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=13080&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules (original)
+++ desktop/unstable/glibmm2.4/debian/rules Fri Oct 12 17:29:24 2007
@@ -6,114 +6,29 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/autotools.mk
+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
 
-CXXFLAGS = -Wall -g
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
 
+DEB_DH_MAKESHLIBS_ARGS_libglibmm-2.4-1c2a := -V"libglibmm-2.4-1c2a (>= 2.14.0)"
 
-autogen:
-	libtoolize --force --copy
-	aclocal-1.9 -I scripts
-	automake-1.9 --copy --add-missing
-	autoconf2.50
+DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
 
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --enable-static --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CXXFLAGS="$(CXXFLAGS)"
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub scripts/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess scripts/config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# 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 \
+install/libglibmm-2.4-doc::
+	for file in debian/tmp/usr/share/doc/glibmm-2.4/docs/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
-#	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=13080&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/watch (original)
+++ desktop/unstable/glibmm2.4/debian/watch Fri Oct 12 17:29:24 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.12/glibmm-(.*)\.tar\.gz	debian	uupdate
+ftp://download.gnome.org/sources/glibmm/([\d\.]+)[02468]/
+	glibmm-(.*)\.tar\.gz \
+	debian uupdate




More information about the pkg-gnome-commits mailing list