Hello community,

here is the log from the commit of package deb for openSUSE:Factory
checked in at Thu Mar 17 13:26:50 CET 2011.



--------
--- deb/deb.changes     2010-07-30 07:10:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/deb/deb.changes        2011-03-16 
15:46:29.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Mar 16 09:07:15 UTC 2011 - [email protected]
+
+- update to dpkg-1.15.8.10
+- update to debhelper-7.5.17
+- update to devscripts-2.10.71
+- see /usr/share/doc/packages/deb/*/changelog for details
+- build and install update-alternatives as separate subpackage
+- add download urls to source tags
+- remove pushd/popd madness in %prep, use only one cd ..
+- convert sed archtable hackery to patch and refresh patches
+- rewrite a architecture mugging in config.h to be more readable
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  debhelper-no-localized-manpages.diff
  debhelper_7.4.17.tar.bz2
  devscripts-buildfix.diff
  devscripts-debcommit-hg16.diff
  devscripts_2.10.62.tar.bz2
  dpkg_1.15.6.1.tar.bz2

New:
----
  debhelper-no-localized-manpages.patch
  debhelper_8.1.2.tar.gz
  devscripts-2.10.71-buildfix.patch
  devscripts-2.10.71-debcommit-hg16.patch
  devscripts_2.10.71.tar.gz
  dpkg-1.15.8.10-archtable-suse.patch
  dpkg_1.15.8.10.tar.bz2
  update-alternatives-1.15.8.10-suse.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ deb.spec ++++++
--- /var/tmp/diff_new_pack.tJH9Dp/_old  2011-03-17 13:23:35.000000000 +0100
+++ /var/tmp/diff_new_pack.tJH9Dp/_new  2011-03-17 13:23:35.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package deb (Version 1.15.6.1)
+# spec file for package deb
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,32 +17,38 @@
 
 # norootforbuild
 
-%define debhelper_ver 7.4.17
-%define devscripts_ver 2.10.62
+%define debhelper_ver 8.1.2
+%define devscripts_ver 2.10.71
 
 Name:           deb
-BuildRequires:  gcc-c++ ncurses-devel texlive-latex update-alternatives 
zlib-devel
-BuildRequires:  libselinux-devel
-BuildRequires:  fdupes
+Version:        1.15.8.10
+Release:        1
 Url:            http://www.debian.org
 License:        GPLv2+
 Group:          System/Packages
-PreReq:         /bin/touch
 Provides:       dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
 Requires:       perl = %{perl_version}
 Requires:       cpio patch make html2text update-alternatives
-AutoReqProv:    on
-Version:        1.15.6.1
-Release:        4
 Summary:        Tools for Debian Packages
-Source:         dpkg_%{version}.tar.bz2
-Source1:        debhelper_%{debhelper_ver}.tar.bz2
-Source2:        devscripts_%{devscripts_ver}.tar.bz2
+Source0:        
http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2
+Source1:        
http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_%{debhelper_ver}.tar.gz
+Source2:        
http://ftp.de.debian.org/debian/pool/main/d/devscripts/devscripts_%{devscripts_ver}.tar.gz
 Source3:        sensible-editor
-Patch0:         debhelper-no-localized-manpages.diff
-Patch1:         devscripts-buildfix.diff
+Patch0:         debhelper-no-localized-manpages.patch
+Patch1:         devscripts-2.10.71-buildfix.patch
 Patch2:         debhelper-pod2man-no-utf8.patch
-Patch3:         devscripts-debcommit-hg16.diff
+Patch3:         devscripts-2.10.71-debcommit-hg16.patch
+Patch4:         update-alternatives-1.15.8.10-suse.patch
+Patch5:         dpkg-1.15.8.10-archtable-suse.patch
+BuildRequires:  gcc-c++
+BuildRequires:  ncurses-devel
+#BuildRequires:  texlive-latex
+BuildRequires:  zlib-devel
+BuildRequires:  libselinux-devel
+BuildRequires:  fdupes
+BuildRequires:  libxslt
+BuildRequires:  docbook-xsl-stylesheets
+Requires(pre):  /bin/touch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %suse_version < 1120
 %define _libexecdir /usr/lib
@@ -66,54 +72,78 @@
 %description devel
 Libraries and header files for dpkg.
 
+%package -n update-alternatives
+License:        GPLv2+
+Summary:        Maintain symbolic links determining default commands
+Group:          System/Management
+
+%description -n update-alternatives
+update-alternatives creates, removes, maintains and displays
+information about the symbolic links comprising the alternatives
+system. It is possible for several programs fulfilling the same or
+similar functions to be installed on a single system at the same time.
+For example, many systems have several text editors installed at once.
+This gives choice to the users of a system, allowing each to use a
+different editor, if desired, but makes it difficult for a program to
+make a good choice of editor to invoke if the user has not specified a
+particular preference.
+
 
 %lang_package
 %prep
 %setup -q -n dpkg-%{version} -b 1 -b 2
-pushd ..
+# do not unpack anything, just cd to source dir
+#%setup -q -D -T -n %{_builddir}
+cd ..
+
 %patch0
+%patch1
 %if %suse_version < 1130
 %patch2
 %endif
-pushd devscripts-%{devscripts_ver}
-%patch1 -p1
-%patch3 -p1
-popd
-popd
-# update arch table
-sed -n '/linux-gnu/ s/linux-gnu/suse-linux/p' debian/archtable > 
debian/archtable.tmp
-cat debian/archtable.tmp >> debian/archtable
-rm debian/archtable.tmp
+%patch3
+%patch4
+%patch5
 
 %build
+#pushd dpkg-%{version}
 %{?suse_update_config:%{suse_update_config -f}}
 export CFLAGS="$RPM_OPT_FLAGS"
 export SELINUX_LIBS="-lselinux"
-%configure\
+%{configure}\
        --with-selinux \
        --localstatedir=%{_localstatedir}/lib\
-       --libdir=%{_libdir}
+       --libdir=%{_libdir} \
+        --with-admindir=%{_var}/lib/dpkg 
+
 # configure somehow does not detect architecture correctly in OBS 
(bnc#469337), so 
 # let's do an awful hack and fix it in config.h
+# XXX: who knows if this works on s390? :)
+
+%define debarch %{_arch}
 %ifarch x86_64
-sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "amd64"/' config.h
+%define debarch amd64
 %endif
 %ifarch %ix86
-sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "i386"/' config.h
+%define debarch i386
 %endif
 %ifarch ppc powerpc
-sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "powerpc"/' config.h
+%define debarch powerpc
 %endif
 %ifarch ppc64 powerpc64
-sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "ppc64"/' config.h
+%define debarch ppc64
 %endif
+sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "%{debarch}"/' config.h
+
 make %{?_smp_mflags}
+#popd # dpkg
+
 # This makes debhelper man pages
-cd ../debhelper
+pushd ../debhelper
 make %{?_smp_mflags} VERSION='%{debhelper_ver}'
-##
-# devscripts
-##
+popd
+
+pushd ../devscripts-%{devscripts_ver}
 # need dpkg-parsechangelog for devscripts
 export PATH="$RPM_BUILD_DIR/dpkg-%{version}/scripts:$PATH"
 export PERL5LIB="$RPM_BUILD_DIR/dpkg-%{version}/scripts"
@@ -121,9 +151,7 @@
 make %{?_smp_mflags}
 
 %install
-##
-# dpkg stuff
-##
+#pushd dpkg-%{version}
 %makeinstall
 # locales
 %{find_lang} dpkg
@@ -131,67 +159,58 @@
 %{find_lang} dpkg-dev
 cat dpkg.lang dselect.lang dpkg-dev.lang > %{name}.lang
 # docs
-install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 ABOUT-NLS $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 AUTHORS $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 COPYING $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 doc/triggers.txt $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 INSTALL $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 NEWS $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 README* $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 THANKS $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 TODO $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-install -m 644 debian/changelog $RPM_BUILD_ROOT/%{_docdir}/deb/dpkg
-##
-# debhelper stuff
-##
-cd ../debhelper
+install -d -m 755 %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 ABOUT-NLS %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 AUTHORS %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 COPYING %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 doc/triggers.txt %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 INSTALL %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 NEWS %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 README* %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 THANKS %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 TODO %{buildroot}/%{_docdir}/deb/dpkg
+install -m 644 debian/changelog %{buildroot}/%{_docdir}/deb/dpkg
+
+# update-alternatives
+install -d -m 0755 %{buildroot}%{_var}/lib/rpm/alternatives
+install -d -m 0755 %{buildroot}/%{_localstatedir}/log
+touch %{buildroot}/%{_localstatedir}/log/update-alternatives.log
+#popd #dpkg
+
+pushd ../debhelper
 # autoscripts
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/debhelper/autoscripts
-install -m 644 autoscripts/* $RPM_BUILD_ROOT%{_datadir}/debhelper/autoscripts
+install -d -m 755 %{buildroot}%{_datadir}/debhelper/autoscripts
+install -m 644 autoscripts/* %{buildroot}%{_datadir}/debhelper/autoscripts
 # perl modules:
-install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper
-install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper/Sequence
-install -m 644 Debian/Debhelper/Sequence/*.pm 
$RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper/Sequence
-install -m 644 Debian/Debhelper/*.pm 
$RPM_BUILD_ROOT%{perl_vendorlib}/Debian/Debhelper
+install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper
+install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence
+install -m 644 Debian/Debhelper/Sequence/*.pm 
%{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence
+install -m 644 Debian/Debhelper/*.pm 
%{buildroot}%{perl_vendorlib}/Debian/Debhelper
 # docs:
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/deb/debhelper/examples
-install -m 644 examples/* $RPM_BUILD_ROOT%{_docdir}/deb/debhelper/examples
-install -m 644 doc/* $RPM_BUILD_ROOT%{_docdir}/deb/debhelper
-install -m 644 debian/{changelog,copyright} 
$RPM_BUILD_ROOT%{_docdir}/deb/debhelper
+install -d -m 755 %{buildroot}%{_docdir}/deb/debhelper/examples
+install -m 644 examples/* %{buildroot}%{_docdir}/deb/debhelper/examples
+install -m 644 doc/* %{buildroot}%{_docdir}/deb/debhelper
+install -m 644 debian/{changelog,copyright} 
%{buildroot}%{_docdir}/deb/debhelper
 # man pages:
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man7
-install -m 644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 debhelper.7 $RPM_BUILD_ROOT%{_mandir}/man7
+install -d -m 755 %{buildroot}%{_mandir}/man1
+install -d -m 755 %{buildroot}%{_mandir}/man7
+install -m 644 *.1 %{buildroot}%{_mandir}/man1
+install -m 644 debhelper.7 %{buildroot}%{_mandir}/man7
 # binaries:
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -m 755 dh_*[^1-9] $RPM_BUILD_ROOT%{_bindir}
-##
-# devscripts
-##
-cd ../devscripts-%{devscripts_ver}
-make install DESTDIR=$RPM_BUILD_ROOT
-##
+install -d -m 755 %{buildroot}%{_bindir}
+install -m 755 dh_*[^1-9] %{buildroot}%{_bindir}
+popd # debhelper
+
+pushd ../devscripts-%{devscripts_ver}
+make install DESTDIR=%{buildroot}
 # extras
-##
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}
-##
-# remove update-alternatives stuff (included in separate package)
-##
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/alternatives
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/lib/dpkg/alternatives
-rm -rf $RPM_BUILD_ROOT%{_bindir}/update-alternatives
-rm -rf $RPM_BUILD_ROOT%{_sbindir}/update-alternatives
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/update-alternatives.8
-rm -rf $RPM_BUILD_ROOT%{_mandir}/*/man8/update-alternatives.8
-##
-# remove duplicate files
-##
-%fdupes %buildroot
+install -m 755 %{SOURCE3} %{buildroot}%{_bindir}
+popd 
+
+%fdupes %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 cd %{_localstatedir}/lib/dpkg
@@ -209,6 +228,7 @@
 %dir %{_sysconfdir}/dpkg
 %config(noreplace) %{_sysconfdir}/dpkg/*
 %{_bindir}/*
+%exclude %{_bindir}/update-alternatives
 %{_sbindir}/*
 %{_libdir}/dpkg
 %{_datadir}/dpkg
@@ -226,4 +246,13 @@
 %{_libdir}/pkgconfig/libdpkg.pc
 %{_includedir}/dpkg
 
+%files -n update-alternatives
+%defattr(-,root,root,-)
+%doc %{_sysconfdir}/alternatives/README
+%dir %{_sysconfdir}/alternatives
+%dir %{_var}/lib/rpm/alternatives
+%{_bindir}/update-alternatives
+%{_mandir}/man8/update-alternatives.8*
+%ghost %{_localstatedir}/log/update-alternatives.log
+
 %changelog

++++++ debhelper-no-localized-manpages.patch ++++++
Index: debhelper/Makefile
===================================================================
--- debhelper/Makefile.orig     2011-03-16 09:40:35.806209287 +0100
+++ debhelper/Makefile  2011-03-16 09:40:54.454930738 +0100
@@ -40,26 +40,9 @@
 
 POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"
 
-# l10n to be built is determined from .po files
-LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po)))
-
 build: version debhelper.7
        find . -maxdepth 1 -type f -perm +100 -name "dh*" \
                -exec $(POD2MAN) {} {}.1 \;
-       po4a --previous -L UTF-8 man/po4a/po4a.cfg 
-       set -e; \
-       for lang in $(LANGS); do \
-               dir=man/$$lang; \
-               for file in $$dir/dh*.pod; do \
-                       prog=`basename $$file | sed 's/.pod//'`; \
-                       $(POD2MAN) $$file $$prog.$$lang.1; \
-               done; \
-               if [ -e $$dir/debhelper.pod ]; then \
-                       cat $$dir/debhelper.pod | \
-                               $(MAKEMANLIST) `find $$dir -type f -maxdepth 1 
-name "dh_*.pod" | sort` | \
-                               $(POD2MAN) --name="debhelper" --section=7 > 
debhelper.$$lang.7; \
-               fi; \
-       done
 
 version:
        printf "package 
Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
@@ -72,10 +55,6 @@
 
 clean:
        rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm
-       po4a --previous --rm-translations --rm-backups man/po4a/po4a.cfg
-       for lang in $(LANGS); do \
-               if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \
-       done;
 
 install:
        install -d $(DESTDIR)/usr/bin \
++++++ debhelper-pod2man-no-utf8.patch ++++++
--- /var/tmp/diff_new_pack.tJH9Dp/_old  2011-03-17 13:23:35.000000000 +0100
+++ /var/tmp/diff_new_pack.tJH9Dp/_new  2011-03-17 13:23:35.000000000 +0100
@@ -1,6 +1,8 @@
---- debhelper/Makefile.orig    2009-12-18 09:03:31.000000000 +0100
-+++ debhelper/Makefile 2009-12-18 09:03:39.000000000 +0100
-@@ -32,7 +32,7 @@
+Index: debhelper/Makefile
+===================================================================
+--- debhelper/Makefile.orig    2011-03-16 09:40:54.454930738 +0100
++++ debhelper/Makefile 2011-03-16 09:46:06.028984654 +0100
+@@ -38,7 +38,7 @@
  
  PERLLIBDIR=$(shell perl -MConfig -e 'print 
$$Config{vendorlib}')/Debian/Debhelper
  

++++++ devscripts-2.10.71-buildfix.patch ++++++
Index: devscripts-2.10.71/Makefile
===================================================================
--- devscripts-2.10.71/Makefile.orig    2011-02-19 17:23:31.000000000 +0100
+++ devscripts-2.10.71/Makefile 2011-03-16 09:44:19.053846035 +0100
@@ -7,7 +7,7 @@
 PERL_MODULES = Devscripts
 EXAMPLES = conf.default
 
-all: version make_scripts $(EXAMPLES) translated_manpages
+all: version scripts $(EXAMPLES)
 
 version:
        rm -f version
Index: devscripts-2.10.71/scripts/Makefile
===================================================================
--- devscripts-2.10.71/scripts/Makefile.orig    2011-02-19 17:23:31.000000000 
+0100
+++ devscripts-2.10.71/scripts/Makefile 2011-03-16 13:25:20.346241960 +0100
@@ -19,7 +19,7 @@
 LIBDIR = /usr/lib/devscripts
 BIN_LIBDIR = /usr/lib/devscripts
 
-all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
+all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS)
 
 $(VERSION_FILE):
        @echo "You need to 'make' the toplevel directory first"
@@ -29,10 +29,8 @@
 
 %.tmp: %.sh $(VERSION_FILE)
        sed -e "s/###VERSION###/$(VERSION)/" $<  > $@
-       bash -n $@
 %.tmp: %.pl $(VERSION_FILE)
        sed -e "s/###VERSION###/$(VERSION)/" $<  > $@
-       perl -I.. -c $@
 %: %.tmp
        cp $< $@
        chmod +x $@
@@ -42,7 +40,7 @@
        pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
 %.1: %.dbk
        xsltproc --nonet -o $@ \
-         /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+         /usr/share/xml/docbook/stylesheet/nwalsh/1.75.2/manpages/docbook.xsl 
$<
 
 # There is a slight chance this gets called twice, once here from here and once
 # from ../po4a/Makefile. Treat files with care.
@@ -66,10 +64,12 @@
                libvfork.o libvfork.so.0 $(COMPLETION)
 
 install: all
+       mkdir -p $(DESTDIR)$(BINDIR)
+       mkdir -p $(DESTDIR)$(LIBDIR)
        cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
        cp $(LIBS) $(DESTDIR)$(LIBDIR)
-       cp $(COMPLETION) $(DESTDIR)/etc/bash_completion.d
        # Special treatment for debpkg
+       mkdir -p $(DESTDIR)$(PERLMOD_DIR)
        mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)
        cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
 
Index: devscripts-2.10.71/po4a/Makefile
===================================================================
--- devscripts-2.10.71/po4a/Makefile.orig       2011-02-19 17:23:31.000000000 
+0100
+++ devscripts-2.10.71/po4a/Makefile    2011-03-16 13:24:55.491265642 +0100
@@ -23,7 +23,7 @@
        pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@
 fr/%.fr.1: fr/%.fr.dbk translate
        xsltproc --nonet -o $@ \
-         /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+         /usr/share/xml/docbook/stylesheet/nwalsh/1.75.2/manpages/docbook.xsl 
$<
 # xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
 # to rename the file after it's generated
        mv fr/$*.1 $@
++++++ devscripts-2.10.71-debcommit-hg16.patch ++++++
Index: devscripts-2.10.71/scripts/debcommit.pl
===================================================================
--- devscripts-2.10.71/scripts/debcommit.pl.orig        2011-02-19 
17:23:31.000000000 +0100
+++ devscripts-2.10.71/scripts/debcommit.pl     2011-03-16 09:47:07.033357951 
+0100
@@ -584,7 +584,9 @@
     else {
        die "debcommit: unknown program $prog";
     }
-    die "debcommit: commit failed\n" if (! $action_rc);
+    # mercurial 1.6 returns failure if nothing is to be committed
+    # but we still want to continue with tagging
+    die "debcommit: commit failed\n" if (! $action_rc) && (! $release);
 }
 
 sub tag {
++++++ dpkg-1.15.8.10-archtable-suse.patch ++++++
Index: dpkg-1.15.8.10/debian/archtable
===================================================================
--- dpkg-1.15.8.10/debian/archtable     2011-01-30 20:37:43.000000000 +0100
+++ dpkg-1.15.8.10/debian/archtable     2011-03-16 09:52:42.196488262 +0100
@@ -27,3 +27,15 @@
 i486-gnu                       hurd-i386
 i486-kfreebsd-gnu              kfreebsd-i386
 x86_64-kfreebsd-gnu            kfreebsd-amd64
+i486-suse-linux                        i386
+ia64-suse-linux                        ia64
+alpha-suse-linux                       alpha
+x86_64-suse-linux              amd64
+arm-suse-linux                 arm
+arm-suse-linuxeabi             armel
+hppa-suse-linux                        hppa
+mips-suse-linux                        mips
+mipsel-suse-linux              mipsel
+powerpc-suse-linux             powerpc
+s390-suse-linux                        s390
+sparc-suse-linux                       sparc
++++++ dpkg_1.15.6.1.tar.bz2 -> dpkg_1.15.8.10.tar.bz2 ++++++
++++ 447786 lines of diff (skipped)

++++++ update-alternatives-1.15.8.10-suse.patch ++++++
Index: dpkg-1.15.8.10/man/update-alternatives.8
===================================================================
--- dpkg-1.15.8.10/man/update-alternatives.8.orig       2011-01-30 
20:37:44.000000000 +0100
+++ dpkg-1.15.8.10/man/update-alternatives.8    2011-03-16 14:16:14.086966915 
+0100
@@ -4,7 +4,7 @@
 .\" 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.  There is NO WARRANTY.  You can
-.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
+.\" find the GNU GPL in /usr/share/doc/licenses/GPL-2.0.txton any SUSE system.
 .TH update\-alternatives 8 "2009-04-13" "Debian Project" "dpkg utilities"
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
@@ -17,7 +17,7 @@
 .SH DESCRIPTION
 .B update\-alternatives
 creates, removes, maintains and displays information about the symbolic
-links comprising the Debian alternatives system.
+links comprising the SUSE alternatives system.
 .PP
 It is possible for several programs fulfilling the same or similar
 functions to be installed on a single system at the same time.
@@ -27,7 +27,7 @@
 to make a good choice for an editor to invoke if the
 user has not specified a particular preference.
 .PP
-Debian's alternatives system aims to solve this problem.
+SUSE's alternatives system aims to solve this problem.
 A generic name in the filesystem is
 shared by all files providing interchangeable functionality.
 The alternatives system and the system administrator
@@ -66,10 +66,10 @@
 is called to update information about that file in the alternatives system.
 .B update\-alternatives
 is usually called from the
-.B postinst
+.B post
 (configure) or
-.B prerm
-(install) scripts in Debian packages.
+.B preun
+(install) scripts in SUSE packages.
 .PP
 It is often useful for a number of alternatives to be synchronised,
 so that they are changed as a group; for example, when several versions
@@ -173,7 +173,7 @@
 .TP
 administrative directory
 A directory, by default
-.IR /var/lib/dpkg/alternatives ,
+.IR /var/lib/rpm/alternatives ,
 containing
 .BR update\-alternatives '
 state information.
@@ -477,7 +477,7 @@
 .RE
 .
 .SH BUGS
-If you find a bug, please report it using the Debian bug-tracking system.
+If you find a bug, please report it using the SUSE bug-tracking system.
 .PP
 If you find any discrepancy between the operation of
 .B update\-alternatives
Index: dpkg-1.15.8.10/utils/update-alternatives.c
===================================================================
--- dpkg-1.15.8.10/utils/update-alternatives.c.orig     2011-01-30 
20:37:44.000000000 +0100
+++ dpkg-1.15.8.10/utils/update-alternatives.c  2011-03-16 14:17:29.269860473 
+0100
@@ -51,7 +51,7 @@
 #define PROGNAME "update-alternatives"
 
 static const char *altdir = SYSCONFDIR "/alternatives";
-static const char *admdir = ADMINDIR "/alternatives";
+static const char *admdir = "/var/lib/rpm/alternatives";
 
 static const char *prog_path = "update-alternatives";
 
@@ -68,7 +68,7 @@
 static char *pass_opts[MAX_OPTS];
 static int nb_opts = 0;
 
-#define DPKG_TMP_EXT ".dpkg-tmp"
+#define DPKG_TMP_EXT ".rpm-tmp"
 
 /*
  * Functions.
@@ -77,7 +77,7 @@
 static void
 version(void)
 {
-       printf(_("Debian %s version %s.\n"), PROGNAME, VERSION);
+       printf(_("SUSE %s version %s.\n"), PROGNAME, VERSION);
        printf("\n");
 
        printf(_(
@@ -1984,8 +1984,8 @@
        int i = 0, count;
 
        setlocale(LC_ALL, "");
-       bindtextdomain("dpkg", LOCALEDIR);
-       textdomain("dpkg");
+       bindtextdomain("rpm", LOCALEDIR);
+       textdomain("rpm");
 
        if (setvbuf(stdout, NULL, _IONBF, 0))
                error("setvbuf failed: %s", strerror(errno));

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to