- Olena-patches

olena-2.0-49-g63beebc debian/changelog: Change distribution.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/changelog | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2f6f58..8570ad8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/changelog: Change distribution. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update maintainer name. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/changelog b/debian/changelog index 1b5cd4d..10b1e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -olena (2.0-1) testing; urgency=low +olena (2.0-1) wheezy; urgency=low * Initial release. -- 1.7.2.5

1 0

olena-2.0-49-ga84e512 demo/viewer/runner.cc: Fix libexec path.
by Guillaume Lazzara 23 May '12

23 May '12

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d01f048..a6d9e17 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Fix libexec path. + 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/viewer/runner.cc: Make xml2doc binary lookup more robust. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index fe6732f..ae79c8a 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -43,9 +43,9 @@ QString get_pathto(const QString& file, return SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix; // Installed in a specific path ? - f.setFileName(SCRIBO_PREFIX_LIBEXECDIR "/" + file); + f.setFileName(SCRIBO_PREFIX_LIBEXECDIR "/scribo/" + file); if (f.exists()) - return SCRIBO_PREFIX_LIBEXECDIR; + return SCRIBO_PREFIX_LIBEXECDIR "/scribo/"; // Installed in a specific path but moved elsewhere ? QDir dir(QCoreApplication::applicationDirPath()); -- 1.7.2.5

1 0

olena-2.0-48-gee9f7de demo/viewer/runner.cc: Fix libexec path.
by Guillaume Lazzara 23 May '12

23 May '12

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d01f048..a6d9e17 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Fix libexec path. + 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/viewer/runner.cc: Make xml2doc binary lookup more robust. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index fe6732f..ae79c8a 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -43,9 +43,9 @@ QString get_pathto(const QString& file, return SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix; // Installed in a specific path ? - f.setFileName(SCRIBO_PREFIX_LIBEXECDIR "/" + file); + f.setFileName(SCRIBO_PREFIX_LIBEXECDIR "/scribo/" + file); if (f.exists()) - return SCRIBO_PREFIX_LIBEXECDIR; + return SCRIBO_PREFIX_LIBEXECDIR "/scribo/"; // Installed in a specific path but moved elsewhere ? QDir dir(QCoreApplication::applicationDirPath()); -- 1.7.2.5

1 0

olena-2.0-47-g0a0e2ab debian/control: Update maintainer name.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c49e457..d2f6f58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update maintainer name. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Update commiter name. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index 1c77abb..d3a3e1f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: olena Section: devel Priority: optional -Maintainer: Olena Team <olena(a)lrde.epita.fr> +Maintainer: Olena Team - EPITA Research and Development Laboratory (LRDE) <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) Standards-Version: 3.9.3 Vcs-Browser: https://trac.lrde.epita.fr/olena/browser -- 1.7.2.5

1 0

olena-2.0-46-g838cf65 debian/copyright: Update commiter name.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/changelog | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5c7bb7..c49e457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Update commiter name. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Set packages as optional. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/changelog b/debian/changelog index c0656c4..1b5cd4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,5 +2,4 @@ olena (2.0-1) testing; urgency=low * Initial release. - -- Olena Team <olena(a)lrde.epita.fr> Fri, 22 May 2012 22:35:27 +0200 - + -- Olena Team - EPITA Research and Development Laboratory (LRDE) <olena(a)lrde.epita.fr> Wed, 23 May 2012 11:19:13 +0200 -- 1.7.2.5

1 0

olena-2.0-45-g2c9c14d debian/control: Set packages as optional.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index df0d01b..a5c7bb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Set packages as optional. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Handles '-j' option for make. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index a971a88..1c77abb 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: olena Section: devel -Priority: extra +Priority: optional Maintainer: Olena Team <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) Standards-Version: 3.9.3 -- 1.7.2.5

1 0

olena-2.0-44-g6a781e8 debian/rules: Handles '-j' option for make.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/rules | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce898e2..df0d01b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Handles '-j' option for make. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update Standards-Version. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index 7b915a8..a94b647 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,7 @@ export DH_OPTIONS # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +CPU_COUNT ?= $(shell grep -c processor /proc/cpuinfo) CFLAGS = -Wall -g @@ -25,7 +26,7 @@ build-stamp: dh_testdir ./bootstrap ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr --libexecdir=/usr/lib - $(MAKE) + $(MAKE) -j$(CPU_COUNT) touch $@ clean: -- 1.7.2.5

1 0

olena-2.0-43-g492f138 debian/control: Update Standards-Version.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 119abb9..ce898e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update Standards-Version. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Update deprecated dh_clean -k command. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index d74f69b..a971a88 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Olena Team <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Vcs-Browser: https://trac.lrde.epita.fr/olena/browser Vcs-Git: git://git.lrde.epita.fr/olena Homepage: http://olena.lrde.epita.fr -- 1.7.2.5

1 0

olena-2.0-42-g22cfe45 debian/rules: Update deprecated dh_clean -k command.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/rules | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc786c2..119abb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Update deprecated dh_clean -k command. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Add missing required rules. 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index b682f74..7b915a8 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ clean: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install -- 1.7.2.5

1 0

olena-2.0-41-gbac7114 debian/rules: Add missing required rules.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/rules | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 928d28e..cc786c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * debian/rules: Add missing required rules. + 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing description in manpages. diff --git a/debian/rules b/debian/rules index 8e0f6d5..b682f74 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,9 @@ install: build $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install # Build architecture independant packages. -build-indep: build install +build-indep: build + +binary-indep: build-indep install dh_testdir dh_testroot dh_installchangelogs -i @@ -59,7 +61,9 @@ build-indep: build install dh_builddeb -i # Build architecture dependant packages. -build-arch: build install +build-arch: build + +binary-arch: build-arch install dh_testdir dh_testroot dh_installchangelogs -a @@ -83,6 +87,6 @@ build-arch: build install dh_md5sums -a dh_builddeb -a -binary: build-arch build-indep +binary: binary-arch binary-indep -.PHONY: install build clean build-indep build-arch binary +.PHONY: install build clean binary-indep binary-arch binary -- 1.7.2.5

1 0