r15085 - in /packages/unstable/bakery2.4/debian: changelog control control.in libbakery-2.4-1.dirs libbakery-2.4-dev.dirs rules

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Fri Mar 14 10:18:23 UTC 2008


Author: manphiz-guest
Date: Fri Mar 14 10:18:22 2008
New Revision: 15085

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15085
Log:
* Switch packaging system to cdbs, b-dep on cdbs (>= 0.4.51) to avoid
  empty -dbg package bug.
* Remove useless *.dirs files.

Removed:
    packages/unstable/bakery2.4/debian/libbakery-2.4-1.dirs
    packages/unstable/bakery2.4/debian/libbakery-2.4-dev.dirs
Modified:
    packages/unstable/bakery2.4/debian/changelog
    packages/unstable/bakery2.4/debian/control
    packages/unstable/bakery2.4/debian/control.in
    packages/unstable/bakery2.4/debian/rules

Modified: packages/unstable/bakery2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/bakery2.4/debian/changelog?rev=15085&op=diff
==============================================================================
--- packages/unstable/bakery2.4/debian/changelog (original)
+++ packages/unstable/bakery2.4/debian/changelog Fri Mar 14 10:18:22 2008
@@ -10,8 +10,11 @@
     recommended.
   * Bump compatibility level to 6, hence debhelper (>= 6).
   * Update standard version to 3.7.3.
+  * Switch packaging system to cdbs, b-dep on cdbs (>= 0.4.51) to avoid
+    empty -dbg package bug.
+  * Remove useless *.dirs files.
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Fri, 14 Mar 2008 17:37:00 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Fri, 14 Mar 2008 18:16:07 +0800
 
 bakery2.4 (2.4.0-2) unstable; urgency=low
 

Modified: packages/unstable/bakery2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/bakery2.4/debian/control?rev=15085&op=diff
==============================================================================
--- packages/unstable/bakery2.4/debian/control (original)
+++ packages/unstable/bakery2.4/debian/control Fri Mar 14 10:18:22 2008
@@ -2,15 +2,32 @@
 Section: libs
 Priority: optional
 Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4), libgtkmm-2.4-dev (>> 1:2.8.0), libgconfmm-2.6-dev (>= 2.10.0-3), libglademm-2.4-dev (>= 2.6.1-1), libgnome-vfsmm-2.6-dev (>= 2.10.0-1), libxml++2.6-dev (>> 2.8.0), libxml-parser-perl, doxygen
-Standards-Version: 3.7.2
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Deng Xiyue <manphiz-guest at users.alioth.debian.org>
+Build-Depends: cdbs (>= 0.4.51),
+               chrpath,
+               debhelper (>= 6),
+               doxygen,
+               libgconfmm-2.6-dev (>= 2.10.0-3),
+               libglademm-2.4-dev (>= 2.6.1-1),
+               libgnome-vfsmm-2.6-dev (>= 2.10.0-1),
+               libgtkmm-2.4-dev (>> 1:2.8.0),
+               libxml++2.6-dev (>> 2.8.0),
+               libxml-parser-perl
+Standards-Version: 3.7.3
 
 Package: libbakery-2.4-dev
 Section: libdevel
 Architecture: any
 Conflicts: libbakery-2.3-dev
 Replaces: libbakery-2.3-dev
-Depends: libbakery-2.4-1 (= ${Source-Version}), libgtkmm-2.4-dev (>> 1:2.8.0), libgconfmm-2.6-dev (>= 2.10.0-3), libglademm-2.4-dev (>= 2.6.1-1), libgnome-vfsmm-2.6-dev (>= 2.10.0-1), libxml++2.6-dev (>> 2.8.0)
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libbakery-2.4-1 (= ${binary:Version}),
+         libgtkmm-2.4-dev (>> 1:2.8.0),
+         libgconfmm-2.6-dev (>= 2.10.0-3),
+         libglademm-2.4-dev (>= 2.6.1-1),
+         libgnome-vfsmm-2.6-dev (>= 2.10.0-1),
+         libxml++2.6-dev (>> 2.8.0)
 Description: A C++ Application Framework (development files)
  Bakery is a C++ Framework for creating GTK+ or GNOME applications
  using gtkmm and gnomemm.
