r22526 - in /desktop/unstable/gnome-python-desktop/debian: changelog control control.in rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Mon Dec 7 01:36:39 UTC 2009
Author: pochu
Date: Mon Dec 7 01:36:39 2009
New Revision: 22526
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22526
Log:
* debian/control.in:
- Don't build python-mediaprofiles on Hurd, and don't build depend
on libgnome-media-dev on Hurd either.
- Same for python-brasero and libbrasero-media-dev.
- Let python-gnome2-desktop-dev depend on python-brasero (except on Hurd).
* debian/rules:
- Don't call 'dh_install' in the install target, call 'dh_install -s' and
'dh_install -i' in the binary-arch and binary-indep targets respectively
so that dh_install is not called for packages that shouldn't be built
on the current architecture.
Modified:
desktop/unstable/gnome-python-desktop/debian/changelog
desktop/unstable/gnome-python-desktop/debian/control
desktop/unstable/gnome-python-desktop/debian/control.in
desktop/unstable/gnome-python-desktop/debian/rules
Modified: desktop/unstable/gnome-python-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/changelog?rev=22526&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/changelog [utf-8] Mon Dec 7 01:36:39 2009
@@ -1,3 +1,18 @@
+gnome-python-desktop (2.28.0-4) unstable; urgency=low
+
+ * debian/control.in:
+ - Don't build python-mediaprofiles on Hurd, and don't build depend
+ on libgnome-media-dev on Hurd either.
+ - Same for python-brasero and libbrasero-media-dev.
+ - Let python-gnome2-desktop-dev depend on python-brasero (except on Hurd).
+ * debian/rules:
+ - Don't call 'dh_install' in the install target, call 'dh_install -s' and
+ 'dh_install -i' in the binary-arch and binary-indep targets respectively
+ so that dh_install is not called for packages that shouldn't be built
+ on the current architecture.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 07 Dec 2009 02:29:05 +0100
+
gnome-python-desktop (2.28.0-3) unstable; urgency=low
* debian/control.in,
Modified: desktop/unstable/gnome-python-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/control?rev=22526&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/control [utf-8] Mon Dec 7 01:36:39 2009
@@ -29,7 +29,7 @@
libtotem-plparser-dev (>= 1.4.0),
libgnomeprint2.2-dev (>= 2.2.0),
libgnomeprintui2.2-dev (>= 2.2),
- libgnome-media-dev (>= 2.10.0),
+ libgnome-media-dev (>= 2.10.0) [!hurd-i386],
libgconf2-dev (>= 2.10.0),
libmetacity-dev (>= 1:2.21.5),
libgnome-keyring-dev (>= 0.5.0),
@@ -37,7 +37,7 @@
libecal1.2-dev (>= 1.4.0),
libebook1.2-dev (>= 1.4.0),
libevince-dev,
- libbrasero-media-dev (>= 2.27.92-2),
+ libbrasero-media-dev (>= 2.27.92-2) [!hurd-i386],
bug-buddy (>= 2.16) [!hurd-i386]
Standards-Version: 3.8.3
XS-Python-Version: >= 2.5
@@ -45,6 +45,7 @@
Package: python-gnome2-desktop-dev
Architecture: all
Depends: ${misc:Depends},
+ python-brasero (>= ${source:Version}) [!hurd-any],
python-bugbuddy (>= ${source:Version}),
python-evince (>= ${source:Version}),
python-evolution (>= ${source:Version}),
@@ -53,7 +54,7 @@
python-gnomekeyring (>= ${source:Version}),
python-gnomeprint (>= ${source:Version}),
python-gtop (>= ${source:Version}),
- python-mediaprofiles (>= ${source:Version}),
+ python-mediaprofiles (>= ${source:Version}) [!hurd-any],
python-metacity (>= ${source:Version}),
python-rsvg (>= ${source:Version}),
python-totem-plparser (>= ${source:Version}),
@@ -67,7 +68,7 @@
that interoperate gnome-python.
Package: python-brasero
-Architecture: any
+Architecture: linux-any kfreebsd-any netbsd-any
Depends: ${misc:Depends},
${shlibs:Depends},
${python:Depends},
@@ -176,7 +177,7 @@
information library in Python applications.
Package: python-mediaprofiles
-Architecture: any
+Architecture: linux-any kfreebsd-any netbsd-any
Depends: ${misc:Depends},
${shlibs:Depends},
${python:Depends},
Modified: desktop/unstable/gnome-python-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/control.in?rev=22526&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/control.in [utf-8] Mon Dec 7 01:36:39 2009
@@ -24,7 +24,7 @@
libtotem-plparser-dev (>= 1.4.0),
libgnomeprint2.2-dev (>= 2.2.0),
libgnomeprintui2.2-dev (>= 2.2),
- libgnome-media-dev (>= 2.10.0),
+ libgnome-media-dev (>= 2.10.0) [!hurd-i386],
libgconf2-dev (>= 2.10.0),
libmetacity-dev (>= 1:2.21.5),
libgnome-keyring-dev (>= 0.5.0),
@@ -32,7 +32,7 @@
libecal1.2-dev (>= 1.4.0),
libebook1.2-dev (>= 1.4.0),
libevince-dev,
- libbrasero-media-dev (>= 2.27.92-2),
+ libbrasero-media-dev (>= 2.27.92-2) [!hurd-i386],
bug-buddy (>= 2.16) [!hurd-i386]
Standards-Version: 3.8.3
XS-Python-Version: >= 2.5
@@ -40,6 +40,7 @@
Package: python-gnome2-desktop-dev
Architecture: all
Depends: ${misc:Depends},
+ python-brasero (>= ${source:Version}) [!hurd-any],
python-bugbuddy (>= ${source:Version}),
python-evince (>= ${source:Version}),
python-evolution (>= ${source:Version}),
@@ -48,7 +49,7 @@
python-gnomekeyring (>= ${source:Version}),
python-gnomeprint (>= ${source:Version}),
python-gtop (>= ${source:Version}),
- python-mediaprofiles (>= ${source:Version}),
+ python-mediaprofiles (>= ${source:Version}) [!hurd-any],
python-metacity (>= ${source:Version}),
python-rsvg (>= ${source:Version}),
python-totem-plparser (>= ${source:Version}),
@@ -62,7 +63,7 @@
that interoperate gnome-python.
Package: python-brasero
-Architecture: any
+Architecture: linux-any kfreebsd-any netbsd-any
Depends: ${misc:Depends},
${shlibs:Depends},
${python:Depends},
@@ -171,7 +172,7 @@
information library in Python applications.
Package: python-mediaprofiles
-Architecture: any
+Architecture: linux-any kfreebsd-any netbsd-any
Depends: ${misc:Depends},
${shlibs:Depends},
${python:Depends},
Modified: desktop/unstable/gnome-python-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/rules?rev=22526&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/rules [utf-8] Mon Dec 7 01:36:39 2009
@@ -43,7 +43,6 @@
install: build install-clean $(PYVERS:%=install-%)
dh_installdirs
- dh_install
clean:: unpatch
dh_testdir
@@ -57,6 +56,7 @@
binary-indep: build install
dh_testdir
dh_testroot
+ dh_install -i
dh_installdocs -i
dh_installexamples -i
dh_installchangelogs -i ChangeLog
@@ -71,6 +71,7 @@
binary-arch: build install
dh_testdir
dh_testroot
+ dh_install -s
dh_installdocs -s
dh_installexamples -s
dh_installchangelogs -s ChangeLog
More information about the pkg-gnome-commits
mailing list