[maemo-commits] [maemo-commits] r14849 - projects/haf/trunk/dpkg/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-12-04 15:38:51 +0200 (Tue, 04 Dec 2007)
New Revision: 14849

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
Log:
  [ Marius Vollmer, for maemo ]
  
  * Changed maintainer and origin.
  * Added maemo origin file.
  * Moved man pages and translations from dpkg to dpkg-dev.
  * Never compile with libselinux, removed from Build-Depends.
  * Removed po4a from Build-Depends, fingers crossed.
  * Removed versioned core-utils from Pre-Depends so that busybox can
    satisfy it.
  * Disabled logging to /var/log/dpkg.log


Modified: projects/haf/trunk/dpkg/debian/changelog
===================================================================
--- projects/haf/trunk/dpkg/debian/changelog	2007-12-04 13:34:38 UTC (rev 14848)
+++ projects/haf/trunk/dpkg/debian/changelog	2007-12-04 13:38:51 UTC (rev 14849)
@@ -1,3 +1,17 @@
+dpkg (1.14.7maemo0~unreleased0) unstable; urgency=low
+
+  [ Marius Vollmer, for maemo ]
+  
+  * Changed maintainer and origin.
+  * Added maemo origin file.
+  * Moved man pages and translations from dpkg to dpkg-dev.
+  * Never compile with libselinux, removed from Build-Depends.
+  * Removed po4a from Build-Depends, fingers crossed.
+  * Removed versioned core-utils from Pre-Depends so that busybox can
+    satisfy it.
+
+ --
+
 dpkg (1.14.7) unstable; urgency=low
 
   [ Guillem Jover ]

Modified: projects/haf/trunk/dpkg/debian/control
===================================================================
--- projects/haf/trunk/dpkg/debian/control	2007-12-04 13:34:38 UTC (rev 14848)
+++ projects/haf/trunk/dpkg/debian/control	2007-12-04 13:38:51 UTC (rev 14849)
@@ -1,22 +1,20 @@
 Source: dpkg
 Section: admin
 Priority: required
-Maintainer: Dpkg Developers <team at dpkg.org>
-Uploaders: Frank Lichtenheld <djpig at debian.org>, Guillem Jover <guillem at debian.org>, Brendan O'Dea <bod at debian.org>, Christian Perrier <bubulle at debian.org>
-Origin: debian
+Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
+Origin: maemo
 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
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.23),
- libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
- libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 4.1.81), pkg-config,
+ libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev
 
 Package: dpkg
 Architecture: any
 Essential: yes
-Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
+Pre-Depends: ${shlibs:Depends}
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
  dpkg-dev (<< 1.14.6)
 Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3),

Modified: projects/haf/trunk/dpkg/debian/dpkg-dev.install
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg-dev.install	2007-12-04 13:34:38 UTC (rev 14848)
+++ projects/haf/trunk/dpkg/debian/dpkg-dev.install	2007-12-04 13:38:51 UTC (rev 14849)
@@ -16,6 +16,29 @@
 usr/bin/dpkg-source
 usr/lib/dpkg/controllib.pl
 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.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	2007-12-04 13:34:38 UTC (rev 14848)
+++ projects/haf/trunk/dpkg/debian/dpkg.cfg	2007-12-04 13:38:51 UTC (rev 14849)
@@ -5,5 +5,5 @@
 # the option, separated by whitespace and/or an `=' sign.
 #
 
-# 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	2007-12-04 13:34:38 UTC (rev 14848)
+++ projects/haf/trunk/dpkg/debian/dpkg.install	2007-12-04 13:38:51 UTC (rev 14849)
@@ -11,29 +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.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	2007-12-04 13:34:38 UTC (rev 14848)
+++ projects/haf/trunk/dpkg/debian/rules	2007-12-04 13:38:51 UTC (rev 14849)
@@ -28,9 +28,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.