Hello community, here is the log from the commit of package deb for openSUSE:Factory checked in at Mon May 16 12:03:42 CEST 2011.
-------- --- deb/deb.changes 2011-03-17 16:33:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/deb/deb.changes 2011-03-31 14:55:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 31 11:39:18 UTC 2011 - flichtenh...@astaro.com + +- Merge openSUSE:Tools changes with system:packagemanager changes + +------------------------------------------------------------------- @@ -17,0 +23,12 @@ + +------------------------------------------------------------------- +Fri Jan 28 14:17:27 UTC 2011 - adr...@suse.de + +- fix build on old distros + +------------------------------------------------------------------- +Fri Jan 28 12:57:25 UTC 2011 - flichtenh...@astaro.com + +- install missing debhelper files + - install dh + - install Debian/Debhelper/Buildsystem/*.pm calling whatdependson for head-i586 New: ---- devscripts-pod2man-no-utf8.patch dpkg-pod2man-no-utf8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deb.spec ++++++ --- /var/tmp/diff_new_pack.qvmAdX/_old 2011-05-16 11:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.qvmAdX/_new 2011-05-16 11:56:00.000000000 +0200 @@ -23,13 +23,13 @@ Name: deb Version: 1.15.8.10 -Release: 2 +Release: 3 Url: http://www.debian.org License: GPLv2+ Group: System/Packages Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts Requires: perl = %{perl_version} -Requires: cpio patch make html2text update-alternatives +Requires: cpio patch make html2text Summary: Tools for Debian Packages 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 @@ -41,19 +41,42 @@ 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 +Patch6: dpkg-pod2man-no-utf8.patch +Patch7: devscripts-pod2man-no-utf8.patch BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: zlib-devel -BuildRequires: libselinux-devel +%if 0%{?suse_version} > 1010 BuildRequires: fdupes +%endif BuildRequires: libxslt BuildRequires: docbook-xsl-stylesheets -BuildRequires: update-alternatives Requires(pre): /bin/touch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version < 1120 + +%if 0%{?suse_version} +BuildRequires: libbz2-devel sgmltool texlive-latex update-alternatives +Requires: update-alternatives +%if 0%{?suse_version} > 1100 +BuildRequires: libselinux-devel +%define use_selinux 1 +%endif +%if 0%{?suse_version} < 1120 %define _libexecdir /usr/lib %endif +%endif +%if 0%{?fedora_version} +BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex +%define use_selinux 1 +%endif +%if 0%{?rhel_version} +BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex +%define use_selinux 1 +%endif +%if 0%{?centos_version} +BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex +%define use_selinux 1 +%endif %description This package contains tools for working with Debian packages. It makes @@ -83,20 +106,28 @@ %patch0 %patch1 -%if %suse_version < 1130 +%if 0%{?suse_version} && 0%{?suse_version} < 1130 %patch2 +%patch6 +%patch7 %endif %patch3 %patch4 %patch5 %build -#pushd dpkg-%{version} %{?suse_update_config:%{suse_update_config -f}} export CFLAGS="$RPM_OPT_FLAGS" +%if 0%{?use_selinux} export SELINUX_LIBS="-lselinux" +%endif %{configure}\ +%if 0%{?use_selinux} --with-selinux \ +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1110 + --disable-compiler-warnings \ +%endif --localstatedir=%{_localstatedir}/lib\ --libdir=%{_libdir} \ --with-admindir=%{_var}/lib/dpkg @@ -172,6 +203,8 @@ # perl modules: install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence +install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Buildsystem +install -m 644 Debian/Debhelper/Buildsystem/*.pm %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Buildsystem 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: @@ -187,15 +220,19 @@ # binaries: install -d -m 755 %{buildroot}%{_bindir} install -m 755 dh_*[^1-9] %{buildroot}%{_bindir} +install -m 755 dh %{buildroot}%{_bindir} popd # debhelper pushd ../devscripts-%{devscripts_ver} make install DESTDIR=%{buildroot} +popd + # extras install -m 755 %{SOURCE3} %{buildroot}%{_bindir} -popd +%if 0%{?suse_version} > 1010 %fdupes %{buildroot} +%endif %clean rm -rf %{buildroot} @@ -207,7 +244,10 @@ done exit 0 +%if 0%{?suse_version} > 1010 + %files lang -f %{name}.lang +%endif %files %defattr(-,root,root) @@ -226,6 +266,11 @@ %{perl_vendorlib}/Dpkg.pm %{_libexecdir}/devscripts %{_datadir}/devscripts +%if 0%{?suse_version} < 1110 +/usr/share/locale/*/LC_MESSAGES/* +%dir /usr/share/locale/ast +%dir /usr/share/locale/ast/LC_MESSAGES +%endif %files devel %defattr(-,root,root) ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.qvmAdX/_old 2011-05-16 11:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.qvmAdX/_new 2011-05-16 11:56:00.000000000 +0200 @@ -23,7 +23,7 @@ Name: update-alternatives Version: 1.15.8.10 -Release: 2 +Release: 3 Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Summary: Maintain symbolic links determining default commands License: GPLv2+ ++++++ devscripts-2.10.71-buildfix.patch ++++++ --- /var/tmp/diff_new_pack.qvmAdX/_old 2011-05-16 11:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.qvmAdX/_new 2011-05-16 11:56:00.000000000 +0200 @@ -40,7 +40,7 @@ %.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 $< ++ /usr/share/xml/docbook/stylesheet/nwalsh/current/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. @@ -67,7 +67,7 @@ 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 $< ++ /usr/share/xml/docbook/stylesheet/nwalsh/current/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-pod2man-no-utf8.patch ++++++ diff -ur devscripts-2.10.71.orig/scripts/Makefile devscripts-2.10.71/scripts/Makefile --- devscripts-2.10.71.orig/scripts/Makefile 2011-02-19 17:23:31.000000000 +0100 +++ devscripts-2.10.71/scripts/Makefile 2011-03-31 15:11:44.771068655 +0200 @@ -39,7 +39,7 @@ %.1: %.pl podchecker $< - pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ + pod2man --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk xsltproc --nonet -o $@ \ /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl $< ++++++ dpkg-pod2man-no-utf8.patch ++++++ diff -ur dpkg-1.15.8.10.orig/scripts/Makefile.am dpkg-1.15.8.10/scripts/Makefile.am --- dpkg-1.15.8.10.orig/scripts/Makefile.am 2011-01-30 20:37:44.000000000 +0100 +++ dpkg-1.15.8.10/scripts/Makefile.am 2011-03-31 15:08:28.765764914 +0200 @@ -136,7 +136,7 @@ $(mkdir_p) $(DESTDIR)$(man3dir) for module in $(nobase_dist_perllib_DATA); do \ name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \ - pod2man --utf8 --center=libdpkg-perl --release=$(VERSION) \ + pod2man --center=libdpkg-perl --release=$(VERSION) \ --name="$$name" --section=3 $(srcdir)/$$module \ >$(DESTDIR)$(man3dir)/$$name.3; \ test -s $(DESTDIR)$(man3dir)/$$name.3 || \ diff -ur dpkg-1.15.8.10.orig/scripts/Makefile.in dpkg-1.15.8.10/scripts/Makefile.in --- dpkg-1.15.8.10.orig/scripts/Makefile.in 2011-01-30 20:38:03.000000000 +0100 +++ dpkg-1.15.8.10/scripts/Makefile.in 2011-03-31 15:23:22.273853964 +0200 @@ -986,7 +986,7 @@ @BUILD_POD_DOC_TRUE@ $(mkdir_p) $(DESTDIR)$(man3dir) @BUILD_POD_DOC_TRUE@ for module in $(nobase_dist_perllib_DATA); do \ @BUILD_POD_DOC_TRUE@ name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \ -@BUILD_POD_DOC_TRUE@ pod2man --utf8 --center=libdpkg-perl --release=$(VERSION) \ +@BUILD_POD_DOC_TRUE@ pod2man --center=libdpkg-perl --release=$(VERSION) \ @BUILD_POD_DOC_TRUE@ --name="$$name" --section=3 $(srcdir)/$$module \ @BUILD_POD_DOC_TRUE@ >$(DESTDIR)$(man3dir)/$$name.3; \ @BUILD_POD_DOC_TRUE@ test -s $(DESTDIR)$(man3dir)/$$name.3 || \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
