r13081 - in /desktop/unstable/gtkmm2.4/debian: changelog control control.in libgtkmm-2.4-1c2a.dirs libgtkmm-2.4-1c2a.install libgtkmm-2.4-dev.dirs libgtkmm-2.4-dev.install libgtkmm-2.4-doc.install rules
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Fri Oct 12 19:19:52 UTC 2007
Author: manphiz-guest
Date: Fri Oct 12 19:19:52 2007
New Revision: 13081
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13081
Log:
Build system migrated to cdbs;
Temporarily make -doc conflict with older versions of -dev, since usr/share/doc/<package>/reference/gtkmm_doxygen_tags is now in -doc instead of -dev.
Removed:
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-1c2a.dirs
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-dev.dirs
Modified:
desktop/unstable/gtkmm2.4/debian/changelog
desktop/unstable/gtkmm2.4/debian/control
desktop/unstable/gtkmm2.4/debian/control.in
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-1c2a.install
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-dev.install
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install
desktop/unstable/gtkmm2.4/debian/rules
Modified: desktop/unstable/gtkmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/changelog?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/changelog (original)
+++ desktop/unstable/gtkmm2.4/debian/changelog Fri Oct 12 19:19:52 2007
@@ -5,8 +5,8 @@
* Build with --enable-static to provide static library. Closes: #381889
* Tighten library dependencies. Closes: #383514
* Provide shlibs version 2.12.0. Closes: #417844
+ * Build system migrated to cdbs.
* Refine watch file URL.
- * 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.
@@ -14,7 +14,7 @@
Team now. Thanks Bradley.
- Add Debian GNOME Team as Uploaders.
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Wed, 10 Oct 2007 16:53:06 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 13 Oct 2007 01:38:37 +0800
gtkmm2.4 (1:2.10.10-0.2) unstable; urgency=low
Modified: desktop/unstable/gtkmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control (original)
+++ desktop/unstable/gtkmm2.4/debian/control Fri Oct 12 19:19:52 2007
@@ -2,23 +2,25 @@
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),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: cdbs,
+ debhelper (>= 5),
doc-base,
gnome-pkg-tools (>= 0.11),
- libgtk2.0-dev (>= 2.12.0-1),
- libglibmm-2.4-dev (>= 2.14.1-1),
- libatk1.0-dev (>= 1.9.0-1),
+ libgtk2.0-dev (>= 2.12.0),
+ libglibmm-2.4-dev (>= 2.14.1),
+ libatk1.0-dev (>= 1.9.0),
libcairomm-1.0-dev (>= 1.1.12)
Standards-Version: 3.7.2
Package: libgtkmm-2.4-dev
Section: libdevel
Architecture: any
-Depends: libgtkmm-2.4-1c2a (= ${binary:Version}),
- libgtk2.0-dev (>= 2.12.0-1),
- libglibmm-2.4-dev (>= 2.14.1-1),
- libatk1.0-dev (>= 1.9.0-1),
+Depends: ${misc:Depends},
+ libgtkmm-2.4-1c2a (= ${binary:Version}),
+ libgtk2.0-dev (>= 2.12.0),
+ libglibmm-2.4-dev (>= 2.14.1),
+ libatk1.0-dev (>= 1.9.0),
libcairomm-1.0-dev (>= 1.1.12)
Description: C++ wrappers for GTK+ 2.4 (development files)
Gtkmm is a C++ interface for the popular GUI library gtk+.
@@ -33,7 +35,8 @@
Package: libgtkmm-2.4-1c2a
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: libgtkmm-2.4-1, libgtkmm-2.4-1c2
Replaces: libgtkmm-2.4-1, libgtkmm-2.4-1c2
Description: C++ wrappers for GTK+ 2.4 (shared libraries)
@@ -49,9 +52,11 @@
Package: libgtkmm-2.4-doc
Section: doc
Architecture: all
-Depends: lynx | www-browser,
+Depends: ${misc:Depends},
+ lynx | www-browser,
doc-base
Suggests: libgtkmm-2.4-dev, libglibmm-2.4-doc
+Conflicts: libgtkmm-2.4-dev (<< 2.12.1-1)
Description: C++ wrappers for GTK+ 2.4 (documentation)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
Modified: desktop/unstable/gtkmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control.in?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control.in (original)
+++ desktop/unstable/gtkmm2.4/debian/control.in Fri Oct 12 19:19:52 2007
@@ -3,22 +3,24 @@
Priority: optional
Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
+Build-Depends: cdbs,
+ debhelper (>= 5),
doc-base,
gnome-pkg-tools (>= 0.11),
- libgtk2.0-dev (>= 2.12.0-1),
- libglibmm-2.4-dev (>= 2.14.1-1),
- libatk1.0-dev (>= 1.9.0-1),
+ libgtk2.0-dev (>= 2.12.0),
+ libglibmm-2.4-dev (>= 2.14.1),
+ libatk1.0-dev (>= 1.9.0),
libcairomm-1.0-dev (>= 1.1.12)
Standards-Version: 3.7.2
Package: libgtkmm-2.4-dev
Section: libdevel
Architecture: any
-Depends: libgtkmm-2.4-1c2a (= ${binary:Version}),
- libgtk2.0-dev (>= 2.12.0-1),
- libglibmm-2.4-dev (>= 2.14.1-1),
- libatk1.0-dev (>= 1.9.0-1),
+Depends: ${misc:Depends},
+ libgtkmm-2.4-1c2a (= ${binary:Version}),
+ libgtk2.0-dev (>= 2.12.0),
+ libglibmm-2.4-dev (>= 2.14.1),
+ libatk1.0-dev (>= 1.9.0),
libcairomm-1.0-dev (>= 1.1.12)
Description: C++ wrappers for GTK+ 2.4 (development files)
Gtkmm is a C++ interface for the popular GUI library gtk+.
@@ -33,7 +35,8 @@
Package: libgtkmm-2.4-1c2a
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: libgtkmm-2.4-1, libgtkmm-2.4-1c2
Replaces: libgtkmm-2.4-1, libgtkmm-2.4-1c2
Description: C++ wrappers for GTK+ 2.4 (shared libraries)
@@ -49,9 +52,11 @@
Package: libgtkmm-2.4-doc
Section: doc
Architecture: all
-Depends: lynx | www-browser,
+Depends: ${misc:Depends},
+ lynx | www-browser,
doc-base
Suggests: libgtkmm-2.4-dev, libglibmm-2.4-doc
+Conflicts: libgtkmm-2.4-dev (<< 2.12.1-1)
Description: C++ wrappers for GTK+ 2.4 (documentation)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-1c2a.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-1c2a.install?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-1c2a.install (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-1c2a.install Fri Oct 12 19:19:52 2007
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+debian/tmp/usr/lib/lib*.so.* usr/lib
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-dev.install?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-dev.install (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-dev.install Fri Oct 12 19:19:52 2007
@@ -1,7 +1,6 @@
-usr/include/*
-usr/lib/gtkmm-2.4
-usr/lib/gdkmm-2.4
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
+debian/tmp/usr/include/* usr/include
+debian/tmp/usr/lib/gtkmm-2.4 usr/lib
+debian/tmp/usr/lib/gdkmm-2.4 usr/lib
+debian/tmp/usr/lib/lib*.{a,so} usr/lib
+debian/tmp/usr/lib/pkgconfig/* usr/lib/pkgconfig
+debian/tmp/usr/lib/*.la usr/lib
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install Fri Oct 12 19:19:52 2007
@@ -1,1 +1,1 @@
-usr/share/devhelp/*
+debian/tmp/usr/share/devhelp/* usr/share/devhelp
Modified: desktop/unstable/gtkmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/rules?rev=13081&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/rules (original)
+++ desktop/unstable/gtkmm2.4/debian/rules Fri Oct 12 19:19:52 2007
@@ -1,147 +1,38 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DISABLE_UPDATE_UPLOADERS := 1
+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 := gtkmm
-# 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)
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --enable-static \
+ --disable-examples \
+ --disable-demos
-CXXFLAGS = -Wall -g
+DEB_DH_MAKESHLIBS_ARGS_libgtkmm-2.4-1c2a := -V"libgtkmm-2.4-1c2a (>= 2.12.0)"
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
-
-autogen:
- libtoolize --force --copy
- aclocal-1.9 -I scripts
- automake-1.9 --copy --add-missing
- autoconf2.50
-
-
-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)" \
- --disable-examples \
- --disable-demos
-
-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.
- [ ! -f demos/Makefile ] || -$(MAKE) -C demos distclean
- [ ! -f examples/Makefile ] || -$(MAKE) -C examples distclean
- [ ! -f Makefile ] || -$(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
-# # replace ../../../../glibmm-2.4/docs with ../../../libglibmm-2.4-dev/
-# for file in debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/reference/html/*.html; do \
-# sed 's/\.\.\/\.\.\/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libglibmm-2.4-dev\//g' $$file > $$file.fixed; \
-# mv $$file.fixed $$file; \
-# done
- # replace ../../glibmm-2.4/docs with ../libglibmm-2.4-dev/
- for file in `find debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/ -name "*.html"`; do \
- sed 's/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/libglibmm-2.4-dev\//g' $$file > $$file.fixed; \
+install/libgtkmm-2.4-doc::
+ for file in `find debian/tmp/usr/share/doc/gtkmm-2.4/docs/ -name "*.html"`; do \
+ sed 's/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/libglibmm-2.4-doc\//g' $$file > $$file.fixed; \
mv $$file.fixed $$file; \
done
- for file in `find debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/ -name "*.html"`; do \
+ for file in `find debian/tmp/usr/share/doc/gtkmm-2.4/docs/ -name "*.html"`; do \
sed 's/\.\.\/\.\.\/\.\.\/examples\//\.\.\/\.\.\/examples\//g' $$file > $$file.fixed; \
mv $$file.fixed $$file; \
done
- mkdir debian/libgtkmm-2.4-dev/usr/share/doc/libgtkmm-2.4-dev/reference
- mv debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/reference/gtkmm_doxygen_tags \
- debian/libgtkmm-2.4-dev/usr/share/doc/libgtkmm-2.4-dev/reference
- dh_installexamples
- dh_install --sourcedir=debian/tmp
- for file in debian/libgtkmm-2.4-doc/usr/share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp; do \
+# mkdir debian/libgtkmm-2.4-dev/usr/share/doc/libgtkmm-2.4-dev/reference
+# mv debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/reference/gtkmm_doxygen_tags \
+# debian/libgtkmm-2.4-dev/usr/share/doc/libgtkmm-2.4-dev/reference
+ for file in debian/tmp/usr/share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp; do \
sed 's/\.\.\/\.\.\/\.\.\/doc\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/doc\/libgtkmm-2.4-doc\//g' $$file > $$file.fixed; \
mv $$file.fixed $$file; \
done
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -Xdoxygen_tags -Xexamples
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs -plibgtkmm-2.4-1c2a -V "libgtkmm-2.4-1c2a (>= 2.12.0)"
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
More information about the pkg-gnome-commits
mailing list