[maemo-commits] [maemo-commits] r16473 - in projects/haf/trunk/dpkg: debian origins

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-10-23 17:55:13 +0300 (Thu, 23 Oct 2008)
New Revision: 16473

Modified:
   projects/haf/trunk/dpkg/debian/changelog
   projects/haf/trunk/dpkg/debian/control
   projects/haf/trunk/dpkg/debian/dpkg-dev.install
   projects/haf/trunk/dpkg/debian/dpkg.cfg
   projects/haf/trunk/dpkg/debian/dpkg.install
   projects/haf/trunk/dpkg/debian/rules
   projects/haf/trunk/dpkg/origins/Makefile.am
Log:
Adapted to maemo.


Modified: projects/haf/trunk/dpkg/debian/changelog
===================================================================
--- projects/haf/trunk/dpkg/debian/changelog	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/debian/changelog	2008-10-23 14:55:13 UTC (rev 16473)
@@ -1,3 +1,9 @@
+dpkg (1.14.22maemo0) unstable; urgency=low
+
+  * 
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 23 Oct 2008 17:45:43 +0300
+
 dpkg (1.14.22) unstable; urgency=low
 
   [ Raphael Hertzog ]

Modified: projects/haf/trunk/dpkg/debian/control
===================================================================
--- projects/haf/trunk/dpkg/debian/control	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/debian/control	2008-10-23 14:55:13 UTC (rev 16473)
@@ -1,28 +1,22 @@
 Source: dpkg
 Section: admin
 Priority: required
-Maintainer: Dpkg Developers <debian-dpkg at lists.debian.org>
-Uploaders: Frank Lichtenheld <djpig at debian.org>,
- Guillem Jover <guillem at debian.org>, Raphael Hertzog <hertzog at debian.org>
-Origin: debian
-Bugs: debbugs://bugs.debian.org
-Homepage: http://wiki.debian.org/Teams/Dpkg
-Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
-Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
+Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
+Origin: maemo
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.33.1),
+Build-Depends: debhelper (>= 4.1.81), pkg-config,
  libncursesw5-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, flex,
- libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libtimedate-perl, libio-string-perl
 
 Package: dpkg
 Architecture: any
 Essential: yes
-Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), lzma
+Pre-Depends: ${shlibs:Depends}
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11),
  dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
 Replaces: manpages-de (<= 0.4-3), manpages-pl (<= 20051117-1)
-Suggests: apt
+Suggests: apt, lzma
+Depends: perl-base
 Description: Debian package management system
  This package privides the low-level infrastructure for handling the
  installation and removal of Debian software packages.

Modified: projects/haf/trunk/dpkg/debian/dpkg-dev.install
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg-dev.install	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/debian/dpkg-dev.install	2008-10-23 14:55:13 UTC (rev 16473)
@@ -16,6 +16,31 @@
 usr/bin/dpkg-shlibdeps
 usr/bin/dpkg-source
 usr/lib/dpkg/parsechangelog
