------------------------------------------------------------
revno: 60
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: bibletime
timestamp: Thu 2010-12-02 01:15:37 +0000
message:
* Daily-build / build from recipes:
- Generate debian/source/format on the fly
- Add .bzr-builddeb/default.conf to run above
- Add debian/source/local-options to keep bzr tree clean
* Convert to dh7
- This unifies packaging with sword and xiphos
- This allows building from recipes since cdbs simple-patchsys was
interfering
- Move dh_install[man] options from debian/rules to package files.
* debian/control:
- Change build-Depends to: libqtwebkit-dev | libqtcore4, libqt4-dev
- Libqtcore4 is a bogus build-depends which is pulled in by libqt4-dev
anyways. This is needed to prevent FTBFS on platforms that didn't have
libqtwebkit-dev as a stand-alone package.
removed:
debian/source/format
added:
.bzr-builddeb/
.bzr-builddeb/default.conf
.bzrignore
debian/bibletime.manpages
debian/source/local-options
modified:
debian/bibletime.install
debian/changelog
debian/control
debian/rules
--
lp:bibletime/debian
https://code.launchpad.net/~pkgcrosswire/bibletime/main
Your team Crosswire Packaging Team is subscribed to branch lp:bibletime/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2010-12-02 01:15:37 +0000
@@ -0,0 +1,2 @@
+[HOOKS]
+pre-build = ./debian/rules clean
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2010-12-02 01:15:37 +0000
@@ -0,0 +1,2 @@
+debian/source/format
+.pc
=== modified file 'debian/bibletime.install'
--- debian/bibletime.install 2009-02-03 02:57:13 +0000
+++ debian/bibletime.install 2010-12-02 01:15:37 +0000
@@ -1,3 +1,5 @@
usr/bin/
usr/share/applications/
usr/share/icons/
+debian/bibletime.xpm usr/share/bibletime
+debian/bibletime.xpm usr/share/pixmaps
=== added file 'debian/bibletime.manpages'
--- debian/bibletime.manpages 1970-01-01 00:00:00 +0000
+++ debian/bibletime.manpages 2010-12-02 01:15:37 +0000
@@ -0,0 +1,2 @@
+docs/manpages/bibletime.1
+docs/manpages/bibletime.de.1
=== modified file 'debian/changelog'
--- debian/changelog 2010-12-01 20:00:29 +0000
+++ debian/changelog 2010-12-02 01:15:37 +0000
@@ -1,13 +1,29 @@
bibletime (2.8.0-1) UNRELEASED; urgency=low
+ [ Jonathan Marsden ]
* New upstream version 2.8.0
* debian/control:
- Replace Build-Depends: libqt4-dev with libqtwebkit-dev | libqt3-dev.
* Bump Standards-Version to 3.9.1 (no changes needed)
- * Add debian/source/format file
* debian/control: Fix version comparison > to >= for libsword
- -- Jonathan Marsden <[email protected]> Fri, 26 Nov 2010 14:16:00 -0800
+ [ Dmitrijs Ledkovs ]
+ * Daily-build / build from recipes:
+ - Generate debian/source/format on the fly
+ - Add .bzr-builddeb/default.conf to run above
+ - Add debian/source/local-options to keep bzr tree clean
+ * Convert to dh7
+ - This unifies packaging with sword and xiphos
+ - This allows building from recipes since cdbs simple-patchsys was
+ interfering
+ - Move dh_install[man] options from debian/rules to package files.
+ * debian/control:
+ - Change build-Depends to: libqtwebkit-dev | libqtcore4, libqt4-dev
+ - Libqtcore4 is a bogus build-depends which is pulled in by libqt4-dev
+ anyways. This is needed to prevent FTBFS on platforms that didn't have
+ libqtwebkit-dev as a stand-alone package.
+
+ -- Dmitrijs Ledkovs <[email protected]> Thu, 02 Dec 2010 00:32:12 +0000
bibletime (2.5-1) unstable; urgency=low
=== modified file 'debian/control'
--- debian/control 2010-11-10 06:34:14 +0000
+++ debian/control 2010-12-02 01:15:37 +0000
@@ -1,13 +1,13 @@
Source: bibletime
Section: kde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25),
- cdbs (>= 0.4.27), debhelper (>= 7), libsword-dev (>= 1.5.11),
- libclucene-dev, poxml, libboost-dev, cmake, pkg-config,
- zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev
+Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~),
+ libsword-dev (>= 1.5.11), libclucene-dev, poxml, libboost-dev, cmake,
+ pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqtcore4,
+ libqt4-dev
Priority: optional
Maintainer: CrossWire Packages <[email protected]>
Uploaders: Daniel Glassey <[email protected]>,
- Dmitrijs Ledkovs <[email protected]>,
+ Dmitrijs Ledkovs <[email protected]>,
Jonathan Marsden <[email protected]>
Standards-Version: 3.9.1
Homepage: http://www.bibletime.info/
=== modified file 'debian/rules'
--- debian/rules 2009-04-14 02:33:16 +0000
+++ debian/rules 2010-12-02 01:15:37 +0000
@@ -1,11 +1,8 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-install/bibletime::
- dh_install debian/bibletime.xpm usr/share/bibletime
- dh_install debian/bibletime.xpm usr/share/pixmaps
- dh_installman docs/manpages/bibletime.1
- dh_installman --language=de docs/manpages/bibletime.de.1
+ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
+
+%:
+ dh $@ --with quilt -Scmake --parallel
+override_dh_clean:
+ echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format
+ dh_clean
=== removed file 'debian/source/format'
--- debian/source/format 2010-05-10 18:20:32 +0000
+++ debian/source/format 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (quilt)
=== added file 'debian/source/local-options'
--- debian/source/local-options 1970-01-01 00:00:00 +0000
+++ debian/source/local-options 2010-12-02 01:15:37 +0000
@@ -0,0 +1,3 @@
+unapply-patches
+abort-on-upstream-changes
+extend-diff-ignore=.bzr-builddeb
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
