r13110 - in /desktop/unstable/libglademm2.4/debian: changelog compat control control.in libglademm-2.4-1c2a.dirs libglademm-2.4-1c2a.install libglademm-2.4-dev.dirs libglademm-2.4-dev.install libglademm-2.4-doc.install rules watch

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Sun Oct 14 06:48:25 UTC 2007


Author: manphiz-guest
Date: Sun Oct 14 06:48:25 2007
New Revision: 13110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13110
Log:
* New upstream version.
* Build system migrated to cdbs.
* Use ${binary:Version} instead of deprecated ${Source-Version}.
* Provide -dbg package to help debugging.
* 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.

Added:
    desktop/unstable/libglademm2.4/debian/control.in
      - copied, changed from r13105, desktop/unstable/libglademm2.4/debian/control
Removed:
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-1c2a.dirs
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-dev.dirs
Modified:
    desktop/unstable/libglademm2.4/debian/changelog
    desktop/unstable/libglademm2.4/debian/compat
    desktop/unstable/libglademm2.4/debian/control
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-1c2a.install
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-dev.install
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install
    desktop/unstable/libglademm2.4/debian/rules
    desktop/unstable/libglademm2.4/debian/watch

Modified: desktop/unstable/libglademm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/changelog?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/changelog (original)
+++ desktop/unstable/libglademm2.4/debian/changelog Sun Oct 14 06:48:25 2007
@@ -1,3 +1,17 @@
+libglademm2.4 (2.6.5-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Build system migrated to cdbs.
+  * Use ${binary:Version} instead of deprecated ${Source-Version}.
+  * Provide -dbg package to help debugging.
+  * 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>  Sun, 14 Oct 2007 13:15:42 +0800
+
 libglademm2.4 (2.6.2-2) unstable; urgency=low
 
   * split documentation into separate package (Closes: #380184)

Modified: desktop/unstable/libglademm2.4/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/compat?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/compat (original)
+++ desktop/unstable/libglademm2.4/debian/compat Sun Oct 14 06:48:25 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: desktop/unstable/libglademm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/control?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/control (original)
+++ desktop/unstable/libglademm2.4/debian/control Sun Oct 14 06:48:25 2007
@@ -1,14 +1,23 @@
 Source: libglademm2.4
 Section: libs
 Priority: optional
-Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libglade2-dev (>> 1:2.4.0), libgtkmm-2.4-dev (>= 1:2.6.5-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),
+               libglade2-dev (>> 1:2.4.0),
+               libgtkmm-2.4-dev (>= 1:2.6.5-1)
 Standards-Version: 3.7.2
 
 Package: libglademm-2.4-dev
 Section: libdevel
 Architecture: any
-Depends: libglademm-2.4-1c2a (= ${Source-Version}), libglade2-dev (>> 1:2.4.0), libgtkmm-2.4-dev (>= 1:2.6.5-1)
+Depends: ${misc:Depends},
+         libglademm-2.4-1c2a (= ${binary:Version}),
+         libglade2-dev (>> 1:2.4.0),
+         libgtkmm-2.4-dev (>= 1:2.6.5-1)
 Description: C++ wrappers for libglade2 (development files)
  Libglade is a library which enables an application to build its graphical
  interface from an XML file (generated by Glade) at runtime. libglademm is
@@ -19,7 +28,8 @@
 Package: libglademm-2.4-1c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Conflicts: libglademm-2.4-1, libglademm-2.4-1c2
 Replaces: libglademm-2.4-1, libglademm-2.4-1c2
 Description: C++ wrappers for libglade2 (shared library)
@@ -29,11 +39,29 @@
  .
  This package contains shared libraries.
 
+Package: libglademm-2.4-1c2a-dbg
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libglademm-2.4-1, libglademm-2.4-1c2
+Replaces: libglademm-2.4-1, libglademm-2.4-1c2
+Description: C++ wrappers for libglade2 (debug symbols)
+ Libglade is a library which enables an application to build its graphical
+ interface from an XML file (generated by Glade) at runtime. libglademm is
+ the C++ wrapper for libglade.
+ .
+ This package contains debug symbols for debugging applications using 
+ libglademm.
+
 Package: libglademm-2.4-doc
 Section: doc
 Architecture: all
-Suggests: libgtkmm-2.4-doc, libglademm-2.4-dev
-Description: C++ wrappers for libglade2 (development files)
+Depends: ${misc:Depends},
+         doc-base,
+         lynx | www-browser
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc, libglademm-2.4-dev
+Description: C++ wrappers for libglade2 (documentation)
  Libglade is a library which enables an application to build its graphical
  interface from an XML file (generated by Glade) at runtime. libglademm is
  the C++ wrapper for libglade.

Copied: desktop/unstable/libglademm2.4/debian/control.in (from r13105, desktop/unstable/libglademm2.4/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/control.in?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/control (original)
+++ desktop/unstable/libglademm2.4/debian/control.in Sun Oct 14 06:48:25 2007
@@ -1,14 +1,23 @@
 Source: libglademm2.4
 Section: libs
 Priority: optional
-Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libglade2-dev (>> 1:2.4.0), libgtkmm-2.4-dev (>= 1:2.6.5-1)
+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),
+               libglade2-dev (>> 1:2.4.0),
+               libgtkmm-2.4-dev (>= 1:2.6.5-1)
 Standards-Version: 3.7.2
 
 Package: libglademm-2.4-dev
 Section: libdevel
 Architecture: any
-Depends: libglademm-2.4-1c2a (= ${Source-Version}), libglade2-dev (>> 1:2.4.0), libgtkmm-2.4-dev (>= 1:2.6.5-1)
+Depends: ${misc:Depends},
+         libglademm-2.4-1c2a (= ${binary:Version}),
+         libglade2-dev (>> 1:2.4.0),
+         libgtkmm-2.4-dev (>= 1:2.6.5-1)
 Description: C++ wrappers for libglade2 (development files)
  Libglade is a library which enables an application to build its graphical
  interface from an XML file (generated by Glade) at runtime. libglademm is
@@ -19,7 +28,8 @@
 Package: libglademm-2.4-1c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Conflicts: libglademm-2.4-1, libglademm-2.4-1c2
 Replaces: libglademm-2.4-1, libglademm-2.4-1c2
 Description: C++ wrappers for libglade2 (shared library)
@@ -29,11 +39,29 @@
  .
  This package contains shared libraries.
 
+Package: libglademm-2.4-1c2a-dbg
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libglademm-2.4-1, libglademm-2.4-1c2
+Replaces: libglademm-2.4-1, libglademm-2.4-1c2
+Description: C++ wrappers for libglade2 (debug symbols)
+ Libglade is a library which enables an application to build its graphical
+ interface from an XML file (generated by Glade) at runtime. libglademm is
+ the C++ wrapper for libglade.
+ .
+ This package contains debug symbols for debugging applications using 
+ libglademm.
+
 Package: libglademm-2.4-doc
 Section: doc
 Architecture: all
-Suggests: libgtkmm-2.4-doc, libglademm-2.4-dev
-Description: C++ wrappers for libglade2 (development files)
+Depends: ${misc:Depends},
+         doc-base,
+         lynx | www-browser
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc, libglademm-2.4-dev
+Description: C++ wrappers for libglade2 (documentation)
  Libglade is a library which enables an application to build its graphical
  interface from an XML file (generated by Glade) at runtime. libglademm is
  the C++ wrapper for libglade.

Modified: desktop/unstable/libglademm2.4/debian/libglademm-2.4-1c2a.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-1c2a.install?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-1c2a.install (original)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-1c2a.install Sun Oct 14 06:48:25 2007
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+debian/tmp/usr/lib/lib*.so.* usr/lib

Modified: desktop/unstable/libglademm2.4/debian/libglademm-2.4-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-dev.install?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-dev.install (original)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-dev.install Sun Oct 14 06:48:25 2007
@@ -1,6 +1,5 @@
-usr/include/*
-usr/lib/libglademm-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/libglademm-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/libglademm2.4/debian/libglademm-2.4-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install (original)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install Sun Oct 14 06:48:25 2007
@@ -1,1 +1,1 @@
-usr/share/devhelp/*
+debian/tmp/usr/share/devhelp/* usr/share/devhelp

Modified: desktop/unstable/libglademm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/rules?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/rules (original)
+++ desktop/unstable/libglademm2.4/debian/rules Sun Oct 14 06:48:25 2007
@@ -6,122 +6,44 @@
 # 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 := libglademm
 
-CXXFLAGS = -Wall -g
+DEB_COMPRESS_EXCLUDE := doxygen_tags
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS+=" -Wl,-z,defs -Wl,-O1"
 
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
 
-autogen:
-	libtoolize --force --copy
-	aclocal-1.7 -I scripts
-	automake-1.7 --copy --add-missing
-	autoconf2.50
+DEB_DH_MAKESHLIBS_ARGS_libglademm-2.4-1c2a := -V"libglademm-2.4-1c2a (>= 2.6.0)"
 
+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)"
+DEB_INSTALL_DOCS_ALL := -XMakefile -XDoxyfile
 
+DEB_INSTALL_EXAMPLES_libglademm-2.4-doc := -X.deps -X.libs -X.o
 
-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
+binary-post-install/libglademm-2.4-doc::
 	for file in debian/libglademm-2.4-doc/usr/share/doc/libglademm-2.4-doc/reference/html/*.html; do \
 		sed 's/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2\.4-doc\//g' $$file > $$file.fixed; \
 		mv $$file.fixed $$file; \
-		sed 's/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libglibmm-2\.4-dev\//g' $$file > $$file.fixed; \
+		sed 's/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libglibmm-2\.4-doc\//g' $$file > $$file.fixed; \
 		mv $$file.fixed $$file; \
 	done
+	mkdir -p debian/libglademm-2.4-dev/usr/share/doc/libglademm-2.4-dev/reference
 	mv debian/libglademm-2.4-doc/usr/share/doc/libglademm-2.4-doc/reference/libglademm_doxygen_tags \
 	   debian/libglademm-2.4-dev/usr/share/doc/libglademm-2.4-dev/reference
-	dh_installexamples -X.deps -X.libs -X.o
-	dh_install --sourcedir=debian/tmp
 	for file in debian/libglademm-2.4-doc/usr/share/devhelp/books/libglademm-2.4/libglademm-2.4.devhelp; do \
 		sed 's/\.\.\/\.\.\/\.\.\/doc\/gnomemm-2\.6\/libglademm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/doc\/libglademm-2\.4-doc\//g' $$file > $$file.fixed; \
 		mv $$file.fixed $$file; \
 		sed 's/\.\.\/\.\.\/index\.html/index\.html/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
-	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/libglademm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/watch?rev=13110&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/watch (original)
+++ desktop/unstable/libglademm2.4/debian/watch Sun Oct 14 06:48:25 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/libglademm/2.6/libglademm-(.*)\.tar\.gz	debian	uupdate
+http://download.gnome.org/sources/libglademm/([\d\.]+)[02468]/ \
+	libglademm-(.*)\.tar\.gz \
+	debian uupdate




More information about the pkg-gnome-commits mailing list