head	1.6;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.6
	OPENPKG_E1_MP:1.6
	OPENPKG_E1_MP_2_STABLE:1.6.2.2
	OPENPKG_E1_FP:1.6.2.2
	OPENPKG_2_STABLE_MP:1.6
	OPENPKG_2_STABLE_20061018:1.6.2.2
	OPENPKG_2_STABLE:1.6.0.2
	OPENPKG_CW_FP:1.6;
locks; strict;
comment	@# @;


1.6
date	2004.11.02.18.57.27;	author ms;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2004.06.23.22.04.41;	author ms;	state Exp;
branches;
next	1.4;

1.4
date	2004.06.18.14.35.48;	author thl;	state Exp;
branches;
next	1.3;

1.3
date	2004.04.06.09.02.17;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2004.01.04.09.16.01;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.11.28.17.33.38;	author rse;	state Exp;
branches;
next	;

1.6.2.1
date	2004.11.02.18.57.27;	author rse;	state dead;
branches;
next	1.6.2.2;
commitid	iZxwRSmmWscPXUQr;

1.6.2.2
date	2006.10.16.14.56.59;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.6
log
@upgrading package: synaptic 0.53.3 -> 0.55
@
text
@Index: gtk/Makefile.in
--- gtk/Makefile.in.orig	2003-12-02 08:20:00.000000000 +0100
+++ gtk/Makefile.in	2004-01-04 10:03:44.000000000 +0100
@@@@ -190,7 +190,7 @@@@
 	${top_builddir}/common/libsynaptic.a\
 	-lapt-pkg @@RPM_LIBS@@ @@DEB_LIBS@@ \
 	@@PACKAGE_LIBS@@ @@ZVT_LIBS@@ @@VTE_LIBS@@ \
-	-lpthread $(LIBTAGCOLL_LIBS) 
+	$(LIBTAGCOLL_LIBS) 
 
 
 glade_DATA = \
Index: gtk/rgsummarywindow.cc
--- gtk/rgsummarywindow.cc.orig	2004-06-12 16:47:15 +0200
+++ gtk/rgsummarywindow.cc	2004-06-23 23:58:16 +0200
@@@@ -37,6 +37,8 @@@@
 
 #include "rgsummarywindow.h"
 #include "rguserdialog.h"
+#include "gsynaptic.h"
+#include "rgmisc.h"
 
 #include "i18n.h"
 
@


1.6.2.1
log
@file synaptic.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:59 +0000
@
text
@d1 24
@


1.6.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 24
Index: gtk/Makefile.in
--- gtk/Makefile.in.orig	2003-12-02 08:20:00.000000000 +0100
+++ gtk/Makefile.in	2004-01-04 10:03:44.000000000 +0100
@@@@ -190,7 +190,7 @@@@
 	${top_builddir}/common/libsynaptic.a\
 	-lapt-pkg @@RPM_LIBS@@ @@DEB_LIBS@@ \
 	@@PACKAGE_LIBS@@ @@ZVT_LIBS@@ @@VTE_LIBS@@ \
-	-lpthread $(LIBTAGCOLL_LIBS) 
+	$(LIBTAGCOLL_LIBS) 
 
 
 glade_DATA = \
Index: gtk/rgsummarywindow.cc
--- gtk/rgsummarywindow.cc.orig	2004-06-12 16:47:15 +0200
+++ gtk/rgsummarywindow.cc	2004-06-23 23:58:16 +0200
@@@@ -37,6 +37,8 @@@@
 
 #include "rgsummarywindow.h"
 #include "rguserdialog.h"
+#include "gsynaptic.h"
+#include "rgmisc.h"
 
 #include "i18n.h"
 
@


1.5
log
@upgrading package: synaptic 0.50 -> 0.51
@
text
@d4 1
a4 1
@@@@ -188,7 +188,7 @@@@
@


1.4
log
@upgrading package: synaptic 0.48.2 -> 0.50
@
text
@d4 1
a4 1
@@@@ -187,7 +187,7 @@@@
d14 3
a16 3
--- gtk/rgsummarywindow.cc.orig	2004-01-04 10:03:44.000000000 +0100
+++ gtk/rgsummarywindow.cc	2004-01-04 10:06:56.000000000 +0100
@@@@ -37,6 +37,7 @@@@
a20 10
 
 
 
Index: gtk/rgsummarywindow.cc
--- gtk/rgsummarywindow.cc.orig	2004-04-06 10:47:40.000000000 +0200
+++ gtk/rgsummarywindow.cc	2004-04-06 10:49:18.000000000 +0200
@@@@ -37,6 +37,7 @@@@
 #include "rgsummarywindow.h"
 #include "rguserdialog.h"
 #include "gsynaptic.h"
@


1.3
log
@upgrading package: synaptic 0.47 -> 0.48.1
@
text
@a23 12
Index: wings/Makefile.in
--- wings/Makefile.in.orig	2003-12-02 08:20:02.000000000 +0100
+++ wings/Makefile.in	2004-01-04 10:03:44.000000000 +0100
@@@@ -178,7 +178,7 @@@@
 wsynaptic_LDADD = -lExtraWINGs @@WINGS_LIBS@@ \
 	${top_builddir}/common/libsynaptic.a\
 	-lapt-pkg @@RPM_LIBS@@ @@DEB_LIBS@@\
-	-lpthread -L/usr/X11R6/lib $(LIBTAGCOLL_LIBS)
+	-L/usr/X11R6/lib $(LIBTAGCOLL_LIBS)
 
 
 wsynaptic_SOURCES = \
a34 12
Index: Makefile.in
--- Makefile.in.orig	2004-03-12 08:55:02.000000000 +0100
+++ Makefile.in	2004-04-06 10:59:53.000000000 +0200
@@@@ -175,7 +175,7 @@@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
 
-SUBDIRS = data common @@BUILD_wings@@ @@BUILD_gtk@@ man pixmaps po help doc
+SUBDIRS = data common @@BUILD_wings@@ @@BUILD_gtk@@ man pixmaps po doc
 
 EXTRA_DIST = config.h.in synaptic.spec README.debtags FAQ intltool-extract.in intltool-merge.in intltool-update.in
 subdir = .
@


1.2
log
@upgrading package: synaptic 0.46 -> 0.47
@
text
@d36 23
@


1.1
log
@new package: synaptic 0.46 (Graphical User Interface for APT/RPM)
@
text
@d2 3
a4 3
--- gtk/Makefile.in.orig	2003-11-16 14:28:09.000000000 +0100
+++ gtk/Makefile.in	2003-11-28 15:11:00.000000000 +0100
@@@@ -165,7 +165,7 @@@@
d7 1
a7 1
 	@@PACKAGE_LIBS@@ @@ZVT_LIBS@@ \
d13 11
d25 3
a27 3
--- wings/Makefile.in.orig	2003-11-16 14:28:11.000000000 +0100
+++ wings/Makefile.in	2003-11-28 15:11:20.000000000 +0100
@@@@ -156,7 +156,7 @@@@
@