r13061 - in /desktop/unstable/gtkmm2.4/debian: changelog control control.in rules watch

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Wed Oct 10 11:14:20 UTC 2007


Author: manphiz-guest
Date: Wed Oct 10 11:14:20 2007
New Revision: 13061

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13061
Log:
Change dependencies on correct glibmm and gtk version, add doc-base and gnome-pkg-tools as dependencies;
Set named shlibs version;
Check Makefile before 'make distclean', and use  instead of Version;
Refine watch file URL;
Build static library;
Migrate ownership.

Added:
    desktop/unstable/gtkmm2.4/debian/control.in
      - copied, changed from r13059, desktop/unstable/gtkmm2.4/debian/control
Modified:
    desktop/unstable/gtkmm2.4/debian/changelog
    desktop/unstable/gtkmm2.4/debian/control
    desktop/unstable/gtkmm2.4/debian/rules
    desktop/unstable/gtkmm2.4/debian/watch

Modified: desktop/unstable/gtkmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/changelog?rev=13061&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/changelog (original)
+++ desktop/unstable/gtkmm2.4/debian/changelog Wed Oct 10 11:14:20 2007
@@ -1,3 +1,21 @@
+gtkmm2.4 (1:2.12.1-1) UNRELEASED; urgency=low
+
+  * New upstream version. Closes: #443395
+    - Fix FTBFS against glib-2.14 and gtk+-2.12. Closes: #444516
+  * Build with --enable-static to provide static library. Closes: #381889
+  * Tighten library dependencies. Closes: #383514
+  * Provide shlibs version 2.12.0. Closes: #417844
+  * 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.
+    - 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:53:06 +0800
+
 gtkmm2.4 (1:2.10.10-0.2) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: desktop/unstable/gtkmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control?rev=13061&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control (original)
+++ desktop/unstable/gtkmm2.4/debian/control Wed Oct 10 11:14:20 2007
@@ -1,14 +1,25 @@
 Source: gtkmm2.4
 Section: libs
 Priority: optional
-Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>> 2.10.0), libglibmm-2.4-dev (>= 2.12.8-1), libatk1.0-dev (>> 1.9.0), libcairomm-1.0-dev (>= 1.1.12)
+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),
+               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),
+               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 (= ${Source-Version}), libgtk2.0-dev (>> 2.10.0), libglibmm-2.4-dev (>= 2.12.8-1), libatk1.0-dev (>> 1.9.0), libcairomm-1.0-dev (>= 1.1.12)
+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),
+         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+.
  Gtkmm provides a convenient interface for C++ programmers to create
@@ -38,7 +49,9 @@
 Package: libgtkmm-2.4-doc
 Section: doc
 Architecture: all
-Suggests: libgtkmm-2.4-dev, www-browser
+Depends: lynx | www-browser,
+         doc-base
+Suggests: libgtkmm-2.4-dev, libglibmm-2.4-doc
 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

Copied: desktop/unstable/gtkmm2.4/debian/control.in (from r13059, desktop/unstable/gtkmm2.4/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control.in?rev=13061&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control (original)
+++ desktop/unstable/gtkmm2.4/debian/control.in Wed Oct 10 11:14:20 2007
@@ -1,14 +1,25 @@
 Source: gtkmm2.4
 Section: libs
 Priority: optional
-Maintainer: Bradley Bell <btb at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>> 2.10.0), libglibmm-2.4-dev (>= 2.12.8-1), libatk1.0-dev (>> 1.9.0), libcairomm-1.0-dev (>= 1.1.12)
+Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: 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),
+               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 (= ${Source-Version}), libgtk2.0-dev (>> 2.10.0), libglibmm-2.4-dev (>= 2.12.8-1), libatk1.0-dev (>> 1.9.0), libcairomm-1.0-dev (>= 1.1.12)
+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),
+         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+.
  Gtkmm provides a convenient interface for C++ programmers to create
@@ -38,7 +49,9 @@
 Package: libgtkmm-2.4-doc
 Section: doc
 Architecture: all
-Suggests: libgtkmm-2.4-dev, www-browser
+Depends: lynx | www-browser,
+         doc-base
+Suggests: libgtkmm-2.4-dev, libglibmm-2.4-doc
 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/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/rules?rev=13061&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/rules (original)
+++ desktop/unstable/gtkmm2.4/debian/rules Wed Oct 10 11:14:20 2007
@@ -6,6 +6,11 @@
 # 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 := gtkmm
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -35,8 +40,15 @@
 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 CXXFLAGS="$(CXXFLAGS)" --disable-examples --disable-demos
-
+	./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
@@ -53,16 +65,15 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) -C demos distclean
-	-$(MAKE) -C examples distclean
-	-$(MAKE) distclean
+	[ ! -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 
 
@@ -125,7 +136,7 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs
+	dh_makeshlibs -plibgtkmm-2.4-1c2a -V "libgtkmm-2.4-1c2a (>= 2.12.0)"
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Modified: desktop/unstable/gtkmm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/watch?rev=13061&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/watch (original)
+++ desktop/unstable/gtkmm2.4/debian/watch Wed Oct 10 11:14:20 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/gtkmm/2.6/gtkmm-(.*)\.tar\.gz	debian	uupdate
+ftp://download.gnome.org/sources/gtkmm/([\d\.]+)[02468]/
+        gtkmm-(.*)\.tar\.gz \
+	debian uupdate




More information about the pkg-gnome-commits mailing list