[maemo-commits] [maemo-commits] r14896 - projects/haf/trunk/osso-gnupg/debian

Fri Dec 7 00:22:31 EET 2007

Author: marivoll
Date: 2007-12-07 00:22:21 +0200 (Fri, 07 Dec 2007)
New Revision: 14896

Modified:
   projects/haf/trunk/osso-gnupg/debian/control
   projects/haf/trunk/osso-gnupg/debian/rules
Log:
  * Finally killed osso-gnupg, hurray.  This package is now empty and
    depends on gnupg, to manage the transition.  The version number has
    been choosen to celebrate the fact that the real gnupg was at version
    1.4.7 when osso-gnupg died.


Modified: projects/haf/trunk/osso-gnupg/debian/control
===================================================================

--- projects/haf/trunk/osso-gnupg/debian/control	2007-12-06 21:59:42 UTC (rev 14895)
+++ projects/haf/trunk/osso-gnupg/debian/control	2007-12-06 22:22:21 UTC (rev 14896)
@@ -3,20 +3,11 @@
 Priority: standard
 Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
 Standards-Version: 3.6.2.1
-Build-Depends: zlib1g-dev | libz-dev, libbz2-dev, file, gettext, dpatch, libglib2.0-dev
+Build-Depends: 
 
 Package: osso-gnupg
 Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: gnupg-doc
-Conflicts: gnupg, gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2)
-Replaces: gpg-rsa, gpg-rsaref
-Provides: gpg-rsa, gpg-rsaref
-Description: Stripped down version of the GNU privacy guard
- GnuPG is GNU's tool for secure communication and data storage.  This
- version has been stripped down to contain only the bare necessities
- to support APT repository signing.  It is likely no longer compliant
- with the proposed OpenPGP Internet standard as described in RFC2440.
- .
- GnuPG does not use any patented algorithms so it cannot be compatible
- with PGP2 because it uses IDEA (which is patented worldwide).
+Depends: gnupg
+Description: Transitional package to hand the torch to gnupg.
+ Osso-gnupg used to be a stripped down version of gnupg.  We now use
+ the full gnupg in maemo, and this package manages the transition.

Modified: projects/haf/trunk/osso-gnupg/debian/rules
===================================================================
--- projects/haf/trunk/osso-gnupg/debian/rules	2007-12-06 21:59:42 UTC (rev 14895)
+++ projects/haf/trunk/osso-gnupg/debian/rules	2007-12-06 22:22:21 UTC (rev 14896)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for OSSO-GNUPG (1.4.2)
+# debian/rules file - for OSSO-GNUPG (1.4.7)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998-2005 by James Troup.
@@ -9,113 +9,38 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
-STRIP=strip --remove-section=.comment --remove-section=.note
+# This rules file just create an empty package.
 
+install_dir=install -d -m 755
+install_file=install -m 644
+
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
-
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-include /usr/share/dpatch/dpatch.make
+build:
 
-configure: autogen.sh
-	./autogen.sh
+test:
 
-build-deb-stamp: patch-stamp configure
-	$(checkdir)
-	mkdir -p build-deb
-	cd build-deb && ../configure --prefix=/usr --libexecdir=/usr/lib/ --without-readline --without-libusb --without-ldap --without-libcurl --disable-mailto --enable-minimal --disable-nls $(CONFARGS)
-	$(MAKE) -C build-deb
-	touch $@
-
-build: build-deb-stamp
-
-test: build
-	$(checkdir)
-	make -C build-deb/checks check || exit 127
-	touch test
-
-clean: unpatch
-	$(checkdir)
-	-rm -f build
-	-$(MAKE) -C build-deb -i distclean || $(MAKE) -C build-deb -f Makefile.in distclean
-	rm -rf build-deb
+clean:
 	-rm -rf debian/tmp debian/files* debian/*substvars debian/patched
 	find . -name \*~ | xargs rm -vf
 
 binary-indep:
 
-binary-arch:	checkroot build # test
-	$(checkdir)
+binary-arch:
 	-rm -rf debian/tmp
 	$(install_dir) debian/tmp/DEBIAN/
-	$(install_script) debian/preinst debian/tmp/DEBIAN/
-	$(MAKE) -C build-deb prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man libexecdir=`pwd`/debian/tmp/usr/lib/ mkinstalldirs=`pwd`/scripts/mkinstalldirs install
-	: # copies of the manpage which can't be grokked by install-info
-	rm debian/tmp/usr/info/*
-	: # shouldn't be here; it's a symlink to /etc/locale.alias in Debian
-	rm -f debian/tmp/usr/share/locale/locale.alias
-	find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs $(STRIP)
-	chmod 4755 debian/tmp/usr/bin/gpg
-	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
-	sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/tmp/usr/bin/gpg-convert-from-106
-	chmod 755 debian/tmp/usr/bin/lspgpot debian/tmp/usr/bin/gpg-convert-from-106
-	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
-	    > debian/tmp/usr/share/man/man1/gpg.1.new
-	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
-	gzip -9v debian/tmp/usr/share/man/man*/*
-	: # Move localized manpages to FHS compliant locations
-	$(install_dir) debian/tmp/usr/share/man/ru/man1/
-	mv debian/tmp/usr/share/man/man1/gpg.ru.1.gz debian/tmp/usr/share/man/ru/man1/gpg.1.gz
-	: # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/
-	rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html
-	$(install_dir) debian/tmp/usr/share/doc/gnupg/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian
-	$(install_file) debian/README.Debian README NEWS THANKS TODO doc/DETAILS \
-		doc/FAQ doc/faq.html doc/OpenPGP debian/Upgrading_From_PGP.txt \
-		doc/highlights-1.4.txt debian/tmp/usr/share/doc/gnupg/
-	for i in po util mpi cipher tools g10 checks include; do \
-		$(install_file) $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done
-	$(install_file) ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel
-	gzip -9v debian/tmp/usr/share/doc/gnupg/*
-	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/gnupg/
-	$(install_dir) debian/tmp/usr/share/lintian/overrides/
-	$(install_file) debian/lintian.override debian/tmp/usr/share/lintian/overrides/gnupg
-
-	find debian/tmp/ -type d -empty | xargs rmdir
-	rm -rf debian/tmp/usr/share/doc 
-	rm -rf debian/tmp/usr/share/locale
-	rm -rf debian/tmp/usr/share/man
-	rm debian/tmp/usr/lib/libgpgcommon.a
-	rm debian/tmp/usr/lib/libgpgcommon.la
-	rm -rf debian/tmp/usr/share/lintian
-
-	find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
 	dpkg-gencontrol -posso-gnupg -isp
 	chown -R root.root debian/tmp
 	chmod -R go=rX debian/tmp
 	dpkg --build debian/tmp ..
 
-define checkdir
-	test -f g10/g10.c && test -f debian/rules
-endef
-
-# Below here is fairly generic really
-
 binary: 	binary-indep binary-arch
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
 .PHONY: build binary binary-arch binary-indep clean checkroot


