r9363 - in /desktop/experimental/gtk+2.0/debian: changelog control
control.in rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Mon Mar 26 15:44:52 CET 2007
Author: lool
Date: Mon Mar 26 14:44:52 2007
New Revision: 9363
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9363
Log:
* Fix control generation.
* Include the new uploaders.mk from gnome-pkg-tools instead of duplicatin
gits logic; build-dep on gnome-pkg-tools >= 0.11.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/control
desktop/experimental/gtk+2.0/debian/control.in
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=9363&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Mon Mar 26 14:44:52 2007
@@ -1,8 +1,11 @@
gtk+2.0 (2.10.11-2) UNRELEASED; urgency=low
* Bump libwmf conflicts to << 0.2.8.4-5.
-
- -- Loic Minier <lool at dooz.org> Wed, 21 Mar 2007 11:05:18 +0100
+ * Fix control generation.
+ * Include the new uploaders.mk from gnome-pkg-tools instead of duplicatin
+ gits logic; build-dep on gnome-pkg-tools >= 0.11.
+
+ -- Loic Minier <lool at dooz.org> Mon, 26 Mar 2007 16:44:32 +0200
gtk+2.0 (2.10.11-1) experimental; urgency=low
Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=9363&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Mon Mar 26 14:44:52 2007
@@ -2,8 +2,8 @@
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools (>= 0.10), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt
+Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools (>= 0.11), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.7.2
@@ -12,7 +12,7 @@
Architecture: any
Depends: libgtk2.0-common (= ${source:Version}), ${shlibs:Depends}
Provides: gtk2.0-binver-2.10.0
-Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-3), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<= 2.10), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-7), gtk2-engines-qtpixmap (<= 0.28-1.1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.3.90.2-1), tamil-gtk2im (<= 2.2-4.2), imhangul (<= 0.9.13-3), librsvg2-common (<= 2.14.4-2), gtk2-engines (<< 1:2.8.2-2), gtk2-engines-gtk-qt (<= 1:0.7-1), iiimgcf (<= 11.4.1870-7.3), scim-bridge (<= 0.2.4-1), scim-gtk2-immodule (<= 1.4.4-4), gtk-im-libthai (<= 0.1.4-1), uim-gtk2.0 (<= 1:1.2.1-3), libwmf-dev (<= 0.2.8.4-2), libwmf0.2-7 (<= 0.2.8.4-2), swf-player (<= 0.3.6-2.1)
+Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-3), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<= 2.10), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-7), gtk2-engines-qtpixmap (<= 0.28-1.1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.3.90.2-1), tamil-gtk2im (<= 2.2-4.2), imhangul (<= 0.9.13-3), librsvg2-common (<= 2.14.4-2), gtk2-engines (<< 1:2.8.2-2), gtk2-engines-gtk-qt (<= 1:0.7-1), iiimgcf (<= 11.4.1870-7.3), scim-bridge (<= 0.2.4-1), scim-gtk2-immodule (<= 1.4.4-4), gtk-im-libthai (<= 0.1.4-1), uim-gtk2.0 (<= 1:1.2.1-3), libwmf-dev (<< 0.2.8.4-5), libwmf0.2-7 (<< 0.2.8.4-5), swf-player (<= 0.3.6-2.1)
Replaces: libgtk2.0-0png3
Recommends: hicolor-icon-theme, libgtk2.0-bin
Description: The GTK+ graphical user interface library
@@ -45,6 +45,8 @@
Architecture: any
Depends: ${shlibs:Depends}
Description: The GTK+ graphical user interface library - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
for projects ranging from small one-off tools to complete application
Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=9363&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Mon Mar 26 14:44:52 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools (>= 0.10), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt
+Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools (>= 0.11), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.7.2
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=9363&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Mon Mar 26 14:44:52 2007
@@ -1,17 +1,14 @@
#!/usr/bin/make -f
-# Members list of Debian GNOME Maintainers
-TEAM_LIST ?= /usr/share/gnome-pkg-tools/pkg-gnome.team
+# Debian GNOME Maintainers
+DISABLE_UPDATE_UPLOADERS := 1
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
# get-orig-source target
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
# Prevent accidental uploads to unstable
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
GNOME_MODULE := gtk+
-
-# Remove maintainer from uploaders list
-maintainer := $(shell sed -n 's/^Maintainer: //p' debian/control.in)
-uploaders := $(shell grep -vF '$(maintainer)' $(TEAM_LIST))
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -167,7 +164,11 @@
install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
-debian/%: debian/%.in force
+# gross kludge to force control generation with the %.in target
+clean::
+ touch debian/control.in
+
+debian/%: debian/%.in
dh_testdir
sed \
-e "s#@SONAME@#$(SONAME)#g" \
@@ -185,12 +186,12 @@
-e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \
-e "s#@EXAMPLES_PKG@#$(EXAMPLES_PKG)#g" \
-e "s#@PIXBUF_PKG@#$(PIXBUF_PKG)#g" \
- -e "s#@GNOME_TEAM@#$(uploaders)#g" \
+ -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
-e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \
-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
$@.in > $@
-clean: debian/control
+clean:: debian/control
dh_testdir
dh_testroot
# remove install and build dirs
@@ -280,7 +281,5 @@
dh_md5sums -a
dh_builddeb -a
-force:
-
binary: binary-indep binary-arch
-.PHONY: patch configure build install clean binary-indep binary-arch force binary debian/control
+.PHONY: patch configure build install clean binary-indep binary-arch binary
More information about the pkg-gnome-commits
mailing list