@@ -32,9 +49,15 @@
 Package: libbakery-2.4-1
 Section: libs
 Architecture: any
-Conflicts: libbakery-2.3-11, libbakery-2.3-11c2, libbakery-2.3-11c2a
-Replaces: libbakery-2.3-11, libbakery-2.3-11c2, libbakery-2.3-11c2a
-Depends: libbakery-common (>= ${Source-Version}), ${shlibs:Depends}
+Conflicts: libbakery-2.3-11,
+           libbakery-2.3-11c2,
+           libbakery-2.3-11c2a
+Replaces: libbakery-2.3-11,
+          libbakery-2.3-11c2,
+          libbakery-2.3-11c2a
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libbakery-common (>= ${source:Version})
 Description: A C++ Application Framework (shared libraries)
  Bakery is a C++ Framework for creating GTK+ or GNOME applications
  using gtkmm and gnomemm.

Modified: packages/unstable/bakery2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/bakery2.4/debian/control.in?rev=15085&op=diff
==============================================================================
--- packages/unstable/bakery2.4/debian/control.in (original)
+++ packages/unstable/bakery2.4/debian/control.in Fri Mar 14 10:18:22 2008
@@ -3,14 +3,16 @@
 Priority: optional
 Maintainer: Bradley Bell <btb at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 6),
-               libgtkmm-2.4-dev (>> 1:2.8.0),
+Build-Depends: cdbs (>= 0.4.51),
+               chrpath,
+               debhelper (>= 6),
+               doxygen,
                libgconfmm-2.6-dev (>= 2.10.0-3),
                libglademm-2.4-dev (>= 2.6.1-1),
                libgnome-vfsmm-2.6-dev (>= 2.10.0-1),
+               libgtkmm-2.4-dev (>> 1:2.8.0),
                libxml++2.6-dev (>> 2.8.0),
-               libxml-parser-perl,
-               doxygen
+               libxml-parser-perl
 Standards-Version: 3.7.3
 
 Package: libbakery-2.4-dev

Modified: packages/unstable/bakery2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/bakery2.4/debian/rules?rev=15085&op=diff
==============================================================================
--- packages/unstable/bakery2.4/debian/rules (original)
+++ packages/unstable/bakery2.4/debian/rules Fri Mar 14 10:18:22 2008
@@ -1,117 +1,23 @@
 #!/usr/bin/make -f
-# 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
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.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
 
-# 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)
+GNOME_MODULE := bakery
 
+SHARED_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libbakery-[0-9\.]+-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+DOC_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libbakery-[0-9\.]+-doc)[[:space:]]*$$/\1/p' debian/control)
+SHVER := 2.4.0
 
-CFLAGS = -Wall -g
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
+DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-
-autogen:
-	libtoolize --force --copy
-	aclocal-1.9
-	automake-1.9
-	autoconf
-
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# build
-	$(MAKE)
-
-	# build reference documentation
-	$(MAKE) -C docs/reference
-
-	touch build-stamp
-
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	-rm -rf docs/reference/xml
-	-rm intltool-extract intltool-merge intltool-update
-
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess config.guess
-
-	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 prefix=$(CURDIR)/debian/tmp/usr
-
-
-# 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 -XCVS -X.cvsignore
-	dh_installexamples -X.deps -X.libs -X.o
-	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
-	dh_compress -Xexamples -Xdoxygen_tags
-	dh_fixperms
-#	dh_perl
-#	d_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 
+# chrpath hack to get rid of amd64 rpath
+common-install-impl::
+	chrpath -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/lib/*.so*




More information about the pkg-gnome-commits mailing list