[Glibc-bsd-commits] r1577 - in trunk/web/patches: . debian-only
Petr Salinger
ps-guest at costa.debian.org
Wed May 24 13:21:49 UTC 2006
Author: ps-guest
Date: 2006-05-24 13:21:48 +0000 (Wed, 24 May 2006)
New Revision: 1577
Removed:
trunk/web/patches/allegro4.2.diff
trunk/web/patches/debian-only/neon0.23.bash
trunk/web/patches/debian-only/php4.diff
trunk/web/patches/debian-only/squid.diff
trunk/web/patches/dvi2ps.diff
trunk/web/patches/smartmontools.diff
Log:
* drop some obsolete patches
Deleted: trunk/web/patches/allegro4.2.diff
===================================================================
--- trunk/web/patches/allegro4.2.diff 2006-05-23 14:09:47 UTC (rev 1576)
+++ trunk/web/patches/allegro4.2.diff 2006-05-24 13:21:48 UTC (rev 1577)
@@ -1,27 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u allegro4.2-4.2.0/debian/rules allegro4.2-4.2.0/debian/rules
---- allegro4.2-4.2.0/debian/rules
-+++ allegro4.2-4.2.0/debian/rules
-@@ -10,7 +10,7 @@
- fullver=4.2.0
-
- # SVGAlib is only for x86
--ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
-+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
- ARCH_CONFIG_FLAGS =
- ARCH_PACKAGES = liballegro$(ver)-plugin-svgalib
- else
-diff -u allegro4.2-4.2.0/debian/control allegro4.2-4.2.0/debian/control
---- allegro4.2-4.2.0/debian/control
-+++ allegro4.2-4.2.0/debian/control
-@@ -2,7 +2,7 @@
- Section: devel
- Priority: optional
- Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
--Build-Depends: debhelper (>= 4.0), texinfo, libesd0-dev, libxext-dev, libx11-dev, libxpm-dev, libxt-dev, svgalibg1-dev [i386], libasound2-dev (>= 0.9), libartsc0-dev, libjack0.100.0-dev, libxxf86dga-dev, libxxf86vm-dev
-+Build-Depends: debhelper (>= 4.0), texinfo, libesd0-dev, libxext-dev, libx11-dev, libxpm-dev, libxt-dev, svgalibg1-dev [i386], libasound2-dev (>= 0.9) [!kfreebsd-i386], libartsc0-dev, libjack0.100.0-dev, libxxf86dga-dev, libxxf86vm-dev
- Standards-Version: 3.6.2.1
-
- Package: liballegro4.2
Deleted: trunk/web/patches/debian-only/neon0.23.bash
===================================================================
--- trunk/web/patches/debian-only/neon0.23.bash 2006-05-23 14:09:47 UTC (rev 1576)
+++ trunk/web/patches/debian-only/neon0.23.bash 2006-05-24 13:21:48 UTC (rev 1577)
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -e
-
-cp debian/control{,.in}
-patch -p1 < $0
-which type-handling
-fakeroot debian/rules clean
-exit
-
-diff -ur neon0.23-0.23.9.dfsg.3.old/debian/control.in neon0.23-0.23.9.dfsg.3/debian/control.in
---- neon0.23-0.23.9.dfsg.3.old/debian/control.in 2005-05-05 19:01:15.000000000 +0200
-+++ neon0.23-0.23.9.dfsg.3/debian/control.in 2005-05-05 19:10:54.000000000 +0200
-@@ -3,12 +3,12 @@
- Priority: optional
- Maintainer: Debian OpenOffice Team <debian-openoffice at lists.debian.org>
- Uploaders: Rene Engelhard <rene at debian.org>, Chris Halls <halls at debian.org>
--Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libssl-dev, zlib1g-dev | libz-dev, dpatch, autotools-dev
-+Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libssl-dev, zlib1g-dev | libz-dev, dpatch, autotools-dev, type-handling (>= 0.2.1)
- Standards-Version: 3.6.1
-
- Package: libneon23
- Section: oldlibs
--Architecture: i386 powerpc s390 sparc
-+Architecture: @arch@
- Depends: ${shlibs:Depends}
- Description: An HTTP and WebDAV client library [old version]
- neon is an HTTP and WebDAV client library, with a C language API.
-@@ -41,7 +41,7 @@
- Package: libneon23-dev
- Section: libdevel
- Priority: extra
--Architecture: i386 powerpc sparc s390
-+Architecture: @arch@
- Conflicts: libneon-dev
- Provides: libneon-dev
- Replaces: libneon-dev
-diff -ur neon0.23-0.23.9.dfsg.3.old/debian/rules neon0.23-0.23.9.dfsg.3/debian/rules
---- neon0.23-0.23.9.dfsg.3.old/debian/rules 2005-05-05 14:09:49.000000000 +0200
-+++ neon0.23-0.23.9.dfsg.3/debian/rules 2005-05-05 19:10:32.000000000 +0200
-@@ -45,7 +45,8 @@
- -rm -rf Makefile src/Makefile test/Makefile config.h config.cache config.log config.status
- -rm -rf libtool neon-config src/.libs src/*.o
- dh_clean
--
-+ sed -e "s/@arch@/`type-handling i386,powerpc,s390,sparc any`/g" \
-+ < debian/control.in > debian/control
-
- install: install-stamp
- install-stamp: build-stamp
Deleted: trunk/web/patches/debian-only/php4.diff
===================================================================
--- trunk/web/patches/debian-only/php4.diff 2006-05-23 14:09:47 UTC (rev 1576)
+++ trunk/web/patches/debian-only/php4.diff 2006-05-24 13:21:48 UTC (rev 1577)
@@ -1,46 +0,0 @@
-
-Description: disable snmp
-Status: dirty
-
-diff -u php4-4.3.10/debian/control php4-4.3.10/debian/control
---- php4-4.3.10/debian/control
-+++ php4-4.3.10/debian/control
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Adam Conrad <adconrad at 0c3.net>
- Uploaders: Steve Langasek <vorlon at debian.org>, Andres Salomon <dilinger at debian.org>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
--Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, po-debconf, libbz2-dev (>= 1.0.0), libc-client-dev, libcurl3-dev, libdb4.2-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcal0-dev (>= 0.6), libmhash-dev (>= 0.8.8), libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, librecode-dev, libsablot0-dev (>= 0.96), libsnmp5-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), libzzip-dev, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
-+Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, po-debconf, libbz2-dev (>= 1.0.0), libc-client-dev, libcurl3-dev, libdb4.2-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcal0-dev (>= 0.6), libmhash-dev (>= 0.8.8), libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, librecode-dev, libsablot0-dev (>= 0.96), libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), libzzip-dev, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
- Build-Conflicts: bind-dev
- Standards-Version: 3.6.1
-
-@@ -196,18 +196,6 @@
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
-
--Package: php4-snmp
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php4-common (= ${Source-Version})
--Replaces: php4-cgi-snmp
--Description: SNMP module for php4
-- This package provides a module for SNMP functions in PHP scripts.
-- .
-- PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed
-- from C, Java and Perl with a couple of unique PHP-specific features thrown
-- in. The goal of the language is to allow web developers to write
-- dynamically generated pages quickly.
--
- Package: php4-sybase
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php4-common (= ${Source-Version})
-diff -u php4-4.3.10/debian/rules php4-4.3.10/debian/rules
---- php4-4.3.10/debian/rules
-+++ php4-4.3.10/debian/rules
-@@ -181,7 +181,6 @@
- --with-unixODBC=shared,/usr \
- --with-recode=shared,/usr \
- --enable-xslt=shared --with-xslt-sablot=shared,/usr \
-- --with-snmp=shared,/usr \
- --with-sybase-ct=shared,/usr \
- --with-ttf=shared,/usr --with-t1lib=shared,/usr
- cd apache-build && \
Deleted: trunk/web/patches/debian-only/squid.diff
===================================================================
--- trunk/web/patches/debian-only/squid.diff 2006-05-23 14:09:47 UTC (rev 1576)
+++ trunk/web/patches/debian-only/squid.diff 2006-05-24 13:21:48 UTC (rev 1577)
@@ -1,24 +0,0 @@
- in BTS #365211
- config.{guess,sub} update also needed
-
---- debian/rules 2006-04-28 16:28:55.000000000 +0200
-+++ debian/rules 2006-04-28 16:44:03.000000000 +0200
-@@ -53,11 +53,18 @@
- with_pthreads = --enable-storeio=ufs,diskd,null
- with_netfilter =
- with_arp_acl =
-+else
-+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-+ with_pthreads = --enable-async-io --with-pthreads \
-+ --enable-storeio=ufs,aufs,diskd,null
-+ with_netfilter =
-+ with_arp_acl =
- else
- with_pthreads = --enable-async-io --with-pthreads \
- --enable-storeio=ufs,aufs,diskd,null
- with_netfilter = --enable-linux-netfilter
- with_arp_acl = --enable-arp-acl
-+endif
- endif
-
- # setresuid is broken on sparc
Deleted: trunk/web/patches/dvi2ps.diff
===================================================================
--- trunk/web/patches/dvi2ps.diff 2006-05-23 14:09:47 UTC (rev 1576)
+++ trunk/web/patches/dvi2ps.diff 2006-05-24 13:21:48 UTC (rev 1577)
@@ -1,14 +0,0 @@
-Author: aurel32
-Status: in BTS
-
---- dvi2ps-3.2j.orig/defs.h
-+++ dvi2ps-3.2j/defs.h
-@@ -31,7 +31,7 @@
- #define SEEK_END 2
- #endif
-
--#ifdef linux
-+#if defined(linux) || defined(__GLIBC__)
- #include <time.h>
- #endif
-
Deleted: trunk/web/patches/smartmontools.diff
===================================================================
--- trunk/web/patches/smartmontools.diff 2006-05-23 14:09:47 UTC (rev 1576)
+++ trunk/web/patches/smartmontools.diff 2006-05-24 13:21:48 UTC (rev 1577)
@@ -1,40 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u smartmontools-5.33+5.34cvs20050802/debian/control smartmontools-5.33+5.34cvs20050802/debian/control
---- smartmontools-5.33+5.34cvs20050802/debian/control
-+++ smartmontools-5.33+5.34cvs20050802/debian/control
-@@ -2,7 +2,7 @@
- Section: utils
- Priority: optional
- Maintainer: Guido Guenther <agx at debian.org>
--Build-Depends: debhelper (>= 4)
-+Build-Depends: debhelper (>= 4), libcam-dev [kfreebsd-i386]
- Standards-Version: 3.6.1
-
- Package: smartmontools
-diff -u smartmontools-5.33+5.34cvs20050802/configure smartmontools-5.33+5.34cvs20050802/configure
---- smartmontools-5.33+5.34cvs20050802/configure
-+++ smartmontools-5.33+5.34cvs20050802/configure
-@@ -6443,7 +6443,7 @@
-
- os_libs=''
- ;;
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-kfreebsd*-gnu)
- os_deps='os_freebsd.o'
-
- os_libs='-lcam'
-only in patch2:
-unchanged:
---- smartmontools-5.33+5.34cvs20050802.orig/configure.in
-+++ smartmontools-5.33+5.34cvs20050802/configure.in
-@@ -129,7 +129,7 @@
- *-*-linux*)
- AC_SUBST([os_deps], ['os_linux.o'])
- AC_SUBST([os_libs], ['']) ;;
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-kfreebsd*-gnu)
- AC_SUBST([os_deps], ['os_freebsd.o'])
- AC_SUBST([os_libs], ['-lcam']);;
- sparc-*-solaris*)
More information about the Glibc-bsd-commits
mailing list