r22266 - in /packages/unstable/jhbuild/debian: changelog control control.in install jhbuild.docs patches/ patches/01_import_from_pkgdatadir.patch rules watch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Mon Nov 9 19:24:26 UTC 2009
Author: pochu
Date: Mon Nov 9 19:24:26 2009
New Revision: 22266
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22266
Log:
* New upstream release. Closes: #524504.
- Use 'git rev-parse' rather than 'git-rev-parse'. Closes: #544642.
* Ship install-check. Closes: #441008.
* Uploaders list regenerated. Closes: #523542, #554071.
* debian/control.in,
debian/rules:
- Stop shipping a copy of subprocess.py. Require python >= 2.4.
- Switch to python-support.
* debian/control.in:
- Bump Standards-Version to 3.8.3, no changes needed.
- Build depend on intltool >= 0.35.0.
- Build depend on pkg-config, gnome-doc-utils and rarian-compat to build
the documentation.
- Make jhbuild arch any since install-check is a binary. Depend on
${shlibs:Depends}.
- Recommend, and not suggest, git-core. Also recommend mercurial.
* debian/watch:
- Added.
* debian/patches/01_import_from_pkgdatadir.patch:
- Added, import jhbuild from pkgdatadir if everything else fails.
This way we can ship the jhbuild private modules in /usr/sharejhbuild.
* debian/jhbuild.docs:
- Removed, the necessary docs are now installed by the upstream Makefile.
* debian/rules:
- Include autotools.mk and gnome.mk.
- Remove all the manual build process, autotools.mk does everything now.
- Install the jhbuild modules in /usr/share/jhbuild.
* debian/install:
- Install the modulesets and patches from here since the upstream build
system doesn't install them.
Added:
packages/unstable/jhbuild/debian/install
packages/unstable/jhbuild/debian/patches/
packages/unstable/jhbuild/debian/patches/01_import_from_pkgdatadir.patch
packages/unstable/jhbuild/debian/watch
Removed:
packages/unstable/jhbuild/debian/jhbuild.docs
Modified:
packages/unstable/jhbuild/debian/changelog
packages/unstable/jhbuild/debian/control
packages/unstable/jhbuild/debian/control.in
packages/unstable/jhbuild/debian/rules
Modified: packages/unstable/jhbuild/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/changelog?rev=22266&op=diff
==============================================================================
--- packages/unstable/jhbuild/debian/changelog [utf-8] (original)
+++ packages/unstable/jhbuild/debian/changelog [utf-8] Mon Nov 9 19:24:26 2009
@@ -1,10 +1,43 @@
-jhbuild (0.0.svn.r1378-2) UNRELEASED; urgency=low
+jhbuild (2.28.0-1) unstable; urgency=low
+ [ Loic Minier ]
* Cleanups.
* Ship scripts.
* Don't set GNOME_MODULE as it equals the name of the source package.
- -- Loic Minier <lool at dooz.org> Sat, 12 May 2007 14:24:19 +0200
+ [ Emilio Pozuelo Monfort ]
+ * New upstream release. Closes: #524504.
+ - Use 'git rev-parse' rather than 'git-rev-parse'. Closes: #544642.
+ * Ship install-check. Closes: #441008.
+ * Uploaders list regenerated. Closes: #523542, #554071.
+ * debian/control.in,
+ debian/rules:
+ - Stop shipping a copy of subprocess.py. Require python >= 2.4.
+ - Switch to python-support.
+ * debian/control.in:
+ - Bump Standards-Version to 3.8.3, no changes needed.
+ - Build depend on intltool >= 0.35.0.
+ - Build depend on pkg-config, gnome-doc-utils and rarian-compat to build
+ the documentation.
+ - Make jhbuild arch any since install-check is a binary. Depend on
+ ${shlibs:Depends}.
+ - Recommend, and not suggest, git-core. Also recommend mercurial.
+ * debian/watch:
+ - Added.
+ * debian/patches/01_import_from_pkgdatadir.patch:
+ - Added, import jhbuild from pkgdatadir if everything else fails.
+ This way we can ship the jhbuild private modules in /usr/sharejhbuild.
+ * debian/jhbuild.docs:
+ - Removed, the necessary docs are now installed by the upstream Makefile.
+ * debian/rules:
+ - Include autotools.mk and gnome.mk.
+ - Remove all the manual build process, autotools.mk does everything now.
+ - Install the jhbuild modules in /usr/share/jhbuild.
+ * debian/install:
+ - Install the modulesets and patches from here since the upstream build
+ system doesn't install them.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 09 Nov 2009 20:28:48 +0100
jhbuild (0.0.svn.r1378-1) unstable; urgency=low
Modified: packages/unstable/jhbuild/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/control?rev=22266&op=diff
==============================================================================
--- packages/unstable/jhbuild/debian/control [utf-8] (original)
+++ packages/unstable/jhbuild/debian/control [utf-8] Mon Nov 9 19:24:26 2009
@@ -2,22 +2,28 @@
Section: devel
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
Build-Depends: cdbs,
- debhelper (>= 5)
-Build-Depends-Indep: python-central (>= 0.5.6),
- gnome-pkg-tools,
- xmlto
-Standards-Version: 3.7.2
-XS-Python-Version: >= 2.2
+ debhelper (>= 5),
+ python-support,
+ gnome-pkg-tools,
+ intltool (>= 0.35.0),
+ pkg-config,
+ gnome-doc-utils,
+ rarian-compat
+Standards-Version: 3.8.3
+XS-Python-Version: >= 2.4
Package: jhbuild
-Architecture: all
-Depends: ${misc:Depends},
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
${python:Depends}
-Recommends: cvs,
+Recommends: bzr,
+ cvs,
+ git-core,
+ mercurial,
subversion,
- bzr,
patch,
wget | curl,
autoconf,
@@ -26,9 +32,7 @@
pkg-config
Suggests: tla,
darcs,
- git-core,
python-pygraphviz
-XB-Python-Version: ${python:Versions}
Description: flexible build script for package collections
Jhbuild is a program that can be used to pull a number of modules from
CVS, Subversion, Bazaar and other types of repositories or from
@@ -40,4 +44,3 @@
able to build a number of the modules in freedesktop.org's CVS.
Extending it to handle new modules is usually trivial assuming the
build infrastructure matches the other modules it handles.
-
Modified: packages/unstable/jhbuild/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/control.in?rev=22266&op=diff
==============================================================================
--- packages/unstable/jhbuild/debian/control.in [utf-8] (original)
+++ packages/unstable/jhbuild/debian/control.in [utf-8] Mon Nov 9 19:24:26 2009
@@ -4,20 +4,26 @@
Maintainer: Loic Minier <lool at dooz.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
- debhelper (>= 5)
-Build-Depends-Indep: python-central (>= 0.5.6),
- gnome-pkg-tools,
- xmlto
-Standards-Version: 3.7.2
-XS-Python-Version: >= 2.2
+ debhelper (>= 5),
+ python-support,
+ gnome-pkg-tools,
+ intltool (>= 0.35.0),
+ pkg-config,
+ gnome-doc-utils,
+ rarian-compat
+Standards-Version: 3.8.3
+XS-Python-Version: >= 2.4
Package: jhbuild
-Architecture: all
-Depends: ${misc:Depends},
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
${python:Depends}
-Recommends: cvs,
+Recommends: bzr,
+ cvs,
+ git-core,
+ mercurial,
subversion,
- bzr,
patch,
wget | curl,
autoconf,
@@ -26,9 +32,7 @@
pkg-config
Suggests: tla,
darcs,
- git-core,
python-pygraphviz
-XB-Python-Version: ${python:Versions}
Description: flexible build script for package collections
Jhbuild is a program that can be used to pull a number of modules from
CVS, Subversion, Bazaar and other types of repositories or from
@@ -40,4 +44,3 @@
able to build a number of the modules in freedesktop.org's CVS.
Extending it to handle new modules is usually trivial assuming the
build infrastructure matches the other modules it handles.
-
Added: packages/unstable/jhbuild/debian/install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/install?rev=22266&op=file
==============================================================================
--- packages/unstable/jhbuild/debian/install (added)
+++ packages/unstable/jhbuild/debian/install [utf-8] Mon Nov 9 19:24:26 2009
@@ -1,0 +1,2 @@
+modulesets usr/share/jhbuild
+patches usr/share/jhbuild
Added: packages/unstable/jhbuild/debian/patches/01_import_from_pkgdatadir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/patches/01_import_from_pkgdatadir.patch?rev=22266&op=file
==============================================================================
--- packages/unstable/jhbuild/debian/patches/01_import_from_pkgdatadir.patch (added)
+++ packages/unstable/jhbuild/debian/patches/01_import_from_pkgdatadir.patch [utf-8] Mon Nov 9 19:24:26 2009
@@ -1,0 +1,27 @@
+From 108505537887cf341c875f69012d00a0ea1222d3 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Mon, 9 Nov 2009 14:20:32 +0100
+Subject: [PATCH] Bug 601251: Import jhbuild from pkgdatadir
+
+---
+ scripts/jhbuild.in | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/jhbuild.in b/scripts/jhbuild.in
+index dc9ccdf..dfb4450 100644
+--- a/scripts/jhbuild.in
++++ b/scripts/jhbuild.in
+@@ -22,6 +22,10 @@ else:
+ import jhbuild
+ except ImportError:
+ sys.path.insert(0, srcdir)
++ try:
++ import jhbuild
++ except ImportError:
++ sys.path.insert(0, pkgdatadir)
+
+ __builtin__.__dict__['PKGDATADIR'] = pkgdatadir
+ __builtin__.__dict__['DATADIR'] = datadir
+--
+1.6.5.2
+
Modified: packages/unstable/jhbuild/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/rules?rev=22266&op=diff
==============================================================================
--- packages/unstable/jhbuild/debian/rules [utf-8] (original)
+++ packages/unstable/jhbuild/debian/rules [utf-8] Mon Nov 9 19:24:26 2009
@@ -1,58 +1,20 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DESTDIR = debian/jhbuild
-PREFIX = /usr
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share/jhbuild
-SYSCONFDIR = /etc
-DOCDIR = $(PREFIX)/share/doc/jhbuild
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-doc-installation=yes
-# build and clean documentation manually
-build/jhbuild:: doc/jhbuild.html
-doc/jhbuild.html:: doc/custom.xsl doc/jhbuild.css doc/jhbuild.xml
- cd doc && xmlto xhtml-nochunks -m custom.xsl jhbuild.xml
-clean::
- rm -f doc/jhbuild.html
-
-# install files manually
install/jhbuild::
- # data dir holding most stuff
- install -d $(DESTDIR)$(DATADIR)
- # Python code
- cp -a jhbuild $(DESTDIR)$(DATADIR)
- # command line wrapper
- install -d $(DESTDIR)$(BINDIR)
- sed "s, at jhbuilddir@,$(DATADIR),g" \
- <jhbuild.in \
- >$(DESTDIR)$(BINDIR)/jhbuild
- # modulesets
- cp -a modulesets $(DESTDIR)$(DATADIR)
- # patches
- cp -a patches $(DESTDIR)$(DATADIR)
- # TODO install-check (arch: any)
- # Desktop file
- install -d $(DESTDIR)$(PREFIX)/share/applications
- cp -a jhbuild.desktop $(DESTDIR)$(PREFIX)/share/applications
- # bash completion
- install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
- cp -a contrib/jhbuild_completion.bash $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/jhbuild
- # scripts
- install -d $(DESTDIR)$(DOCDIR)
- cp -a scripts $(DESTDIR)$(DOCDIR)
- # make files with a shebang executable
- # XXX might need some dh_fixperms and dh_compress excludes
- egrep -rlZ '^#!(.*)(python|bash)' \
- $(DESTDIR)$(DATADIR) \
- $(DESTDIR)$(SYSCONFDIR) \
- $(DESTDIR)$(DOCDIR) \
- | xargs -0 chmod a+x --
+ mv debian/jhbuild/usr/lib/python*/*-packages/jhbuild \
+ debian/jhbuild/usr/share/jhbuild
+ cd debian/jhbuild/usr && rmdir -p lib/python*/*-packages
+ rm -r debian/jhbuild/usr/share/jhbuild/jhbuild/cut_n_paste
binary-install/jhbuild::
- # (should find /usr/share/<package> automatically)
- dh_pycentral -p$(cdbs_curpkg)
+ dh_pysupport -p$(cdbs_curpkg)
Added: packages/unstable/jhbuild/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/watch?rev=22266&op=file
==============================================================================
--- packages/unstable/jhbuild/debian/watch (added)
+++ packages/unstable/jhbuild/debian/watch [utf-8] Mon Nov 9 19:24:26 2009
@@ -1,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/jhbuild/([\d\.]+)[02468]/jhbuild-([\d\.]+)\.tar\.gz
More information about the pkg-gnome-commits
mailing list