r20947 - in /packages/unstable/update-manager/debian: control control.in rules update-manager-doc.install
speijnik-guest at users.alioth.debian.org
speijnik-guest at users.alioth.debian.org
Sun Aug 16 21:45:26 UTC 2009
Author: speijnik-guest
Date: Sun Aug 16 21:45:25 2009
New Revision: 20947
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20947
Log:
Switched back to CDBS. Using team magic again. Regenerated debian/control.
Fixed debian/update-manager-doc.install.
Modified:
packages/unstable/update-manager/debian/control
packages/unstable/update-manager/debian/control.in
packages/unstable/update-manager/debian/rules
packages/unstable/update-manager/debian/update-manager-doc.install
Modified: packages/unstable/update-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/control?rev=20947&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/control [utf-8] (original)
+++ packages/unstable/update-manager/debian/control [utf-8] Sun Aug 16 21:45:25 2009
@@ -1,11 +1,13 @@
Source: update-manager
Section: gnome
Priority: optional
-XS-Python-Version: all
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Stephan Peijnik <debian at sp.or.at>,
- Michael Vogt <mvo at debian.org>
-Build-Depends: debhelper (>= 5.0.51),
+ Michael Vogt <mvo at debian.org>,
+ Emilio Pozuelo Monfort <pochu at ubuntu.com>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: cdbs,
+ gnome-pkg-tools,
+ debhelper (>= 5.0.51),
python-support (>= 0.5.6),
python
Build-Depends-Indep: intltool,
@@ -26,7 +28,6 @@
Package: update-manager-core
Architecture: all
Section: admin
-XB-Python-Version: ${python:Versions}
Depends: ${python:Depends},
${misc:Depends},
lsb-release,
@@ -57,7 +58,6 @@
Package: update-manager-gnome
Architecture: all
-XB-Python-Version: ${python:Versions}
Depends: ${python:Depends},
${misc:Depends},
update-manager-core (= ${source:Version}),
Modified: packages/unstable/update-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/control.in?rev=20947&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/control.in [utf-8] (original)
+++ packages/unstable/update-manager/debian/control.in [utf-8] Sun Aug 16 21:45:25 2009
@@ -1,15 +1,15 @@
Source: update-manager
Section: gnome
Priority: optional
-XS-Python-Version: all
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Stephan Peijnik <debian at sp.or.at>,
Michael Vogt <mvo at debian.org>,
@GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.51),
+Build-Depends: cdbs,
+ gnome-pkg-tools,
+ debhelper (>= 5.0.51),
python-support (>= 0.5.6),
python
-
Build-Depends-Indep: intltool,
python-distutils-extra (>= 1.90),
python-sphinx (>= 0.6.1),
@@ -28,7 +28,6 @@
Package: update-manager-core
Architecture: all
Section: admin
-XB-Python-Version: ${python:Versions}
Depends: ${python:Depends},
${misc:Depends},
lsb-release,
@@ -59,7 +58,6 @@
Package: update-manager-gnome
Architecture: all
-XB-Python-Version: ${python:Versions}
Depends: ${python:Depends},
${misc:Depends},
update-manager-core (= ${source:Version}),
Modified: packages/unstable/update-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/rules?rev=20947&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/rules [utf-8] (original)
+++ packages/unstable/update-manager/debian/rules [utf-8] Sun Aug 16 21:45:25 2009
@@ -1,67 +1,27 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM := pysupport
+DEB_COMPRESS_EXCLUDE := .js .inv changelog.txt changelog.html
-build: build-stamp
-build-stamp: build-python
-build-python:
- dh_testdir
- python setup.py build
- cd doc && make html
- touch $@
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-clean:
- dh_testdir
- dh_testroot
- python setup.py clean --all
- find . -name "*.pyc" -exec rm {} \;
- rm -f build-stamp build-python
- rm -rf build doc/build
- mkdir doc/build
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_installdirs
- set -e; \
- python setup.py install --root=$(CURDIR)/debian/tmp \
- --install-layout=deb
- mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/update-manager-apidoc
- rm $(CURDIR)/doc/build/html/_static/jquery.js
+build/update-manager-doc::
+ -mkdir -p $(CURDIR)/doc/build
+ -mkdir -p $(CURDIR)/doc/source/_static
+ $(MAKE) -C $(CURDIR)/doc html
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/update-manager-doc
+ -rm $(CURDIR)/doc/build/html/_static/jquery.js
ln -s /usr/share/javascript/jquery/jquery.js \
$(CURDIR)/doc/build/html/_static/jquery.js
cp -r $(CURDIR)/doc/build/html \
- $(CURDIR)/debian/tmp/usr/share/doc/update-manager-apidoc
+ $(CURDIR)/debian/tmp/usr/share/doc/update-manager-doc
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install
- dh_installmime
- dh_icons
- dh_gconf
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress -X .html -X .js -X _static/* -X _sources/* -X _sources/*/*
- dh_fixperms
- dh_pysupport
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
+# copied from CDBS; I cannot use gnome.mk, for it includes autotools.mk
+# although this package does not use autotools; the build, thus, fails.
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ $(if $(wildcard /usr/bin/dh_gconf),dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS))
+ $(if $(wildcard /usr/bin/dh_desktop),dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS))
Modified: packages/unstable/update-manager/debian/update-manager-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/update-manager-doc.install?rev=20947&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/update-manager-doc.install [utf-8] (original)
+++ packages/unstable/update-manager/debian/update-manager-doc.install [utf-8] Sun Aug 16 21:45:25 2009
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/doc/update-manager-apidoc/* /usr/share/doc/update-manager-apidoc
+debian/tmp/usr/share/doc/update-manager-doc/* /usr/share/doc/update-manager-doc
More information about the pkg-gnome-commits
mailing list