+usr/share/locale/*/LC_MESSAGES/dpkg.mo
+usr/share/man/*/*/cleanup-info.8
+usr/share/man/*/cleanup-info.8
+usr/share/man/*/*/dpkg-deb.1
+usr/share/man/*/dpkg-deb.1
+usr/share/man/*/*/dpkg-divert.8
+usr/share/man/*/dpkg-divert.8
+usr/share/man/*/*/dpkg-query.1
+usr/share/man/*/dpkg-query.1
+usr/share/man/*/*/dpkg-split.1
+usr/share/man/*/dpkg-split.1
+usr/share/man/*/*/dpkg-statoverride.8
+usr/share/man/*/dpkg-statoverride.8
+usr/share/man/*/*/dpkg-trigger.1
+usr/share/man/*/dpkg-trigger.1
+usr/share/man/*/*/dpkg.cfg.5
+usr/share/man/*/dpkg.cfg.5
+usr/share/man/*/*/dpkg.1
+usr/share/man/*/dpkg.1
+usr/share/man/*/*/install-info.8
+usr/share/man/*/install-info.8
+usr/share/man/*/*/start-stop-daemon.8
+usr/share/man/*/start-stop-daemon.8
+usr/share/man/*/*/update-alternatives.8
+usr/share/man/*/update-alternatives.8
 usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
 usr/share/man/*/*/822-date.1
 usr/share/man/*/822-date.1

Modified: projects/haf/trunk/dpkg/debian/dpkg.cfg
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg.cfg	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/debian/dpkg.cfg	2008-10-23 14:55:13 UTC (rev 16473)
@@ -9,5 +9,5 @@
 # embedded signatures, debsig-verify would reject all packages.
 no-debsig
 
-# Log status changes and actions to a file.
-log /var/log/dpkg.log
+# Don't log status changes and actions to a file.
+#log /var/log/dpkg.log

Modified: projects/haf/trunk/dpkg/debian/dpkg.install
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg.install	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/debian/dpkg.install	2008-10-23 14:55:13 UTC (rev 16473)
@@ -11,31 +11,6 @@
 usr/lib/dpkg/mksplit
 usr/sbin
 usr/share/dpkg
-usr/share/locale/*/LC_MESSAGES/dpkg.mo
-usr/share/man/*/*/cleanup-info.8
-usr/share/man/*/cleanup-info.8
-usr/share/man/*/*/dpkg-deb.1
-usr/share/man/*/dpkg-deb.1
-usr/share/man/*/*/dpkg-divert.8
-usr/share/man/*/dpkg-divert.8
-usr/share/man/*/*/dpkg-query.1
-usr/share/man/*/dpkg-query.1
-usr/share/man/*/*/dpkg-split.1
-usr/share/man/*/dpkg-split.1
-usr/share/man/*/*/dpkg-statoverride.8
-usr/share/man/*/dpkg-statoverride.8
-usr/share/man/*/*/dpkg-trigger.1
-usr/share/man/*/dpkg-trigger.1
-usr/share/man/*/*/dpkg.cfg.5
-usr/share/man/*/dpkg.cfg.5
-usr/share/man/*/*/dpkg.1
-usr/share/man/*/dpkg.1
-usr/share/man/*/*/install-info.8
-usr/share/man/*/install-info.8
-usr/share/man/*/*/start-stop-daemon.8
-usr/share/man/*/start-stop-daemon.8
-usr/share/man/*/*/update-alternatives.8
-usr/share/man/*/update-alternatives.8
 usr/share/perl5/Dpkg.pm
 usr/share/perl5/Dpkg/Gettext.pm
 var/lib/dpkg/alternatives

Modified: projects/haf/trunk/dpkg/debian/rules
===================================================================
--- projects/haf/trunk/dpkg/debian/rules	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/debian/rules	2008-10-23 14:55:13 UTC (rev 16473)
@@ -30,9 +30,9 @@
 # Don't enable everything on all platforms
 DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-	confflags += --with-selinux=static
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+#	confflags += --with-selinux=static
+#endif
 
 
 # Create configure script if necessary, automake handles rebuilding it.
@@ -46,7 +46,7 @@
 	dh_testdir
 
 	install -d build-tree
-	cd build-tree && ../configure $(confflags) \
+	cd build-tree && PERL=/usr/bin/perl ../configure $(confflags) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 		--prefix=/usr \
 		--mandir=\$${datadir}/man \

Modified: projects/haf/trunk/dpkg/origins/Makefile.am
===================================================================
--- projects/haf/trunk/dpkg/origins/Makefile.am	2008-10-23 14:43:13 UTC (rev 16472)
+++ projects/haf/trunk/dpkg/origins/Makefile.am	2008-10-23 14:55:13 UTC (rev 16473)
@@ -3,7 +3,7 @@
 pkgconfdir = $(sysconfdir)/@PACKAGE@
 originsdir = $(pkgconfdir)/origins
 
-dist_origins_DATA = debian
+dist_origins_DATA = debian maemo
 
 
 install-data-local: