Hello community,
here is the log from the commit of package deb for openSUSE:Factory
checked in at Mon Nov 16 15:57:16 CET 2009.
--------
--- deb/deb.changes 2009-08-13 15:52:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/deb/deb.changes 2009-11-12 12:43:11.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 12 09:14:55 UTC 2009 - wr@rosenauer.org
+
+- include devscripts-2.10.55
+- add sensible-editor helper script
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
devscripts_2.10.55.tar.bz2
devscripts-buildfix.diff
sensible-editor
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deb.spec ++++++
--- /var/tmp/diff_new_pack.URateI/_old 2009-11-16 15:54:25.000000000 +0100
+++ /var/tmp/diff_new_pack.URateI/_new 2009-11-16 15:54:25.000000000 +0100
@@ -18,6 +18,7 @@
# norootforbuild
%define debhelper_ver 7.3.12
+%define devscripts_ver 2.10.55
Name: deb
BuildRequires: gcc-c++ ncurses-devel texlive-latex update-alternatives zlib-devel
@@ -27,17 +28,23 @@
License: GPL v2 or later
Group: System/Packages
PreReq: /bin/touch
-Provides: dpkg dpkg-dev debhelper dselect dpkg-doc
+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.0
-Release: 13
+Release: 14
Summary: Tools for Debian Packages
Source: dpkg_%{version}.tar.bz2
Source1: debhelper_%{debhelper_ver}.tar.bz2
+Source2: devscripts_%{devscripts_ver}.tar.bz2
+Source3: sensible-editor
Patch0: debhelper-no-localized-manpages.diff
+Patch1: devscripts-buildfix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %suse_version < 1120
+%define _libexecdir /usr/lib
+%endif
%description
This package contains tools for working with Debian packages. It makes
@@ -45,21 +52,18 @@
installed, the packages can be converted to RPMs.
This package contains the following Debian packages: dpkg, dselect,
-dpkg-doc, dpkg-dev, and debhelper.
-
-
+dpkg-doc, dpkg-dev, debhelper, and devscripts.
-Authors:
---------
- Klee Dienes
- Joey Hess
%lang_package
%prep
-%setup -q -n dpkg-%{version} -b 1
-cd ..
+%setup -q -n dpkg-%{version} -b 1 -b 2
+pushd ..
%patch0
-cd -
+pushd devscripts-%{devscripts_ver}
+%patch1 -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
@@ -91,6 +95,14 @@
# This makes debhelper man pages
cd ../debhelper
make VERSION='%{debhelper_ver}'
+##
+# devscripts
+##
+# need dpkg-parsechangelog for devscripts
+export PATH="$RPM_BUILD_DIR/dpkg-%{version}/scripts:$PATH"
+export PERL5LIB="$RPM_BUILD_DIR/dpkg-%{version}/scripts"
+cd ../devscripts-%{devscripts_ver}
+make
%install
##
@@ -140,6 +152,15 @@
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
+##
+# extras
+##
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}
+##
# remove update-alternatives stuff (included in separate package)
##
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/alternatives
@@ -189,5 +210,7 @@
%{perl_vendorlib}/Debian
%{perl_vendorlib}/Dpkg
%{perl_vendorlib}/Dpkg.pm
+%{_libexecdir}/devscripts
+%{_datadir}/devscripts
%changelog
++++++ devscripts-buildfix.diff ++++++
diff -uprN devscripts-2.10.55.orig/Makefile devscripts-2.10.55/Makefile
--- devscripts-2.10.55.orig/Makefile 2009-05-02 20:31:54.000000000 +0200
+++ devscripts-2.10.55/Makefile 2009-11-12 11:07:01.000000000 +0100
@@ -7,7 +7,7 @@ DESTDIR =
PERL_MODULES = Devscripts
EXAMPLES = conf.default
-all: version scripts $(EXAMPLES) translated_manpages
+all: version scripts $(EXAMPLES)
version:
rm -f version
diff -uprN devscripts-2.10.55.orig/scripts/Makefile devscripts-2.10.55/scripts/Makefile
--- devscripts-2.10.55.orig/scripts/Makefile 2009-07-22 13:54:25.000000000 +0200
+++ devscripts-2.10.55/scripts/Makefile 2009-11-12 11:10:10.000000000 +0100
@@ -14,7 +14,7 @@ COMPL_FILES := $(wildcard *.bash_complet
COMPLETION = $(patsubst %.bash_completion,devscripts.%,$(COMPL_FILES))
GEN_MAN1S = bts.1 build-rdeps.1 chdist.1 dcontrol.1 debcheckout.1 debcommit.1 \
- deb-reversion.1 desktop2menu.1 dget.1 licensecheck.1 mass-bug.1 \
+ desktop2menu.1 dget.1 licensecheck.1 mass-bug.1 \
mk-build-deps.1 namecheck.1 rmadison.1 svnpath.1 tagpending.1 \
transition-check.1 devscripts.1
@@ -22,16 +22,16 @@ BINDIR = /usr/bin
LIBDIR = /usr/lib/devscripts
BIN_LIBDIR = /usr/lib/devscripts
-all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
+all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS)
%: %.sh
%.tmp: %.sh $(VERSION_FILE)
sed -e "s/###VERSION###/$(VERSION)/" $< > $@
- bash -n $@
+ #bash -n $@
%.tmp: %.pl $(VERSION_FILE)
sed -e "s/###VERSION###/$(VERSION)/" $< > $@
- perl -I.. -c $@
+ #perl -I.. -c $@
%: %.tmp
cp $< $@
chmod +x $@
@@ -62,10 +62,12 @@ clean:
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
++++++ sensible-editor ++++++
#!/bin/sh
ret="$?"
if [ -n "$VISUAL" ]; then
${VISUAL} "$@"
ret="$?"
if [ "$ret" -ne 126 ] && [ "$ret" -ne 127 ]; then
exit "$ret"
fi
fi
${EDITOR:-editor} "$@"
ret="$?"
if [ "$ret" -eq 126 ] || [ "$ret" -eq 127 ]; then
nano "$@"
ret="$?"
if [ "$ret" -eq 126 ] || [ "$ret" -eq 127 ]; then
nano-tiny "$@"
ret="$?"
if [ "$ret" -eq 126 ] || [ "$ret" -eq 127 ]; then
vi "$@"
ret="$?"
if [ "$ret" -eq 126 ] || [ "$ret" -eq 127 ]; then
echo "Couldn't find an editor!" 1>&2
echo "Set the \$EDITOR environment variable to your desired editor." 1>&2
exit 1
fi
fi
fi
fi
exit "$ret"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org