From: Artur Frysiak <artur@frysiak.net>
Date: Wed, 31 Jul 2002 09:06:04 +0000 (+0000)
Subject: updated to 0.5.4cnc4
X-Git-Tag: apt-0_3_19cnc52-11~6
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=41bf9c0f0820f4625750999b64ce0cb9e551ff34;p=packages%2Fapt.git

updated to 0.5.4cnc4

Changed files:
    apt-es_it.patch -> 1.2
    apt-norequires.patch -> 1.2
---

diff --git a/apt-es_it.patch b/apt-es_it.patch
index d02df6b..408e7e6 100644
--- a/apt-es_it.patch
+++ b/apt-es_it.patch
@@ -1,11 +1,11 @@
---- configure.in~	Sun May 19 23:27:54 2002
-+++ configure.in	Sun May 19 23:27:54 2002
-@@ -38,7 +38,7 @@
+--- apt-0.5.4cnc4/configure.in.wiget	Tue Jul 30 15:28:36 2002
++++ apt-0.5.4cnc4/configure.in	Tue Jul 30 15:29:10 2002
+@@ -39,7 +39,7 @@
  AC_CHECK_TOOL(AR,ar,"ar")
  
- 
--ALL_LINGUAS="pt_BR es_ES it_IT"
-+ALL_LINGUAS="pt_BR es it"
- 
- dnl Check for i18n stuff through gettext 
+ dnl CNC:2002-07-08
+-ALL_LINGUAS="pt_BR es_ES it_IT ru"
++ALL_LINGUAS="pt_BR es it ru"
  AM_GNU_GETTEXT
+ LOCALEDIR="/usr/share/locale"
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
diff --git a/apt-norequires.patch b/apt-norequires.patch
index 9a8e574..8b1f011 100644
--- a/apt-norequires.patch
+++ b/apt-norequires.patch
@@ -1,11 +1,14 @@
-diff -urN apt-0.3.19cnc38.org/apt-pkg/rpm/rpmlistparser.cc apt-0.3.19cnc38/apt-pkg/rpm/rpmlistparser.cc
---- apt-0.3.19cnc38.org/apt-pkg/rpm/rpmlistparser.cc	Thu Apr 19 00:38:38 2001
-+++ apt-0.3.19cnc38/apt-pkg/rpm/rpmlistparser.cc	Thu Apr 19 00:38:54 2001
-@@ -348,7 +348,6 @@
+--- apt-0.5.4cnc4/apt-pkg/rpm/rpmlistparser.cc.wiget	Tue Jul 30 15:17:27 2002
++++ apt-0.5.4cnc4/apt-pkg/rpm/rpmlistparser.cc	Tue Jul 30 15:18:46 2002
+@@ -285,10 +285,10 @@
  unsigned short rpmListParser::VersionHash()
  {
-    int Sections[] ={
--      RPMTAG_REQUIRENAME,
-       RPMTAG_OBSOLETENAME,
-       RPMTAG_CONFLICTNAME,
+    int Sections[] = {
++	  RPMTAG_EPOCH,
+ 	  RPMTAG_VERSION,
+ 	  RPMTAG_RELEASE,
+ 	  RPMTAG_ARCH,
+-	  RPMTAG_REQUIRENAME,
+ 	  RPMTAG_OBSOLETENAME,
+ 	  RPMTAG_CONFLICTNAME,
  	  0