Hello community, here is the log from the commit of package deb for openSUSE:Factory checked in at 2012-06-05 15:30:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deb (Old) and /work/SRC/openSUSE:Factory/.deb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deb", Maintainer is "vdziewie...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/deb/deb.changes 2012-05-14 16:13:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deb.new/deb.changes 2012-06-05 15:30:15.000000000 +0200 @@ -1,0 +2,16 @@ +Mon May 21 03:31:50 UTC 2012 - i...@marguerite.su + +- update to dpkg-1.16.3 + * see http://packages.debian.org/changelogs/pool/main/d/dpkg/dpkg_1.16.3/changelog +- update to debhelper 9.20120518 + * Fix versioned dependency on dpkg for xz options. Closes: #672895 + * dh_link: Doc improvement. Closes: #672988 +- update to devscripts-2.11.7 + * see http://packages.debian.org/changelogs/pool/main/d/devscripts/devscripts_2.11.7/changelog +- reworked patch. remove version for archtable. for it's universal. +- add dh_make 0.60 + * see http://packages.debian.org/changelogs/pool/main/d/dh-make/dh-make_0.60/changelog +- add dh_autoreconf 6 + * see http://packages.debian.org/changelogs/pool/main/d/dh-autoreconf/dh-autoreconf_6/changelog + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/deb/update-alternatives.changes 2012-01-31 10:20:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives.changes 2012-06-05 15:30:15.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 03:34:58 UTC 2012 - i...@marguerite.su + +- update to 1.16.3 +- reworked patch + +------------------------------------------------------------------- Old: ---- 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.12-archtable-suse.patch dpkg_1.15.8.12.tar.bz2 update-alternatives-1.15.8.12-suse.patch New: ---- debhelper_9.20120518.tar.gz devscripts-2.11.7-buildfix.patch devscripts-2.11.7-debcommit-hg16.patch devscripts-2.11.7-remove-install-layout-deb.patch devscripts_2.11.7.tar.gz dh-autoreconf_6.tar.gz dh-make_0.60.tar.gz dpkg-archtable-suse.patch dpkg_1.16.3.tar.bz2 update-alternatives-1.16.3-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deb.spec ++++++ --- /var/tmp/diff_new_pack.VY4pu1/_old 2012-06-05 15:30:18.000000000 +0200 +++ /var/tmp/diff_new_pack.VY4pu1/_new 2012-06-05 15:30:18.000000000 +0200 @@ -17,49 +17,70 @@ %define admindir %{_localstatedir}/lib/rpm/ -%define debhelper_ver 8.1.2 -%define devscripts_ver 2.10.71 +%define debhelper_ver 9.20120518 +%define devscripts_ver 2.11.7 +%define dhmake_ver 0.60 +%define dhautoreconf_ver 6 + +%{!?py_ver: %global py_ver %(echo `python -c "import sys; sys.stdout.write(sys.version[:3])"`)} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: deb -Version: 1.15.8.12 +Version: 1.16.3 Release: 0 -Url: http://www.debian.org -Provides: debhelper -Provides: devscripts -Provides: dpkg -Provides: dpkg-dev -Provides: dpkg-doc -Provides: dselect -Requires: cpio -Requires: html2text -Requires: make -Requires: patch -Requires: perl = %{perl_version} Summary: Tools for Debian Packages License: GPL-2.0+ Group: System/Packages +Url: http://www.debian.org 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 +Source4: http://ftp.de.debian.org/debian/pool/main/d/dh-make/dh-make_%{dhmake_ver}.tar.gz +Source5: http://ftp.de.debian.org/debian/pool/main/d/dh-autoreconf/dh-autoreconf_%{dhautoreconf_ver}.tar.gz +# PATCH-FIX-UPSTREAM not build translated-manpages. Patch0: debhelper-no-localized-manpages.patch -Patch1: devscripts-2.10.71-buildfix.patch +# PATCH-FIX-UPSTREAM remove bash auto completion and fix docbook template directories path. +Patch1: devscripts-2.11.7-buildfix.patch +# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch2: debhelper-pod2man-no-utf8.patch -Patch3: devscripts-2.10.71-debcommit-hg16.patch +# PATCH-FIX-UPSTREAM hg can't commit empty, fix it. +Patch3: devscripts-2.11.7-debcommit-hg16.patch +# PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. Patch4: update-alternatives-%{version}-suse.patch -Patch5: dpkg-%{version}-archtable-suse.patch +# PATCH-FIX-OPENSUSE add openSUSE supported architectures +Patch5: dpkg-archtable-suse.patch +# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch6: dpkg-pod2man-no-utf8.patch +# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch7: devscripts-pod2man-no-utf8.patch +# PATCH-FIX-UPSTREAM remove unrecognized --install-layout=deb from scripts/setup.py and fix prefix +Patch8: devscripts-2.11.7-remove-install-layout-deb.patch BuildRequires: gcc-c++ BuildRequires: ncurses-devel +BuildRequires: python-devel +# we are sorry to drop sles10 support, but no setuptools +BuildRequires: python-setuptools BuildRequires: zlib-devel +Requires: cpio +Requires: html2text +Requires: make +Requires: patch +Requires: perl = %{perl_version} +Provides: debhelper +Provides: devscripts +Provides: dpkg +Provides: dpkg-dev +Provides: dpkg-doc +Provides: dselect %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -Requires(pre): /bin/touch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): /bin/touch %if 0%{?suse_version} BuildRequires: libbz2-devel @@ -113,12 +134,10 @@ %description devel Libraries and header files for dpkg. - %lang_package %prep -%setup -q -n dpkg-%{version} -b 1 -b 2 +%setup -q -n dpkg-%{version} -b 1 -b 2 -b 4 -b 5 # do not unpack anything, just cd to source dir -#%setup -q -D -T -n %{_builddir} cd .. %patch0 @@ -131,9 +150,10 @@ %patch3 %patch4 %patch5 +%patch8 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" %if 0%{?use_selinux} export SELINUX_LIBS="-lselinux" %endif @@ -145,7 +165,7 @@ --disable-compiler-warnings \ %endif --localstatedir=%{_localstatedir}/lib\ - --with-admindir=%{_var}/lib/dpkg + --with-admindir=%{_localstatedir}/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 @@ -182,6 +202,7 @@ make %{?_smp_mflags} %install +# use makeinstall for sles10 compatibility. %makeinstall # remove update-alternatives stuff (included in separate package) @@ -204,7 +225,6 @@ 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 @@ -239,7 +259,7 @@ popd # debhelper pushd ../devscripts-%{devscripts_ver} -make install DESTDIR=%{buildroot} +%makeinstall install -D -m 644 scripts/*.1 %{buildroot}%{_mandir}/man1/ install -D -m 644 scripts/*.5 %{buildroot}%{_mandir}/man5/ while read target link; do @@ -247,8 +267,35 @@ ln -sf $target %{buildroot}$link fi done <debian/links +# fix docs +mkdir -pv %{buildroot}%{_docdir} +mv %{buildroot}%{_datadir}/doc/devscripts %{buildroot}%{_docdir} +chmod -x %{buildroot}%{_docdir}/devscripts/README popd +pushd ../dh-make +install -m 755 dh_make %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_datadir}/debhelper/dh_make +mv lib/* %{buildroot}%{_datadir}/debhelper/dh_make/ +install -m 644 *.1 %{buildroot}%{_mandir}/man1 +popd # dh-make + +pushd ../dh-autoreconf-%{dhautoreconf_ver} +install -m 755 dh_autoreconf %{buildroot}%{_bindir} +install -m 755 dh_autoreconf_clean %{buildroot}%{_bindir} +install -m 644 autoreconf.pm %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence +install -d -m 755 %{buildroot}%{_datadir}/cdbs/1/rules/ +install -m 644 autoreconf.mk %{buildroot}%{_datadir}/cdbs/1/rules +install -d -m 755 %{buildroot}%{_datadir}/dh-autoreconf/ +install -m 644 ltmain-as-needed.diff %{buildroot}%{_datadir}/dh-autoreconf/ +#manpages +pod2man -r "dh-autoreconf v%{dhautoreconf_ver}" -c dh-autoreconf --section=1 dh_autoreconf dh_autoreconf.1 +pod2man -r "dh-autoreconf v%{dhautoreconf_ver}" -c dh-autoreconf --section=1 dh_autoreconf_clean dh_autoreconf_clean.1 +pod2man -r "dh-autoreconf v%{dhautoreconf_ver}" -c dh-autoreconf --section=7 dh-autoreconf.pod dh-autoreconf.7 +install -m 644 *.1 %{buildroot}%{_mandir}/man1 +install -m 644 *.7 %{buildroot}%{_mandir}/man7 +popd # dh-autoreconf + # extras install -m 755 %{SOURCE3} %{buildroot}%{_bindir} @@ -283,12 +330,17 @@ %{perl_vendorlib}/Debian %{perl_vendorlib}/Dpkg %{perl_vendorlib}/Dpkg.pm +%{python_sitelib}/devscripts/ +%{python_sitelib}/devscripts-%{devscripts_ver}-py%{py_ver}.egg-info/ %{_libexecdir}/devscripts %{_datadir}/devscripts +%{_docdir}/devscripts +%{_datadir}/cdbs/ +%{_datadir}/dh-autoreconf/ %if 0%{?suse_version} < 1110 -/usr/share/locale/*/LC_MESSAGES/* -%dir /usr/share/locale/ast -%dir /usr/share/locale/ast/LC_MESSAGES +%{_datadir}/locale/*/LC_MESSAGES/* +%dir %{_datadir}/locale/ast +%dir %{_datadir}/locale/ast/LC_MESSAGES %endif %files devel ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.VY4pu1/_old 2012-06-05 15:30:18.000000000 +0200 +++ /var/tmp/diff_new_pack.VY4pu1/_new 2012-06-05 15:30:18.000000000 +0200 @@ -19,16 +19,17 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.15.8.12 +Version: 1.16.3 Release: 0 -Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Summary: Maintain symbolic links determining default commands License: GPL-2.0+ Group: System/Management +Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2 Source3: sensible-editor Patch0: update-alternatives-%{version}-suse.patch -Patch1: dpkg-%{version}-archtable-suse.patch +Patch1: dpkg-archtable-suse.patch +BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,20 +53,21 @@ %build %{configure} \ - --with-admindir=%{admindir} + --with-admindir=%{admindir} \ + --disable-compiler-warnings # disable for sles10 -Wvla make -C lib/compat %{?_smp_mflags} make -C utils/ %{?_smp_mflags} %install -%{__install} -d -m 0755 %{buildroot}/%{_sbindir}/ -%{__install} -d -m 0755 %{buildroot}/%{_mandir}/man8/ -%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/alternatives -%{__install} -d -m 0755 %{buildroot}/%{admindir}/alternatives -%{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log +install -d -m 0755 %{buildroot}/%{_sbindir}/ +install -d -m 0755 %{buildroot}/%{_mandir}/man8/ +install -d -m 0755 %{buildroot}/%{_sysconfdir}/alternatives +install -d -m 0755 %{buildroot}/%{admindir}/alternatives +install -d -m 0755 %{buildroot}/%{_localstatedir}/log -%{__install} -m 0755 utils/%{name} %{buildroot}/%{_sbindir} -%{__install} -m 0644 man/%{name}.8 %{buildroot}/%{_mandir}/man8/ +install -m 0755 utils/%{name} %{buildroot}/%{_sbindir} +install -m 0644 man/%{name}.8 %{buildroot}/%{_mandir}/man8/ touch %{buildroot}/%{_localstatedir}/log/%{name}.log @@ -73,7 +75,7 @@ %defattr(-,root,root,-) %doc COPYING %dir %{_sysconfdir}/alternatives -%dir %{_var}/lib/rpm/alternatives +%dir %{_localstatedir}/lib/rpm/alternatives %{_sbindir}/update-alternatives %{_mandir}/man8/update-alternatives.8* %ghost %{_localstatedir}/log/update-alternatives.log ++++++ debhelper-pod2man-no-utf8.patch ++++++ --- /var/tmp/diff_new_pack.VY4pu1/_old 2012-06-05 15:30:18.000000000 +0200 +++ /var/tmp/diff_new_pack.VY4pu1/_new 2012-06-05 15:30:18.000000000 +0200 @@ -1,7 +1,6 @@ -Index: debhelper/Makefile -=================================================================== ---- debhelper/Makefile.orig 2011-03-16 09:40:54.454930738 +0100 -+++ debhelper/Makefile 2011-03-16 09:46:06.028984654 +0100 +diff -urN debhelper.orig/Makefile debhelper/Makefile +--- debhelper.orig/Makefile 2012-05-22 00:31:07.490458089 +0800 ++++ debhelper/Makefile 2012-05-22 00:31:43.648006056 +0800 @@ -38,7 +38,7 @@ PERLLIBDIR=$(shell perl -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper @@ -9,5 +8,5 @@ -POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)" +POD2MAN=pod2man -c Debhelper -r "$(VERSION)" - build: version debhelper.7 - find . -maxdepth 1 -type f -perm +100 -name "dh*" \ + # l10n to be built is determined from .po files + LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po))) ++++++ debhelper_8.1.2.tar.gz -> debhelper_9.20120518.tar.gz ++++++ ++++ 25014 lines of diff (skipped) ++++++ devscripts-2.10.71-buildfix.patch -> devscripts-2.11.7-buildfix.patch ++++++ --- /work/SRC/openSUSE:Factory/deb/devscripts-2.10.71-buildfix.patch 2011-09-23 01:54:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deb.new/devscripts-2.11.7-buildfix.patch 2012-06-05 15:30:15.000000000 +0200 @@ -1,21 +1,31 @@ -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 +diff -urN devscripts-2.11.7.orig/Makefile devscripts-2.11.7/Makefile +--- devscripts-2.11.7.orig/Makefile 2012-05-21 11:36:59.800426916 +0800 ++++ devscripts-2.11.7/Makefile 2012-05-21 11:38:41.453156082 +0800 +@@ -11,7 +11,7 @@ + DOCDIR ?= $(PREFIX)/share/doc/devscripts + MAN1DIR ?= $(PREFIX)/share/man/man1 -all: version make_scripts $(EXAMPLES) translated_manpages -+all: version scripts $(EXAMPLES) ++all: version make_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 @@ +diff -urN devscripts-2.11.7.orig/po4a/Makefile devscripts-2.11.7/po4a/Makefile +--- devscripts-2.11.7.orig/po4a/Makefile 2012-05-21 11:36:59.800426916 +0800 ++++ devscripts-2.11.7/po4a/Makefile 2012-05-21 11:41:45.313857508 +0800 +@@ -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/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 $@ +diff -urN devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.7/scripts/Makefile +--- devscripts-2.11.7.orig/scripts/Makefile 2012-05-21 11:36:59.809426803 +0800 ++++ devscripts-2.11.7/scripts/Makefile 2012-05-21 11:41:19.598178997 +0800 +@@ -24,7 +24,7 @@ LIBDIR = /usr/lib/devscripts BIN_LIBDIR = /usr/lib/devscripts @@ -23,8 +33,8 @@ +all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(VERSION_FILE): - @echo "You need to 'make' the toplevel directory first" -@@ -29,10 +29,8 @@ + $(MAKE) -C .. version +@@ -33,10 +33,8 @@ %.tmp: %.sh $(VERSION_FILE) sed -e "s/###VERSION###/$(VERSION)/" $< > $@ @@ -35,7 +45,7 @@ %: %.tmp cp $< $@ chmod +x $@ -@@ -42,7 +40,7 @@ +@@ -46,7 +44,7 @@ pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk xsltproc --nonet -o $@ \ @@ -44,30 +54,11 @@ # 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) +@@ -82,7 +80,6 @@ + ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch cp $(LIBS) $(DESTDIR)$(LIBDIR) + install -dD $(DESTDIR)/etc/bash_completion.d - cp $(COMPLETION) $(DESTDIR)/etc/bash_completion.d # Special treatment for debpkg -+ mkdir -p $(DESTDIR)$(PERLMOD_DIR) + install -dD $(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/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-2.10.71-debcommit-hg16.patch -> devscripts-2.11.7-debcommit-hg16.patch ++++++ --- /work/SRC/openSUSE:Factory/deb/devscripts-2.10.71-debcommit-hg16.patch 2011-09-23 01:54:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deb.new/devscripts-2.11.7-debcommit-hg16.patch 2012-06-05 15:30:15.000000000 +0200 @@ -1,8 +1,7 @@ -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 @@ +diff -urN devscripts-2.11.7.orig/scripts/debcommit.pl devscripts-2.11.7/scripts/debcommit.pl +--- devscripts-2.11.7.orig/scripts/debcommit.pl 2012-05-21 11:36:59.813426755 +0800 ++++ devscripts-2.11.7/scripts/debcommit.pl 2012-05-21 11:45:02.100397337 +0800 +@@ -592,7 +592,9 @@ else { die "debcommit: unknown program $prog"; } ++++++ devscripts-2.11.7-remove-install-layout-deb.patch ++++++ diff -urN devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.7/scripts/Makefile --- devscripts-2.11.7.orig/scripts/Makefile 2012-05-21 20:25:34.530645434 +0800 +++ devscripts-2.11.7/scripts/Makefile 2012-05-21 20:25:52.685418466 +0800 @@ -76,7 +76,7 @@ $(foreach python,$(shell pyversions -r ../debian/control),$(python) setup.py test$(\n)) install: all - python setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb + python setup.py install --root="$(DESTDIR)" --no-compile --prefix=/usr install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) cp $(SCRIPTS) $(DESTDIR)$(BINDIR) ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch ++++++ devscripts-pod2man-no-utf8.patch ++++++ --- /var/tmp/diff_new_pack.VY4pu1/_old 2012-06-05 15:30:18.000000000 +0200 +++ /var/tmp/diff_new_pack.VY4pu1/_new 2012-06-05 15:30:18.000000000 +0200 @@ -1,7 +1,7 @@ -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 @@ +diff -urN devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.7/scripts/Makefile +--- devscripts-2.11.7.orig/scripts/Makefile 2012-05-21 21:31:57.952845803 +0800 ++++ devscripts-2.11.7/scripts/Makefile 2012-05-22 00:26:16.954090293 +0800 +@@ -43,7 +43,7 @@ %.1: %.pl podchecker $< @@ -9,4 +9,4 @@ + pod2man --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk xsltproc --nonet -o $@ \ - /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl $< + /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< ++++++ devscripts_2.10.71.tar.gz -> devscripts_2.11.7.tar.gz ++++++ ++++ 34252 lines of diff (skipped) ++++++ dpkg-1.15.8.12-archtable-suse.patch -> dpkg-archtable-suse.patch ++++++ --- /work/SRC/openSUSE:Factory/deb/dpkg-1.15.8.12-archtable-suse.patch 2012-01-31 10:20:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.deb.new/dpkg-archtable-suse.patch 2012-06-05 15:30:15.000000000 +0200 @@ -1,20 +1,20 @@ -Index: dpkg-1.15.8.12/debian/archtable -=================================================================== ---- dpkg-1.15.8.12.orig/debian/archtable -+++ dpkg-1.15.8.12/debian/archtable -@@ -27,3 +27,15 @@ sparc-linux-gnu sparc +diff -urN dpkg-1.16.3.orig/debian/archtable dpkg-1.16.3/debian/archtable +--- dpkg-1.16.3.orig/debian/archtable 2012-05-21 11:10:20.604419618 +0800 ++++ dpkg-1.16.3/debian/archtable 2012-05-21 11:27:16.525718853 +0800 +@@ -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 +++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 +\ 文件尾没有 newline 字符 ++++++ dpkg-pod2man-no-utf8.patch ++++++ --- /var/tmp/diff_new_pack.VY4pu1/_old 2012-06-05 15:30:18.000000000 +0200 +++ /var/tmp/diff_new_pack.VY4pu1/_new 2012-06-05 15:30:18.000000000 +0200 @@ -1,26 +1,24 @@ -Index: dpkg-1.15.8.12/scripts/Makefile.am -=================================================================== ---- dpkg-1.15.8.12.orig/scripts/Makefile.am -+++ dpkg-1.15.8.12/scripts/Makefile.am -@@ -136,7 +136,7 @@ if BUILD_POD_DOC +diff -urN dpkg-1.16.3.orig/scripts/Makefile.am dpkg-1.16.3/scripts/Makefile.am +--- dpkg-1.16.3.orig/scripts/Makefile.am 2012-05-22 00:27:39.702055802 +0800 ++++ dpkg-1.16.3/scripts/Makefile.am 2012-05-22 00:28:52.757142487 +0800 +@@ -137,7 +137,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) \ +- $(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 || \ -Index: dpkg-1.15.8.12/scripts/Makefile.in -=================================================================== ---- dpkg-1.15.8.12.orig/scripts/Makefile.in -+++ dpkg-1.15.8.12/scripts/Makefile.in -@@ -986,7 +986,7 @@ install-data-local: +diff -urN dpkg-1.16.3.orig/scripts/Makefile.in dpkg-1.16.3/scripts/Makefile.in +--- dpkg-1.16.3.orig/scripts/Makefile.in 2012-05-22 00:27:39.702055802 +0800 ++++ dpkg-1.16.3/scripts/Makefile.in 2012-05-22 00:29:34.834616447 +0800 +@@ -1036,7 +1036,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@ $(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 || \ ++++++ dpkg_1.15.8.12.tar.bz2 -> dpkg_1.16.3.tar.bz2 ++++++ ++++ 733615 lines of diff (skipped) ++++++ update-alternatives-1.15.8.12-suse.patch -> update-alternatives-1.16.3-suse.patch ++++++ --- /work/SRC/openSUSE:Factory/deb/update-alternatives-1.15.8.12-suse.patch 2012-01-31 10:20:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives-1.16.3-suse.patch 2012-06-05 15:30:15.000000000 +0200 @@ -1,35 +1,25 @@ -Index: dpkg-1.15.8.12/man/update-alternatives.8 -=================================================================== ---- dpkg-1.15.8.12.orig/man/update-alternatives.8 -+++ dpkg-1.15.8.12/man/update-alternatives.8 -@@ -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 @@ update\-alternatives \- maintain symboli +diff -urN dpkg-1.16.3.orig/man/update-alternatives.8 dpkg-1.16.3/man/update-alternatives.8 +--- dpkg-1.16.3.orig/man/update-alternatives.8 2012-05-21 11:10:20.686418591 +0800 ++++ dpkg-1.16.3/man/update-alternatives.8 2012-05-21 11:15:52.029276236 +0800 +@@ -33,7 +33,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. ++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 @@ different editor, if desired, but makes +@@ -43,7 +43,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. ++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 @@ installed, changed or removed, +@@ -82,10 +82,10 @@ is called to update information about that file in the alternatives system. .B update\-alternatives is usually called from the @@ -39,11 +29,11 @@ -.B prerm -(install) scripts in Debian packages. +.B preun -+(install) scripts in SUSE packages. ++(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 @@ containing the symlinks. +@@ -189,7 +189,7 @@ .TP administrative directory A directory, by default @@ -52,29 +42,19 @@ containing .BR update\-alternatives ' state information. -@@ -477,7 +477,7 @@ this as root: +@@ -501,7 +501,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. ++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.12/utils/update-alternatives.c -=================================================================== ---- dpkg-1.15.8.12.orig/utils/update-alternatives.c -+++ dpkg-1.15.8.12/utils/update-alternatives.c -@@ -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 int opt_force = 0; +diff -urN dpkg-1.16.3.orig/utils/update-alternatives.c dpkg-1.16.3/utils/update-alternatives.c +--- dpkg-1.16.3.orig/utils/update-alternatives.c 2012-05-21 11:10:20.607419579 +0800 ++++ dpkg-1.16.3/utils/update-alternatives.c 2012-05-21 11:21:24.189123667 +0800 +@@ -68,7 +68,7 @@ static char *pass_opts[MAX_OPTS]; static int nb_opts = 0; @@ -83,23 +63,28 @@ /* * Functions. -@@ -77,7 +77,7 @@ static int nb_opts = 0; +@@ -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(_("SuSE %s version %s.\n"), PROGNAME, VERSION); printf("\n"); printf(_( -@@ -1984,8 +1984,8 @@ main(int argc, char **argv) - int i = 0, count; +@@ -359,13 +359,13 @@ + const char *basedir, *dpkg_basedir; + char *admindir; + +- dpkg_basedir = getenv("DPKG_ADMINDIR"); ++ dpkg_basedir = getenv("RPM_ADMINDIR"); + if (dpkg_basedir) + basedir = dpkg_basedir; + else + basedir = ADMINDIR; - setlocale(LC_ALL, ""); -- bindtextdomain("dpkg", LOCALEDIR); -- textdomain("dpkg"); -+ bindtextdomain("rpm", LOCALEDIR); -+ textdomain("rpm"); +- xasprintf(&admindir, "%s/%s", basedir, "alternatives"); ++ xasprintf(&admindir, "%s/%s", basedir, "/var/lib/rpm/alternatives"); - if (setvbuf(stdout, NULL, _IONBF, 0)) - error("setvbuf failed: %s", strerror(errno)); + return admindir; + } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
