[Glibc-bsd-commits] r2015 - trunk/web/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Tue Nov 6 17:00:49 UTC 2007
Author: ps-guest
Date: 2007-11-06 17:00:49 +0000 (Tue, 06 Nov 2007)
New Revision: 2015
Removed:
trunk/web/patches/avifile.diff
trunk/web/patches/rpm-4.4.1.diff.txt
trunk/web/patches/unixodbc.diff
trunk/web/patches/zsh.diff
Log:
* drop some obsolete patches
Deleted: trunk/web/patches/avifile.diff
===================================================================
--- trunk/web/patches/avifile.diff 2007-11-06 11:04:16 UTC (rev 2014)
+++ trunk/web/patches/avifile.diff 2007-11-06 17:00:49 UTC (rev 2015)
@@ -1,31 +0,0 @@
-diff -Nru /tmp/NknjgWwSPm/avifile-0.7.44.20051021/debian/control /tmp/aXXmQEgmMf/avifile-0.7.44.20051021/debian/control
---- /tmp/NknjgWwSPm/avifile-0.7.44.20051021/debian/control 2005-10-21 14:21:48.000000000 +0200
-+++ /tmp/aXXmQEgmMf/avifile-0.7.44.20051021/debian/control 2005-10-23 22:56:15.000000000 +0200
-@@ -70,7 +70,7 @@
- Homepage: http://avifile.sourceforge.net
-
- Package: avifile-win32-plugin
--Architecture: i386 amd64
-+Architecture: kfreebsd-i386 i386 amd64
- Section: contrib/libs
- Depends: ${shlibs:Depends}
- Description: Win32 audio/video plugin for libavifile
-diff -Nru /tmp/NknjgWwSPm/avifile-0.7.44.20051021/debian/rules /tmp/aXXmQEgmMf/avifile-0.7.44.20051021/debian/rules
---- /tmp/NknjgWwSPm/avifile-0.7.44.20051021/debian/rules 2005-10-21 14:22:50.000000000 +0200
-+++ /tmp/aXXmQEgmMf/avifile-0.7.44.20051021/debian/rules 2005-10-23 21:46:32.000000000 +0200
-@@ -201,7 +201,7 @@
- # -ptmp
- #DH2 @dh_movefiles
- dh_compress
-- @chmod +x debian/$(player)/usr/share/$(aviversion)/scripts/*
-+# @chmod +x debian/$(player)/usr/share/$(aviversion)/scripts/*
- dh_fixperms -Xkv4lsetup -Xavicap-boot -Xavicap-setnvram -Xavicap-shutdown
- dh_strip
-
-diff -Nru /tmp/NknjgWwSPm/avifile-0.7.44.20051021/samples/Makefile.am /tmp/aXXmQEgmMf/avifile-0.7.44.20051021/samples/Makefile.am
---- /tmp/NknjgWwSPm/avifile-0.7.44.20051021/samples/Makefile.am 2002-11-14 19:51:00.000000000 +0100
-+++ /tmp/aXXmQEgmMf/avifile-0.7.44.20051021/samples/Makefile.am 2005-10-23 20:35:03.000000000 +0200
-@@ -1,2 +1,2 @@
--SUBDIRS = artsplug misc qtvidcap qtrecompress mjpeg_plugin
-+SUBDIRS = artsplug misc qtrecompress mjpeg_plugin
- MAINTAINERCLEANFILES = Makefile.in
Deleted: trunk/web/patches/rpm-4.4.1.diff.txt
===================================================================
--- trunk/web/patches/rpm-4.4.1.diff.txt 2007-11-06 11:04:16 UTC (rev 2014)
+++ trunk/web/patches/rpm-4.4.1.diff.txt 2007-11-06 17:00:49 UTC (rev 2015)
@@ -1,41 +0,0 @@
-
-* extract rpm 4.4.1-14 somewhere
-* unpack rpm_4.4.1.orig.tar.gz
-* copy debian subdir from rpm 4.4.1-14 into unpacked rpm_4.4.1.orig.tar.gz
-* copy lsb-rpm.1 from rpm 4.4.1-14 into unpacked rpm_4.4.1.orig.tar.gz
-* in debian/patches/20-no-linux-gate.so-dependancy.diff drop whole change of debian/changelog
-* apply this patch (it adds quilt into Build-Depends and uses it in debian/rules)
-* build it
-
-
-diff -ur rpm-4.4.1.std/debian/control rpm-4.4.1/debian/control
---- rpm-4.4.1.std/debian/control 2007-01-29 23:36:35.000000000 +0100
-+++ rpm-4.4.1/debian/control 2007-01-29 23:38:53.000000000 +0100
-@@ -1,7 +1,7 @@
- Source: rpm
- Section: admin
- Priority: optional
--Build-Depends: debhelper (>= 5.0.37.2), libtool, autoconf, automake1.9, zlib1g-dev, libbz2-dev, libdb3-dev, dpkg-dev (>= 1.9.0), libpopt-dev (>= 1.6.4), python-all-dev, libbeecrypt6-dev, libneon25-dev, libxml2-dev, libreadline5-dev, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsepol1-dev, libsqlite3-dev, python-central (>= 0.5)
-+Build-Depends: debhelper (>= 5.0.37.2), libtool, autoconf, automake1.9, zlib1g-dev, libbz2-dev, libdb3-dev, dpkg-dev (>= 1.9.0), libpopt-dev (>= 1.6.4), python-all-dev, libbeecrypt6-dev, libneon25-dev, libxml2-dev, libreadline5-dev, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsepol1-dev, libsqlite3-dev, python-central (>= 0.5), quilt
- Maintainer: Anibal Monsalve Salazar <anibal at debian.org>
- Uploaders: Anand Kumria <wildfire at progsoc.org>, Víctor Pérez Pereira <vperez at debianvenezuela.org>
- XS-Python-Version: all
-diff -ur rpm-4.4.1.std/debian/rules rpm-4.4.1/debian/rules
---- rpm-4.4.1.std/debian/rules 2007-01-29 23:36:35.000000000 +0100
-+++ rpm-4.4.1/debian/rules 2007-01-29 23:39:54.000000000 +0100
-@@ -16,6 +16,7 @@
- endif
-
- makefiles:
-+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- cd popt && aclocal && libtoolize --copy --force && automake -c -i && autoconf && ./configure
- #cd beecrypt && aclocal-1.7 && libtoolize --copy --force && automake-1.7 -i -a -c -f && autoconf
- #aclocal-1.7
-@@ -75,6 +76,7 @@
- po/cat-id-tbl.c \
- popt/configure popt/ltmain.sh popt/aclocal.m4 Doxytags \
- lsb-rpm po/de.gmo
-+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
- binary-indep: build
-
Deleted: trunk/web/patches/unixodbc.diff
===================================================================
--- trunk/web/patches/unixodbc.diff 2007-11-06 11:04:16 UTC (rev 2014)
+++ trunk/web/patches/unixodbc.diff 2007-11-06 17:00:49 UTC (rev 2015)
@@ -1,51 +0,0 @@
-Author: aurel32
-Status: workaround until libtool.m4 get fixed
-
-diff -u unixodbc-2.2.11/aclocal.m4 unixodbc-2.2.11/aclocal.m4
---- unixodbc-2.2.11/aclocal.m4
-+++ unixodbc-2.2.11/aclocal.m4
-@@ -9003,7 +9003,7 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- linux*)
-+ linux* | kfreebsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-diff -u unixodbc-2.2.11/configure unixodbc-2.2.11/configure
---- unixodbc-2.2.11/configure
-+++ unixodbc-2.2.11/configure
-@@ -7499,7 +7499,7 @@
- hardcode_shlibpath_var=no
- ;;
-
-- linux*)
-+ linux* | kfreebsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds="$tmp_archive_cmds"
-diff -u unixodbc-2.2.11/libltdl/aclocal.m4 unixodbc-2.2.11/libltdl/aclocal.m4
---- unixodbc-2.2.11/libltdl/aclocal.m4
-+++ unixodbc-2.2.11/libltdl/aclocal.m4
-@@ -6042,7 +6042,7 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- linux*)
-+ linux* | kfreebsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-diff -u unixodbc-2.2.11/libltdl/configure unixodbc-2.2.11/libltdl/configure
---- unixodbc-2.2.11/libltdl/configure
-+++ unixodbc-2.2.11/libltdl/configure
-@@ -7189,7 +7189,7 @@
- hardcode_shlibpath_var=no
- ;;
-
-- linux*)
-+ linux* | kfreebsd-*gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds="$tmp_archive_cmds"
Deleted: trunk/web/patches/zsh.diff
===================================================================
--- trunk/web/patches/zsh.diff 2007-11-06 11:04:16 UTC (rev 2014)
+++ trunk/web/patches/zsh.diff 2007-11-06 17:00:49 UTC (rev 2015)
@@ -1,64 +0,0 @@
-diff -uwrN /tmp/zsh-4.2.4/debian/control zsh-4.2.4/debian/control
---- /tmp/zsh-4.2.4/debian/control 2005-03-18 16:31:51.000000000 +0100
-+++ zsh-4.2.4/debian/control 2005-03-18 15:13:35.000000000 +0100
-@@ -1,7 +1,7 @@
- Source: zsh
- Section: shells
- Priority: optional
--Build-Depends: texinfo, groff-base, libncurses5-dev, texi2html, libcap-dev [!hurd-i386 !freebsd-i386], bsdmainutils, po-debconf, libpcre3-dev
-+Build-Depends: texinfo, groff-base, libncurses5-dev, texi2html, libcap-dev [!hurd-i386 !kfreebsd-i386], bsdmainutils, po-debconf, libpcre3-dev
- Maintainer: Clint Adams <schizo at debian.org>
- Standards-Version: 3.6.1
-
-diff -uwrN /tmp/zsh-4.2.4/debian/rules zsh-4.2.4/debian/rules
---- /tmp/zsh-4.2.4/debian/rules 2005-03-18 16:31:51.000000000 +0100
-+++ zsh-4.2.4/debian/rules 2005-03-18 19:37:14.000000000 +0100
-@@ -212,7 +212,7 @@
- gzip -9f debian/tmp-static/usr/share/doc/${package}-static/changelog.Debian
- cd debian/tmp-static && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
- cp /lib/libnss_files.so.* debian/tmp-static
-- chmod 755 debian/tmp-static/libnss_files.so.*
-+ #chmod 755 debian/tmp-static/libnss_files.so.*
- dpkg-shlibdeps -Tdebian/${package}-static.substvars -dDepends debian/tmp-static/libnss_files.so.*
- rm debian/tmp-static/libnss_files.so.*
- dpkg-gencontrol -ldebian/changelog -isp -p${package}-static -Tdebian/${package}-static.substvars -Pdebian/tmp-static
---- /tmp/zsh-4.2.4/configure 2005-03-18 16:31:48.000000000 +0100
-+++ zsh-4.2.4/configure 2005-03-18 19:36:35.000000000 +0100
-@@ -15039,7 +15039,7 @@
- esac
- fi
- case "$host_os" in
-- freebsd*|linux*|irix*|osf*|gnu*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-+ freebsd*|linux*|irix*|osf*|gnu*|kfreebsd*-gnu) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
- sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
- sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
- netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
-@@ -15063,7 +15063,7 @@
- esac
- case "$host" in
- *-hpux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
-- *-freebsd3-9*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
-+ *-freebsd3-9*|*-linux*|gnu*|k*bsd*gnu) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
- *openbsd*)
- if test $zsh_cv_sys_elf = yes; then
- EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"
---- /tmp/zsh-4.2.4/configure.ac 2005-03-18 16:31:47.000000000 +0100
-+++ zsh-4.2.4/configure.ac 2005-03-18 18:15:19.000000000 +0100
-@@ -2061,7 +2061,7 @@
- esac
- fi
- case "$host_os" in
-- freebsd*|linux*|irix*|osf*|gnu*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-+ freebsd*|linux*|irix*|osf*|gnu*|k*bsd*-gnu) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
- sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
- sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
- netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
-@@ -2085,7 +2085,7 @@
- esac
- case "$host" in
- *-hpux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
-- *-freebsd[3-9]*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
-+ *-freebsd[3-9]*|*-linux*|gnu*|k*bsd*gnu) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
- *openbsd*)
- if test $zsh_cv_sys_elf = yes; then
- EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"
More information about the Glibc-bsd-commits
mailing list