Merge authors: Dmitrijs Ledkovs (dmitrij.ledkov) ------------------------------------------------------------ revno: 17 [merge] fixes bug: http://bugs.debian.org/604599 committer: Dmitrijs Ledkovs <[email protected]> branch nick: biblememorizer-trunk timestamp: Sun 2012-03-11 17:25:19 +0000 message: * Use Qt4 toolkit (Closes: #604599) * Use source format 3.0 (quilt) * Use debhelper 7 removed: debian/Makefile.icons debian/README.source added: debian/clean debian/install debian/manpages debian/source/ debian/source/format renamed: debian/patches/00list => debian/patches/series modified: debian/changelog debian/compat debian/control debian/rules
-- lp:~pkgcrosswire/biblememorizer/main https://code.launchpad.net/~pkgcrosswire/biblememorizer/main Your team CrossWire Packaging Team is subscribed to branch lp:~pkgcrosswire/biblememorizer/main. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/biblememorizer/main/+edit-subscription
=== removed file 'debian/Makefile.icons' --- debian/Makefile.icons 2008-10-10 02:48:30 +0000 +++ debian/Makefile.icons 1970-01-01 00:00:00 +0000 @@ -1,62 +0,0 @@ -#!/usr/bin/make -f -# -# Makefile for the BibleMemorizer icons -# by Raphaël Pinson <[email protected]> -# -# Copyright (C) 2007, Raphaël Pinson -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -ICONSDIR=$(DESTDIR)/usr/share/icons/hicolor -ICON=biblememorizer -BUILDDIR=$(CURDIR)/build -SVGDIR=scalable -SVGSECTDIR=$(BUILDDIR)/$(SVGDIR)/$(SECTION) -PNGSECTDIR=$(BUILDDIR)/$${size}x$${size}/$(SECTION) -SVGFILE=$(CURDIR)/bmemicon.svg -PNGFILE=$(PNGSECTDIR)/$(ICON).png -SECTION=apps - -MKDIR=/bin/mkdir -p -RM=/bin/rm -rf -TAR=/bin/tar cvzf -LS=/bin/ls -GREP=/bin/grep -TOUCH=/usr/bin/touch -CP=/bin/cp -r -FIND=/usr/bin/find - -CONVERT=inkscape --without-gui --export-png=$(PNGFILE) --export-dpi=72 --export-background-opacity=0 --export-width=$${size} --export-height=$${size} $(SVGFILE) >/dev/null - -SIZES=16 22 32 48 64 128 - -build: build-stamp -build-stamp: - $(MKDIR) $(BUILDDIR) - $(MKDIR) $(SVGSECTDIR); \ - $(CP) $(SVGFILE) $(SVGSECTDIR)/$(ICON).svg; \ - for size in $(SIZES); do \ - $(MKDIR) $(PNGSECTDIR); \ - $(CONVERT); \ - done; \ - $(TOUCH) $@ - -install: - $(MKDIR) $(ICONSDIR) - $(CP) $(BUILDDIR)/* $(ICONSDIR) - -clean: - -$(RM) $(BUILDDIR) - -$(RM) build-stamp === removed file 'debian/README.source' --- debian/README.source 2009-04-06 01:20:32 +0000 +++ debian/README.source 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -This package uses dpatch in order to apply patches to the upstream source. -Patches are stored in debian/patches. For further details, see the man pages for -dpatch and dpatch-edit-patch, and also /usr/share/doc/dpatch/README.source.gz - === modified file 'debian/changelog' --- debian/changelog 2009-06-15 01:15:58 +0000 +++ debian/changelog 2012-03-11 16:26:35 +0000 @@ -1,3 +1,11 @@ +biblememorizer (0.6.4-4) unstable; urgency=low + + * Use Qt4 toolkit (Closes: #604599) + * Use source format 3.0 (quilt) + * Use debhelper 7 + + -- Dmitrijs Ledkovs <[email protected]> Sun, 11 Mar 2012 16:13:55 +0000 + biblememorizer (0.6.4-3) unstable; urgency=low * Upload to unstable -- no changes from previous version. === added file 'debian/clean' --- debian/clean 1970-01-01 00:00:00 +0000 +++ debian/clean 2012-03-11 16:26:35 +0000 @@ -0,0 +1,1 @@ +biblememorizer.1 === modified file 'debian/compat' --- debian/compat 2008-10-10 02:48:30 +0000 +++ debian/compat 2012-03-11 16:26:35 +0000 @@ -1,1 +1,1 @@ -5 +7 === modified file 'debian/control' --- debian/control 2009-04-18 19:21:27 +0000 +++ debian/control 2012-03-11 16:26:35 +0000 @@ -4,16 +4,20 @@ Maintainer: Debian Crosswire Packaging Team <[email protected]> Uploaders: Jonathan Marsden <[email protected]>, Daniel Glassey <[email protected]>, - Raphael Pinson <[email protected]> -Build-Depends: debhelper (>= 5.0), libsword-dev (>=1.5.11), - libqt3-mt-dev, qt3-dev-tools, dpatch, docbook2x, docbook -Standards-Version: 3.8.1 + Raphael Pinson <[email protected]>, + Dmitrijs Ledkovs <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), + libsword-dev (>=1.5.11), + libqt4-dev, + docbook2x, + docbook +Standards-Version: 3.9.3 Homepage: http://biblememorizer.sourceforge.net/ Package: biblememorizer Architecture: any -Depends: ${shlibs:Depends} -Description: a Bible verses memorizer +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Bible verses memorizer BibleMemorizer is a program to help with memorizing Scripture. It allows you to create files with lists of verses you want to memorize, including the text of the verse and any categories you create. @@ -21,5 +25,5 @@ BibleMemorizer uses plugins to import texts, including a plugin to use the Sword API. Texts are then imported from the Sword Bible modules installed on your system. - . + === added file 'debian/install' --- debian/install 1970-01-01 00:00:00 +0000 +++ debian/install 2012-03-11 16:26:35 +0000 @@ -0,0 +1,1 @@ +icons/build/* usr/share/icons/hicolor/ === added file 'debian/manpages' --- debian/manpages 1970-01-01 00:00:00 +0000 +++ debian/manpages 2012-03-11 16:26:35 +0000 @@ -0,0 +1,1 @@ +biblememorizer.1 === renamed file 'debian/patches/00list' => 'debian/patches/series' === modified file 'debian/rules' --- debian/rules 2009-04-06 04:12:15 +0000 +++ debian/rules 2012-03-11 16:26:35 +0000 @@ -1,66 +1,7 @@ #!/usr/bin/make -f -ICONSDIR=$(CURDIR)/icons -DEBIANDIR=$(CURDIR)/debian -PACKAGEDIR=$(DEBIANDIR)/biblememorizer -APPSDIR=$(PACKAGEDIR)/usr/share/applications - -include /usr/share/dpatch/dpatch.make - -configure: configure-stamp - -configure-stamp: patch - dh_testdir - ./configure --prefix=/usr --sword-path=/usr/include/sword - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - $(MAKE) - cp $(DEBIANDIR)/Makefile.icons $(ICONSDIR)/Makefile - $(MAKE) -C $(ICONSDIR) - docbook2x-man $(DEBIANDIR)/biblememorizer.1.docbook - touch build-stamp - -clean: clean-patched unpatch -clean-patched: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - rm -f biblememorizer.1 - [ ! -f Makefile ] || $(MAKE) distclean - [ ! -f Makefile ] || $(MAKE) -C $(ICONSDIR) clean - rm -f $(ICONSDIR)/Makefile Makefile - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install INSTALL_ROOT=$(PACKAGEDIR) - $(MAKE) -C $(ICONSDIR) install DESTDIR=$(PACKAGEDIR) - mkdir -p $(APPSDIR) - cp biblememorizer.desktop $(APPSDIR) - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs ChangeLog - dh_install - dh_installman biblememorizer.1 - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $(@) -Sqmake_qt4 +override_dh_auto_build: + dh_auto_build + docbook2x-man ./debian/biblememorizer.1.docbook === added directory 'debian/source' === added file 'debian/source/format' --- debian/source/format 1970-01-01 00:00:00 +0000 +++ debian/source/format 2012-03-11 15:27:21 +0000 @@ -0,0 +1,1 @@ +3.0 (quilt)
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
