debian/0000755000000000000000000000000012146133731007167 5ustar debian/gnustep-dl2-sqlite-adaptor.dirs0000644000000000000000000000001712146133731015143 0ustar usr/lib/GNUstepdebian/gnustep-dl2-postgresql-adaptor.install0000644000000000000000000000007012146133731016551 0ustar usr/lib/GNUstep/Frameworks/PostgreSQLEOAdaptor.frameworkdebian/compat0000644000000000000000000000000212146133731010365 0ustar 7 debian/patches/0000755000000000000000000000000012146133731010616 5ustar debian/patches/618181.patch0000644000000000000000000007142212146133731012415 0ustar 2011-03-22 Federico Gimenez Nieto * Removed references to the now missing GNUstepBase/GSCategories.h Index: gnustep-dl2-0.12.0/EOControl/EOAndQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOAndQualifier.m 2011-03-18 19:01:56.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOAndQualifier.m 2011-03-18 19:02:29.000000000 +0100 @@ -50,7 +50,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOObserver.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOObserver.m 2011-03-18 19:03:41.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOObserver.m 2011-03-18 19:03:53.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOCheapArray.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOCheapArray.m 2011-03-18 19:25:21.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOCheapArray.m 2011-03-18 19:25:32.000000000 +0100 @@ -48,7 +48,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOEditingContext.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOEditingContext.m 2011-03-18 19:39:12.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOEditingContext.m 2011-03-18 19:39:21.000000000 +0100 @@ -37,7 +37,6 @@ //TODO EOMultiReaderLocks #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOFault.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOFault.m 2011-03-18 19:24:51.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOFault.m 2011-03-18 19:25:01.000000000 +0100 @@ -56,7 +56,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOFaultHandler.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOFaultHandler.m 2011-03-18 19:40:51.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOFaultHandler.m 2011-03-18 19:41:01.000000000 +0100 @@ -50,7 +50,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOKeyGlobalID.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyGlobalID.m 2011-03-18 19:40:06.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOKeyGlobalID.m 2011-03-18 19:40:15.000000000 +0100 @@ -47,7 +47,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOKeyValueCoding.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueCoding.m 2011-03-18 19:41:15.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueCoding.m 2011-03-18 19:41:25.000000000 +0100 @@ -61,7 +61,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOKeyValueQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueQualifier.m 2011-03-18 19:39:34.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueQualifier.m 2011-03-18 19:39:42.000000000 +0100 @@ -51,7 +51,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EONSAddOns.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EONSAddOns.m 2011-03-18 19:40:24.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EONSAddOns.m 2011-03-18 19:40:34.000000000 +0100 @@ -51,7 +51,6 @@ #ifndef GNUSTEP #include -#include #include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOObjectStore.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOObjectStore.m 2011-03-18 19:24:28.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOObjectStore.m 2011-03-18 19:24:38.000000000 +0100 @@ -43,7 +43,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOOrQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOOrQualifier.m 2011-03-18 19:38:44.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOOrQualifier.m 2011-03-18 19:38:54.000000000 +0100 @@ -48,7 +48,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOPrivate.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOPrivate.m 2011-03-18 19:38:25.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOPrivate.m 2011-03-18 19:38:35.000000000 +0100 @@ -42,7 +42,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOQualifier.m 2011-03-18 19:23:51.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOQualifier.m 2011-03-18 19:24:05.000000000 +0100 @@ -54,7 +54,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOClassDescription.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOClassDescription.m 2011-03-18 19:53:15.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOClassDescription.m 2011-03-18 19:53:23.000000000 +0100 @@ -57,7 +57,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EODataSource.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EODataSource.m 2011-03-18 19:52:55.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EODataSource.m 2011-03-18 19:53:04.000000000 +0100 @@ -38,7 +38,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EODebug.h =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EODebug.h 2011-03-18 19:49:30.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EODebug.h 2011-03-18 19:49:44.000000000 +0100 @@ -40,7 +40,6 @@ #endif #ifndef GNUSTEP -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EODebug.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EODebug.m 2011-03-18 19:49:49.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EODebug.m 2011-03-18 19:49:58.000000000 +0100 @@ -45,7 +45,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOEvent.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOEvent.m 2011-03-18 19:50:15.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOEvent.m 2011-03-18 19:52:41.000000000 +0100 @@ -32,7 +32,6 @@ #ifndef GNUSTEP #include -#include #include #else #include Index: gnustep-dl2-0.12.0/EOControl/EOFetchSpecification.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOFetchSpecification.m 2011-03-18 19:45:18.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOFetchSpecification.m 2011-03-18 19:46:26.000000000 +0100 @@ -46,7 +46,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOGenericRecord.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOGenericRecord.m 2011-03-18 19:53:39.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOGenericRecord.m 2011-03-18 19:53:47.000000000 +0100 @@ -53,7 +53,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOKeyValueArchiver.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueArchiver.m 2011-03-18 19:53:56.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueArchiver.m 2011-03-18 19:54:05.000000000 +0100 @@ -76,7 +76,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOMultiReaderLock.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOMultiReaderLock.m 2011-03-18 19:54:42.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOMultiReaderLock.m 2011-03-18 19:54:54.000000000 +0100 @@ -28,7 +28,6 @@ #ifndef GNUSTEP #include -#include #include #else #include Index: gnustep-dl2-0.12.0/EOControl/EOMutableKnownKeyDictionary.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOMutableKnownKeyDictionary.m 2011-03-18 19:54:22.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOMutableKnownKeyDictionary.m 2011-03-18 19:54:31.000000000 +0100 @@ -50,7 +50,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOObjectStoreCoordinator.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOObjectStoreCoordinator.m 2011-03-18 19:46:45.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOObjectStoreCoordinator.m 2011-03-18 19:46:56.000000000 +0100 @@ -48,7 +48,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOControl/EOSharedEditingContext.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOSharedEditingContext.m 2011-03-18 19:48:26.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOSharedEditingContext.m 2011-03-18 19:48:41.000000000 +0100 @@ -30,7 +30,6 @@ #ifndef GNUSTEP #include -#include #include #else #include Index: gnustep-dl2-0.12.0/EOControl/EOUndoManager.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOUndoManager.m 2011-03-18 19:49:01.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOUndoManager.m 2011-03-18 19:49:16.000000000 +0100 @@ -37,7 +37,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOAdaptor.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAdaptor.m 2011-03-19 12:11:12.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOAdaptor.m 2011-03-19 12:11:19.000000000 +0100 @@ -65,7 +65,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOAdaptorChannel.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAdaptorChannel.m 2011-03-19 11:59:47.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOAdaptorChannel.m 2011-03-19 11:59:56.000000000 +0100 @@ -50,7 +50,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOAdaptorContext.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAdaptorContext.m 2011-03-19 12:12:24.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOAdaptorContext.m 2011-03-19 12:12:39.000000000 +0100 @@ -47,7 +47,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOAdaptorOperation.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAdaptorOperation.m 2011-03-19 12:12:10.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOAdaptorOperation.m 2011-03-19 12:12:17.000000000 +0100 @@ -45,7 +45,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOAttribute.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAttribute.m 2011-03-19 11:59:24.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOAttribute.m 2011-03-19 11:59:32.000000000 +0100 @@ -60,7 +60,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EODatabaseContext.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EODatabaseContext.m 2011-03-19 11:58:58.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EODatabaseContext.m 2011-03-19 11:59:09.000000000 +0100 @@ -56,7 +56,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EODatabaseDataSource.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EODatabaseDataSource.m 2011-03-19 12:00:12.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EODatabaseDataSource.m 2011-03-19 12:00:26.000000000 +0100 @@ -55,7 +55,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOExpressionArray.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOExpressionArray.m 2011-03-19 12:11:32.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOExpressionArray.m 2011-03-19 12:11:40.000000000 +0100 @@ -54,7 +54,6 @@ #ifndef GNUSTEP #include -#include #include #endif Index: gnustep-dl2-0.12.0/EOAccess/EOJoin.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOJoin.m 2011-03-19 12:10:53.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOJoin.m 2011-03-19 12:11:02.000000000 +0100 @@ -45,7 +45,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EORelationship.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EORelationship.m 2011-03-19 12:11:47.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EORelationship.m 2011-03-19 12:11:55.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOSQLQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOSQLQualifier.m 2011-03-19 12:00:39.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOSQLQualifier.m 2011-03-19 12:00:49.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOAccessFault.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAccessFault.m 2011-03-19 12:58:36.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOAccessFault.m 2011-03-19 12:58:44.000000000 +0100 @@ -47,7 +47,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOModelGroup.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOModelGroup.m 2011-03-19 12:58:01.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOModelGroup.m 2011-03-19 12:58:13.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOPrivate.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOPrivate.m 2011-03-19 12:58:20.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOPrivate.m 2011-03-19 12:58:27.000000000 +0100 @@ -38,7 +38,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOSQLExpression.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOSQLExpression.m 2011-03-19 12:59:19.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOSQLExpression.m 2011-03-19 12:59:26.000000000 +0100 @@ -56,7 +56,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOSchemaGeneration.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOSchemaGeneration.m 2011-03-19 12:59:02.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOSchemaGeneration.m 2011-03-19 12:59:09.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EODatabaseChannel.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EODatabaseChannel.m 2011-03-21 17:56:46.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EODatabaseChannel.m 2011-03-21 17:56:55.000000000 +0100 @@ -53,7 +53,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EODatabaseOperation.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EODatabaseOperation.m 2011-03-21 17:56:00.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EODatabaseOperation.m 2011-03-21 17:56:13.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOEntity.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOEntity.m 2011-03-21 17:56:27.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOEntity.m 2011-03-21 17:56:36.000000000 +0100 @@ -62,7 +62,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOGenericRecord.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOGenericRecord.m 2011-03-21 17:57:26.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOGenericRecord.m 2011-03-21 17:57:40.000000000 +0100 @@ -31,7 +31,6 @@ #ifndef GNUSTEP #include #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOModel.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOModel.m 2011-03-21 17:57:04.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOModel.m 2011-03-21 17:57:13.000000000 +0100 @@ -52,7 +52,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAccess/EOUtilities.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOUtilities.m 2011-03-21 17:57:48.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAccess/EOUtilities.m 2011-03-21 17:57:55.000000000 +0100 @@ -49,7 +49,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOModeler/EOModelExtensions.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOModeler/EOModelExtensions.m 2011-03-21 17:58:13.000000000 +0100 +++ gnustep-dl2-0.12.0/EOModeler/EOModelExtensions.m 2011-03-21 17:58:21.000000000 +0100 @@ -28,7 +28,6 @@ #ifndef GNUSTEP #include -#include #endif #ifdef NeXT_Foundation_LIBRARY Index: gnustep-dl2-0.12.0/EOModeler/EOModelerEditor.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOModeler/EOModelerEditor.m 2011-03-21 17:58:36.000000000 +0100 +++ gnustep-dl2-0.12.0/EOModeler/EOModelerEditor.m 2011-03-21 17:58:48.000000000 +0100 @@ -49,7 +49,6 @@ #endif #include -#include @implementation EOModelerEditor - (void) dealloc Index: gnustep-dl2-0.12.0/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m 2011-03-21 19:24:57.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m 2011-03-21 19:25:07.000000000 +0100 @@ -30,7 +30,6 @@ #ifndef GNUSTEP #include -#include #endif static BOOL insideModalLoop = YES; Index: gnustep-dl2-0.12.0/EOAdaptors/SQLiteAdaptor/SQLite3Expression.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/SQLiteAdaptor/SQLite3Expression.m 2011-03-21 19:31:17.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/SQLiteAdaptor/SQLite3Expression.m 2011-03-21 19:31:28.000000000 +0100 @@ -27,7 +27,6 @@ #ifndef GNUSTEP #include -#include #endif #include "SQLite3Expression.h" #include Index: gnustep-dl2-0.12.0/Tools/gsdoc-model.m =================================================================== --- gnustep-dl2-0.12.0.orig/Tools/gsdoc-model.m 2011-03-21 19:24:26.000000000 +0100 +++ gnustep-dl2-0.12.0/Tools/gsdoc-model.m 2011-03-21 19:24:35.000000000 +0100 @@ -52,7 +52,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/DBModeler/Inspectors/AttributeInspector.m =================================================================== --- gnustep-dl2-0.12.0.orig/DBModeler/Inspectors/AttributeInspector.m 2011-03-22 12:00:10.000000000 +0100 +++ gnustep-dl2-0.12.0/DBModeler/Inspectors/AttributeInspector.m 2011-03-22 12:00:19.000000000 +0100 @@ -30,7 +30,6 @@ #endif #include -#include #define NO_ZEROS(x, i) i ? [x setIntValue:i] : [x setStringValue:@""]; Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m 2011-03-22 11:59:11.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m 2011-03-22 11:59:21.000000000 +0100 @@ -30,7 +30,6 @@ #import #import #include -#include #else #include #include Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m 2011-03-22 11:57:34.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m 2011-03-22 11:57:41.000000000 +0100 @@ -58,7 +58,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m 2011-03-22 11:59:35.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.m 2011-03-22 11:59:50.000000000 +0100 @@ -56,12 +56,10 @@ #include #else #include -#include #endif #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m 2011-03-22 11:57:16.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLContext.m 2011-03-22 11:57:24.000000000 +0100 @@ -53,7 +53,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m 2011-03-22 11:58:03.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m 2011-03-22 11:58:16.000000000 +0100 @@ -50,7 +50,6 @@ #ifndef GNUSTEP #include -#include #endif #include Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLPrivate.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/PostgreSQLPrivate.m 2011-03-22 11:58:28.000000000 +0100 +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/PostgreSQLPrivate.m 2011-03-22 11:58:35.000000000 +0100 @@ -38,7 +38,6 @@ #ifndef GNUSTEP #include -#include #endif #include debian/patches/format-security.patch0000644000000000000000000000063612146133731015001 0ustar Description: Fix FTBFS with -Werror=format-security. Author: Ilya Barygin --- gnustep-dl2-0.12.0.orig/EOControl/EODebug.m +++ gnustep-dl2-0.12.0/EOControl/EODebug.m @@ -71,7 +71,7 @@ EOFLogC_(const char *file, int line, con } fprintf(stderr, "File %s: %d. ", file, line); - fprintf(stderr, string); + fprintf(stderr, "%s", string); len = strlen(string); debian/patches/629204.patch0000644000000000000000000004425312146133731012415 0ustar Author: Federico Gimenez Nieto Description: Modified function calls for Modern GNU Objective-C runtime API following changes of source at http://svn.gna.org/viewcvs/gnustep/libs/gdl2/trunk/ Bug-Debian: http://bugs.debian.org/629204 Last-Update: 2011-08-25 Reviewed-by: Index: gnustep-dl2-0.12.0/EOControl/EOFaultHandler.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOFaultHandler.m 2011-08-22 11:51:35.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOFaultHandler.m 2011-08-22 12:52:50.000000000 +0200 @@ -123,7 +123,7 @@ { Class class; - for (class = _targetClass; class != Nil; class = class_get_super_class(class)) + for (class = _targetClass; class != Nil; class = class_getSuperclass(class)) { if (class == aclass) return YES; @@ -141,11 +141,15 @@ - (BOOL)conformsToProtocol: (Protocol *)protocol forFault: (id)fault { + + return class_conformsToProtocol(_targetClass, protocol); + + /* int i; struct objc_protocol_list *proto_list; Class class; - for(class = _targetClass; class != Nil; class = class_get_super_class(class)) + for(class = _targetClass; class != Nil; class = class_getSuperclass(class)) { for (proto_list = ((struct objc_class *)_targetClass)->class_pointer->protocols; @@ -160,6 +164,7 @@ } return NO; + */ } - (BOOL)respondsToSelector: (SEL)sel Index: gnustep-dl2-0.12.0/EOControl/EOFault.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOFault.m 2011-08-22 12:59:10.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOFault.m 2011-08-23 08:27:31.000000000 +0200 @@ -77,22 +77,8 @@ + (void)initialize { - // Must be here as initialize is called for each root class - // without asking if it responds to it ! if (EOFaultClass == NULL) { - GSMethod nsfwd = GSGetMethod([NSObject class], - @selector(forward::), - YES,NO); - if (nsfwd != NULL) - { - GSMethod eofwd = GSGetMethod(self, - @selector(forward::), - YES,NO); - eofwd->method_imp = nsfwd->method_imp; - GSFlushMethodCacheForClass(self); - } - EOFaultClass = [EOFault class]; } } @@ -171,7 +157,7 @@ /* * Since 'self' is an class, get_imp() will get the instance method. */ - return get_imp((Class)self, selector); + return class_getMethodImplementation((Class)self, selector); } // Fault class methods @@ -311,43 +297,12 @@ - (BOOL)conformsToProtocol: (Protocol *)protocol { - int i; - struct objc_protocol_list* protos; - Class class, sClass; - - class = [_handler targetClass]; - - for (protos = class->protocols; protos; protos = protos->next) - { - for (i = 0; i < protos->count; i++) - if ([protos->list[i] conformsTo: protocol]) - return YES; - } - - sClass = [class superclass]; - - if (sClass) - return [sClass conformsToProtocol: protocol]; - else - return NO; + return class_conformsToProtocol([_handler targetClass], protocol); } - (BOOL)respondsToSelector: (SEL)selector { - Class class; - BOOL respondsToSelector; - - NSDebugFLLog(@"gsdb", @"START self=%p", self); - - class = [_handler targetClass]; - NSDebugFLLog(@"gsdb", @"class=%@ selector=%@", class, - NSStringFromSelector(selector)); - - respondsToSelector - = (GSGetMethod(class, selector, YES, YES) != (GSMethod)0); - NSDebugFLLog(@"gsdb", @"STOP self=%p", self); - - return respondsToSelector; + return class_respondsToSelector([_handler targetClass], selector); } - (NSMethodSignature *)methodSignatureForSelector: (SEL)selector Index: gnustep-dl2-0.12.0/EOControl/EODebug.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EODebug.m 2011-08-23 08:36:52.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EODebug.m 2011-08-23 10:58:09.000000000 +0200 @@ -127,14 +127,14 @@ { Class *pvalue = (Class*)_value; return [NSString stringWithFormat: @"Class:%s", - class_get_class_name(*pvalue)]; + class_getName(*pvalue)]; } break; case _C_SEL: { SEL *pvalue = (SEL*)_value; return [NSString stringWithFormat: @"SEL:%s", - sel_get_name(*pvalue)]; + sel_getName(*pvalue)]; } break; case _C_CHR: @@ -322,19 +322,20 @@ { if (ivar && object && deep >= 0) { - void *pValue = ((void*)object) + ivar->ivar_offset; - NSString *pType = TypeToNSString(ivar->ivar_type); - NSString *pIVar = IVarInString(ivar->ivar_type,pValue); - + void *pValue = ((void*)object) + ivar_getOffset(ivar); + char *type = ivar_getTypeEncoding(ivar); + NSString *pType = TypeToNSString(type); + NSString *pIVar = IVarInString(type, pValue); + NSDebugFLog(@"IVar %s type:%@ value:%@\n", - ivar->ivar_name, - pType, - pIVar); - - if (deep > 0 && ivar->ivar_type && *ivar->ivar_type == _C_ID && pValue) - { - EOFLogDumpObject_(NULL, 0, *((id*)pValue), deep); - } + ivar_getName(ivar), + pType, + pIVar); + + if (deep > 0 && type && *type == _C_ID && pValue) + { + EOFLogDumpObject_(NULL, 0, *((id*)pValue), deep); + } } } @@ -346,7 +347,6 @@ if (object && deep > 0) { - struct objc_ivar_list *ivars = NULL; Class class = [object class]; if (class) @@ -357,22 +357,25 @@ line, deep, (void*)object, - class->name, + class_getName(class), objectDescription(object)); while (class) { - ivars = class->ivars; - class = class->super_class; + unsigned int ivarCount; + Ivar *ivars = class_copyIvarList(class, &ivarCount); + + class = class_getSuperclass(class); if (ivars) { int i; - for (i = 0; i < ivars->ivar_count; i++) + for (i = 0; i < ivarCount; i++) { - DumpIVar(object,&ivars->ivar_list[i],deep-1); + DumpIVar(object, ivars[i], deep-1); } } + free(ivars); } } } Index: gnustep-dl2-0.12.0/EOControl/EOGenericRecord.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOGenericRecord.m 2011-08-23 10:58:50.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOGenericRecord.m 2011-08-23 12:19:24.000000000 +0200 @@ -1111,7 +1111,7 @@ } return [NSString stringWithFormat: @"<%s %p : classDescription=%@\nvalues=%@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, classDescription, dict]; @@ -1201,7 +1201,7 @@ } return [NSString stringWithFormat: @"<%s %p : classDescription=%@\nvalues=%@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, classDescription, dict]; Index: gnustep-dl2-0.12.0/EOControl/EOAndQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOAndQualifier.m 2011-08-23 11:51:21.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOAndQualifier.m 2011-08-23 11:52:10.000000000 +0200 @@ -247,7 +247,7 @@ NSString *dscr; dscr = [NSString stringWithFormat: @"<%s %p - qualifiers: %@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, _qualifiers]; Index: gnustep-dl2-0.12.0/EOControl/EODetailDataSource.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EODetailDataSource.m 2011-08-23 11:54:10.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EODetailDataSource.m 2011-08-23 11:55:25.000000000 +0200 @@ -302,7 +302,7 @@ - (NSString*) description { return [NSString stringWithFormat: @"<%s %p : masterDataSource=%@ masterObject=%@ detailKey=%@ masterClassDescriptionName=%@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, _masterDataSource, _masterObject, Index: gnustep-dl2-0.12.0/EOControl/EOKeyComparisonQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyComparisonQualifier.m 2011-08-23 11:37:23.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOKeyComparisonQualifier.m 2011-08-23 11:37:48.000000000 +0200 @@ -259,7 +259,7 @@ selectorString = NSStringFromSelector(_selector); } return [NSString stringWithFormat:@"<%s %p - %@ %@ %@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, _leftKey, selectorString, Index: gnustep-dl2-0.12.0/EOControl/EOKeyGlobalID.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyGlobalID.m 2011-08-23 11:53:28.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOKeyGlobalID.m 2011-08-23 11:53:44.000000000 +0200 @@ -199,7 +199,7 @@ int i; dscr = [NSString stringWithFormat: @"<%s %p - Entity %@ - keysValues:", - object_get_class_name(self), + object_getClassName(self), (void*)self, _entityName]; Index: gnustep-dl2-0.12.0/EOControl/EOKeyValueQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueQualifier.m 2011-08-23 11:36:25.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueQualifier.m 2011-08-23 11:37:02.000000000 +0200 @@ -333,7 +333,7 @@ selectorString = NSStringFromSelector(_selector); } return [NSString stringWithFormat:@"<%s %p - %@ %@ (%@)'%@'>", - object_get_class_name(self), + object_getClassName(self), (void*)self, _key, selectorString, Index: gnustep-dl2-0.12.0/EOControl/EOMutableKnownKeyDictionary.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOMutableKnownKeyDictionary.m 2011-08-23 11:57:40.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOMutableKnownKeyDictionary.m 2011-08-23 12:30:48.000000000 +0200 @@ -177,7 +177,7 @@ int i; dscr = [NSString stringWithFormat: @"<%s %p - keys=", - object_get_class_name(self), + object_getClassName(self), (void*)self]; for (i = 0; i < _count; i++) @@ -421,7 +421,7 @@ NSString *dscr; dscr = [NSString stringWithFormat: @"<%s %p - target=%p>", - object_get_class_name(self), + object_getClassName(self), (void*)self, _target]; return dscr; @@ -489,7 +489,7 @@ int count = [_destinationDescription count]; dscr = [NSString stringWithFormat: @"<%s %p - ", - object_get_class_name(self), + object_getClassName(self), (void*)self]; dscr = [dscr stringByAppendingFormat: @"\nsourceDescription=%@", [_sourceDescription description]]; @@ -540,7 +540,7 @@ NSString *dscr; dscr = [NSString stringWithFormat: @"<%s %p >", - object_get_class_name(self), + object_getClassName(self), (void*)self]; return dscr; } @@ -964,7 +964,7 @@ id *keys; dscr = [NSString stringWithFormat: @"<%s %p - KV=", - object_get_class_name(self), + object_getClassName(self), (void*)self]; count = [_MKKDInitializer count]; Index: gnustep-dl2-0.12.0/EOControl/EOOrQualifier.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOOrQualifier.m 2011-08-23 11:52:41.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EOOrQualifier.m 2011-08-23 11:53:03.000000000 +0200 @@ -233,7 +233,7 @@ NSString *dscr; dscr = [NSString stringWithFormat: @"<%s %p - qualifiers: %@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, _qualifiers]; return dscr; Index: gnustep-dl2-0.12.0/EOControl/EONSAddOns.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EONSAddOns.m 2011-08-23 12:15:49.000000000 +0200 +++ gnustep-dl2-0.12.0/EOControl/EONSAddOns.m 2011-08-23 12:18:12.000000000 +0200 @@ -186,7 +186,7 @@ @"%@: No result for object %@ resultOfPerformingSelector:\"%s\" withEachObjectInArray:", self, object, - sel_get_name(sel)); + sel_getName(sel)); [results addObject: result]; } @@ -249,7 +249,7 @@ @"%@: No result for object %@ resultOfPerformingSelector:\"%s\"", self, object, - sel_get_name(sel)); + sel_getName(sel)); [results addObject: result]; //TODO What to do if nil ?? } @@ -307,7 +307,7 @@ @"%@: No result for object %@ resultOfPerformingSelector:\"%s\"", self, object, - sel_get_name(sel)); + sel_getName(sel)); [results addObject: result]; //TODO What to do if nil ?? } @@ -366,7 +366,7 @@ @"%@: No result for object %@ resultOfPerformingSelector:\"%s\"", self, object, - sel_get_name(sel)); + sel_getName(sel)); [results addObject: result]; //TODO What to do if nil ?? } @@ -672,11 +672,11 @@ [NSException raise: NSInvalidArgumentException format: @"%@ null selector given", NSStringFromSelector(_cmd)]; - msg = get_imp(GSObjCClass(self), selector); + msg = class_getMethodImplementation(GSObjCClass(self), selector); if (!msg) { [NSException raise: NSGenericException - format: @"invalid selector passed to %s", sel_get_name(_cmd)]; + format: @"invalid selector passed to %s", sel_getName(_cmd)]; return nil; } Index: gnustep-dl2-0.12.0/EOAccess/EOAdaptorOperation.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAdaptorOperation.m 2011-08-25 09:53:34.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EOAdaptorOperation.m 2011-08-25 09:53:50.000000000 +0200 @@ -207,7 +207,7 @@ } desc = [NSString stringWithFormat: @"<%s %p : operator: %@ entity: %@ qualifier:%@\nchangedValues: %@\nattributes:%@\nstoredProcedure: %@\nexception: %@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, operatorString, [_entity name], Index: gnustep-dl2-0.12.0/EOAccess/EOAttribute.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOAttribute.m 2011-08-25 09:52:03.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EOAttribute.m 2011-08-25 09:52:20.000000000 +0200 @@ -383,7 +383,7 @@ - (NSString *)description { NSString *dscr = [NSString stringWithFormat: @"<%s %p - name=%@ entity=%@ columnName=%@ definition=%@ ", - object_get_class_name(self), + object_getClassName(self), (void*)self, [self name], [[self entity] name], Index: gnustep-dl2-0.12.0/EOAccess/EODatabaseDataSource.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EODatabaseDataSource.m 2011-08-25 09:54:26.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EODatabaseDataSource.m 2011-08-25 09:54:41.000000000 +0200 @@ -181,7 +181,7 @@ { return [NSString stringWithFormat: @"<%s %p : entity name=%@ editingContext=%p fetchSpecification=%@>", - object_get_class_name(self), + object_getClassName(self), (void *)self, [[self entity]name], _editingContext, Index: gnustep-dl2-0.12.0/EOAccess/EODatabaseOperation.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EODatabaseOperation.m 2011-08-25 09:54:01.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EODatabaseOperation.m 2011-08-25 09:54:18.000000000 +0200 @@ -349,7 +349,7 @@ } desc = [NSString stringWithFormat: @"<%s %p : operator: %@ entity: %@ globalID:%@\nnewRow %p: %@\nobject %p: %@\ndbSnapshot %p: %@>", - object_get_class_name(self), + object_getClassName(self), (void*)self, operatorString, [_entity name], Index: gnustep-dl2-0.12.0/EOAccess/EOEntity.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOEntity.m 2011-08-25 09:51:17.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EOEntity.m 2011-08-25 09:51:47.000000000 +0200 @@ -624,7 +624,7 @@ NSString *dscr = nil; dscr = [NSString stringWithFormat: @"<%s %p - name=%@ className=%@ externalName=%@ externalQuery=%@", - object_get_class_name(self), + object_getClassName(self), (void*)self, _name, _className, @@ -3980,7 +3980,7 @@ - (NSString *) description { return [NSString stringWithFormat: @"<%s %p - Entity: %@>", - object_get_class_name(self), + object_getClassName(self), self, [self entityName]]; } Index: gnustep-dl2-0.12.0/EOAccess/EOJoin.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EOJoin.m 2011-08-25 09:53:03.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EOJoin.m 2011-08-25 09:53:18.000000000 +0200 @@ -136,7 +136,7 @@ */ dscr = [NSString stringWithFormat: @"<%s %p -", - object_get_class_name(self), + object_getClassName(self), (void*)self]; dscr = [dscr stringByAppendingFormat: @" sourceAttribute=%@", [_sourceAttribute name]]; Index: gnustep-dl2-0.12.0/EOAccess/EORelationship.m =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/EORelationship.m 2011-08-25 09:52:28.000000000 +0200 +++ gnustep-dl2-0.12.0/EOAccess/EORelationship.m 2011-08-25 09:52:46.000000000 +0200 @@ -489,7 +489,7 @@ NS_DURING //Just for debugging { dscr = [NSString stringWithFormat: @"<%s %p - name=%@ entity=%@ destinationEntity=%@ definition=%@", - object_get_class_name(self), + object_getClassName(self), (void*)self, [self name], [[self entity]name], debian/patches/fix_documentation_generation.diff0000644000000000000000000000142012146133731017377 0ustar 2010-05-27 Federico Gimenez Nieto * GNUmakefile.in: modifications to build the Documentation subproject with the new (gnustep-make 2.4.0) way subprojects are built (thanks Yavor Doganov) Index: gnustep-dl2-0.12.0/GNUmakefile.in =================================================================== --- gnustep-dl2-0.12.0.orig/GNUmakefile.in 2010-05-27 18:26:35.000000000 +0200 +++ gnustep-dl2-0.12.0/GNUmakefile.in 2010-05-27 18:28:01.000000000 +0200 @@ -54,12 +54,13 @@ -include Makefile.preamble -include $(GNUSTEP_MAKEFILES)/aggregate.make ifeq ($(doc),yes) SUBPROJECTS += Documentation include $(GNUSTEP_MAKEFILES)/documentation.make endif +include $(GNUSTEP_MAKEFILES)/aggregate.make + -include Makefile.postamble debian/patches/series0000644000000000000000000000030212146133731012026 0ustar fix_missing_include_for_NSArray.diff avoid_unresolved_symbols.diff add_direntry.diff fix_documentation_generation.diff 581934.patch 618181.patch 629204.patch format-security.patch gcc-4.7.patch debian/patches/581934.patch0000644000000000000000000001531012146133731012414 0ustar 2010-08-11 Yavor Doganov * EOControl/GNUmakefile (EOControl_INTERFACE_VERSION): Define as Debian-specific due to the ABI break. 2010-04-09 Fred Kiefer * EOInterface/EOPopUpAssociation.m: * DBModeler/ModelerEntityEditor.m: * DBModeler/ModelerTableEmbedibleEditor.m: Add missing includes. 2010-04-07 David Ayers * EOInterface/EOPopUpAssociation.m: Add missing include. Reported by: German Arias. 2010-03-15 Richard Frith-Macdonald * EOControl/EONSAddOns.h: * EOControl/EONSAddOns.m: * EOControl/EOKeyValueCoding.m: * EOControl/EOClassDescription.m: Rewrite mechanism to try to ensure that our implementations are used for KVC. New version should work with the objc runtime API. --- gnustep-dl2-0.12.0.orig/EOControl/EOClassDescription.m +++ gnustep-dl2-0.12.0/EOControl/EOClassDescription.m @@ -739,17 +739,13 @@ @end - -@implementation NSObject (EOClassDescriptionPrimitives) - -- (void)GDL2CDNSObjectICategoryID -{ -} +@interface GDL2CDNSObject : NSObject +@end +@implementation GDL2CDNSObject + (void)load { - GDL2_ActivateCategory("NSObject", - @selector(GDL2CDNSObjectICategoryID), YES); + GDL2_Activate([self class], YES); } // when you enable the NSDebugMLLogs here you will have a loop. dave --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueCoding.m +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueCoding.m @@ -92,16 +92,13 @@ #define INITIALIZE if (!initialized) initialize(); -@implementation NSObject (_EOKeyValueCodingCompatibility) - -- (void)GDL2KVCNSObjectICategoryID -{ -} +@interface GDL2KVCNSObject : NSObject +@end +@implementation GDL2KVCNSObject + (void)load { - GDL2_ActivateCategory("NSObject", - @selector(GDL2KVCNSObjectICategoryID), YES); + GDL2_Activate([self class], YES); } @@ -235,16 +232,13 @@ @end -@implementation NSArray (EOKeyValueCoding) - -- (void)GDL2KVCNSArrayICategoryID -{ -} +@interface GDL2KVCNSArray : NSArray +@end +@implementation GDL2KVCNSArray + (void)load { - GDL2_ActivateCategory("NSArray", - @selector(GDL2KVCNSArrayICategoryID), YES); + GDL2_Activate([self class], YES); } /** @@ -543,16 +537,14 @@ @end -@implementation NSDictionary (EOKeyValueCoding) +@interface GDL2KVCNSDictionary : NSDictionary +@end +@implementation GDL2KVCNSDictionary -- (void)GDL2KVCNSDictionaryICategoryID -{ -} + (void)load { - GDL2_ActivateCategory("NSDictionary", - @selector(GDL2KVCNSDictionaryICategoryID), YES); + GDL2_Activate([self class], YES); } /** @@ -851,16 +843,13 @@ isSmart: (BOOL)smartFlag; @end -@implementation NSMutableDictionary (EOKVCGNUstepExtensions) - -- (void)GDL2KVCNSMutableDictionaryICategoryID -{ -} +@interface GDL2KVCNSMutableDictionary : NSMutableDictionary +@end +@implementation GDL2KVCNSMutableDictionary + (void)load { - GDL2_ActivateCategory("NSMutableDictionary", - @selector(GDL2KVCNSMutableDictionaryICategoryID), YES); + GDL2_Activate([self class], YES); } /** --- gnustep-dl2-0.12.0.orig/EOControl/EONSAddOns.h +++ gnustep-dl2-0.12.0/EOControl/EONSAddOns.h @@ -51,7 +51,7 @@ GSUseStrictWO451Compatibility(NSString *key); GDL2CONTROL_EXPORT void -GDL2_ActivateCategory(const char *className, SEL sel, BOOL isInstance); +GDL2_Activate(Class cls, BOOL isInstance); GDL2CONTROL_EXPORT void GDL2_ActivateAllGDL2Categories(void); --- gnustep-dl2-0.12.0.orig/EOControl/EONSAddOns.m +++ gnustep-dl2-0.12.0/EOControl/EONSAddOns.m @@ -64,6 +64,11 @@ #include "EOPrivate.h" +@class GDL2KVCNSObject; +@class GDL2KVCNSArray; +@class GDL2KVCNSDictionary; +@class GDL2KVCNSMutableDictionary; +@class GDL2CDNSObject; static NSRecursiveLock *local_lock = nil; static BOOL GSStrictWO451Flag = NO; @@ -98,6 +103,7 @@ void GDL2_DumpMethodList(Class cls, SEL sel, BOOL isInstance) { +/* void *iterator = 0; GSMethodList mList; @@ -113,39 +119,30 @@ mList, meth, imp); } fprintf(stderr,"List finished\n"); fflush(stderr); +*/ } void -GDL2_ActivateCategory(const char *className, SEL sel, BOOL isInstance) +GDL2_Activate(Class cls, BOOL isInstance) { - Class cls; - GSMethodList mList; - - cls = GSClassFromName(className); - mList = GSMethodListForSelector(cls, sel, 0, isInstance); - - GSRemoveMethodList(cls, mList, isInstance); - GSAddMethodList(cls, mList, isInstance); - - GSFlushMethodCacheForClass(cls); + if (NO == isInstance) + { + cls = object_getClass(cls); + } + GSObjCAddClassOverride([cls superclass], cls); } void GDL2_ActivateAllGDL2Categories(void) { /* EOKeyValueCoding */ - GDL2_ActivateCategory("NSObject", - @selector(GDL2KVCNSObjectICategoryID), YES); - GDL2_ActivateCategory("NSArray", - @selector(GDL2KVCNSArrayICategoryID), YES); - GDL2_ActivateCategory("NSDictionary", - @selector(GDL2KVCNSDictionaryICategoryID), YES); - GDL2_ActivateCategory("NSMutableDictionary", - @selector(GDL2KVCNSMutableDictionaryICategoryID), YES); + GDL2_Activate([GDL2KVCNSObject class], YES); + GDL2_Activate([GDL2KVCNSArray class], YES); + GDL2_Activate([GDL2KVCNSDictionary class], YES); + GDL2_Activate([GDL2KVCNSMutableDictionary class], YES); /* EOClassDescription */ - GDL2_ActivateCategory("NSObject", - @selector(GDL2CDNSObjectICategoryID), YES); + GDL2_Activate([GDL2CDNSObject class], YES); } --- gnustep-dl2-0.12.0.orig/EOControl/GNUmakefile +++ gnustep-dl2-0.12.0/EOControl/GNUmakefile @@ -29,6 +29,7 @@ # The library to be compiled NATIVE_LIBRARY_NAME=EOControl +EOControl_INTERFACE_VERSION=0d EOControl_NEEDS_GUI = no --- gnustep-dl2-0.12.0.orig/EOInterface/EOPopUpAssociation.m +++ gnustep-dl2-0.12.0/EOInterface/EOPopUpAssociation.m @@ -24,8 +24,10 @@ */ #ifdef GNUSTEP -#include #include +#include +#include +#include #include #else --- gnustep-dl2-0.12.0.orig/DBModeler/ModelerEntityEditor.m +++ gnustep-dl2-0.12.0/DBModeler/ModelerEntityEditor.m @@ -40,6 +40,7 @@ #ifdef NeXT_GUI_LIBRARY #include #else +#include #include #include #include --- gnustep-dl2-0.12.0.orig/DBModeler/ModelerTableEmbedibleEditor.m +++ gnustep-dl2-0.12.0/DBModeler/ModelerTableEmbedibleEditor.m @@ -29,6 +29,8 @@ #ifdef NeXT_GUI_LIBRARY #include #else +#include +#include #include #include #include debian/patches/add_direntry.diff0000644000000000000000000000150612146133731014122 0ustar # Description: added @direntry to have an entry in the DIR file and avoid a warning by # install-info's trigger # Author: Federico Gimenez Nieto # Last-update: 2010-03-01 Index: gnustep-dl2-0.12.0/Documentation/GDL2Intro/GDL2Intro.texi =================================================================== --- gnustep-dl2-0.12.0.orig/Documentation/GDL2Intro/GDL2Intro.texi 2010-03-01 19:01:37.000000000 +0100 +++ gnustep-dl2-0.12.0/Documentation/GDL2Intro/GDL2Intro.texi 2010-03-01 19:03:36.000000000 +0100 @@ -20,6 +20,11 @@ into another language, under the above conditions for modified versions. @end copying +@dircategory Software libraries +@direntry +* GDL2: (GDL2Intro). GNUstep Database Library Introduction. +@end direntry + @titlepage @title GNUstep Database Library Introduction @page debian/patches/avoid_unresolved_symbols.diff0000644000000000000000000000673312146133731016601 0ustar # Description: (tiny change) # # Avoid undefined symbols. # * EOControl/GNUmakefile (EOControl_LIBRARIES_DEPEND_UPON): # * EOAccess/GNUmakefile (EOAccess_LIBRARIES_DEPEND_UPON): # * EOInterface/GNUmakefile (EOInterface_LIBRARIES_DEPEND_UPON): # * EOModeler/GNUmakefile (EOModeler_LIBRARIES_DEPEND_UPON): # Define. # * EOAdaptors/PostgreSQLAdaptor/config.mak.in # (LIBRARIES_DEPEND_UPON): Add -lEOControl, -lEOAccess, $(FND_LIBS) # and $(OBJC_LIBS). # * EOAdaptors/SQLiteAdaptor/GNUmakefile.in (LIBRARIES_DEPEND_UPON): # Add -lEOAccess, $(FND_LIBS) and $(OBJC_LIBS). # Author: Yavor Doganov # Last-update: 2009-12-25 Index: gnustep-dl2-0.12.0/EOControl/GNUmakefile =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/GNUmakefile +++ gnustep-dl2-0.12.0/EOControl/GNUmakefile @@ -32,6 +32,8 @@ EOControl_NEEDS_GUI = no +EOControl_LIBRARIES_DEPEND_UPON = $(OBJC_LIBS) + # The C source files to be compiled EOControl_C_FILES = Index: gnustep-dl2-0.12.0/EOAccess/GNUmakefile =================================================================== --- gnustep-dl2-0.12.0.orig/EOAccess/GNUmakefile +++ gnustep-dl2-0.12.0/EOAccess/GNUmakefile @@ -32,6 +32,8 @@ EOAccess_NEEDS_GUI = no +EOAccess_LIBRARIES_DEPEND_UPON = -lEOControl $(OBJC_LIBS) + # The C source files to be compiled EOAccess_C_FILES = Index: gnustep-dl2-0.12.0/EOInterface/GNUmakefile =================================================================== --- gnustep-dl2-0.12.0.orig/EOInterface/GNUmakefile +++ gnustep-dl2-0.12.0/EOInterface/GNUmakefile @@ -31,6 +31,9 @@ NATIVE_LIBRARY_NAME=EOInterface EOInterface_NEEDS_GUI = yes + +EOInterface_LIBRARIES_DEPEND_UPON = -lEOControl $(OBJC_LIBS) + # The C source files to be compiled EOInterface_C_FILES = Index: gnustep-dl2-0.12.0/EOModeler/GNUmakefile =================================================================== --- gnustep-dl2-0.12.0.orig/EOModeler/GNUmakefile +++ gnustep-dl2-0.12.0/EOModeler/GNUmakefile @@ -30,6 +30,9 @@ # The library to be compiled NATIVE_LIBRARY_NAME=EOModeler +EOModeler_LIBRARIES_DEPEND_UPON = -lEOControl -lEOAccess $(GUI_LIBS) \ + $(OBJC_LIBS) + EOModeler_NEEDS_GUI = yes # The C source files to be compiled EOModeler_C_FILES = Index: gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/config.mak.in =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/PostgreSQLAdaptor/config.mak.in +++ gnustep-dl2-0.12.0/EOAdaptors/PostgreSQLAdaptor/config.mak.in @@ -27,7 +27,8 @@ ADDITIONAL_INCLUDE_DIRS += @POSTGRES_INCLUDES@ # Libraries linked to the framework -LIBRARIES_DEPEND_UPON += @POSTGRES_LIBS@ +LIBRARIES_DEPEND_UPON += @POSTGRES_LIBS@ -lEOControl -lEOAccess $(FND_LIBS) \ + $(OBJC_LIBS) # Additional library directories the linker should search ADDITIONAL_LIB_DIRS += @POSTGRES_LIB_DIRS@ Index: gnustep-dl2-0.12.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in =================================================================== --- gnustep-dl2-0.12.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in +++ gnustep-dl2-0.12.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in @@ -28,7 +28,7 @@ ADDITIONAL_INCLUDE_DIRS+=@SQLITE3_INCLUDES@ ADDITIONAL_LIB_DIRS+=@SQLITE3_LIB_DIRS@ -LIBRARIES_DEPEND_UPON+=@SQLITE3_LIBS@ +LIBRARIES_DEPEND_UPON+=@SQLITE3_LIBS@ -lEOAccess $(FND_LIBS) $(OBJC_LIBS) FRAMEWORK_NAME=SQLite3EOAdaptor ADDITIONAL_NATIVE_LIB_DIRS+=../../EOControl ../../EOAccess debian/patches/gcc-4.7.patch0000644000000000000000000002654212146133731012712 0ustar 2012-06-26 Yavor Doganov * Changes for gcc4.7 compatibility --- gnustep-dl2-0.12.0.orig/EOControl/EOGenericRecord.m +++ gnustep-dl2-0.12.0/EOControl/EOGenericRecord.m @@ -1516,13 +1516,13 @@ - (unsigned int)eoGetSize { - unsigned int size = 0; + size_t size = 0; Class selfClass = Nil; // EOFLOGObjectFnStartOrCond(@"EOGenericRecord"); selfClass = [self class]; - size = selfClass->instance_size; + size = class_getInstanceSize(selfClass); // EOFLOGObjectFnStopOrCond(@"EOGenericRecord"); @@ -1618,7 +1618,7 @@ [processed setObject: [NSNumber numberWithUnsignedInt: 0] forKey: objectP]; - size += objectClass->instance_size; + size += class_getInstanceSize(objectClass); if ([object isKindOfClass: [NSArray class]]) baseSize += size; --- gnustep-dl2-0.12.0.orig/EOControl/EOFault.m +++ gnustep-dl2-0.12.0/EOControl/EOFault.m @@ -443,19 +443,6 @@ NSStringFromSelector(selector)]; } -/** - * This method is replaced by the current implementation of NSObject (if any). - * - * It is assumed that this method will not be called if NSObject does not - * implement it. - */ -- (retval_t)forward: (SEL)selector - : (arglist_t)args -{ - retval_t ret = 0; - NSAssert(NO,@"This should never be called (see +initialize)."); - return ret; -} - (void)forwardInvocation: (NSInvocation *)invocation { --- gnustep-dl2-0.12.0.orig/EOAccess/EOSQLExpression.m +++ gnustep-dl2-0.12.0/EOAccess/EOSQLExpression.m @@ -1503,13 +1503,13 @@ EOFLOGObjectLevelArgs(@"EOSQLExpression", @"selectorSQLString=%@", selectorSQLString); - if (sel_eq([qualifier selector], EOQualifierOperatorLike)) + if (sel_isEqual([qualifier selector], EOQualifierOperatorLike)) { value = [[self class] sqlPatternFromShellPattern: value]; valueSQLString = [self sqlStringForValue: value attributeNamed: key]; } - else if (sel_eq([qualifier selector], EOQualifierOperatorCaseInsensitiveLike)) + else if (sel_isEqual([qualifier selector], EOQualifierOperatorCaseInsensitiveLike)) { value = [[self class] sqlPatternFromShellPattern: value]; @@ -1589,13 +1589,13 @@ orderSelector = [sortOrdering selector]; - if (sel_eq(orderSelector, EOCompareAscending)) + if (sel_isEqual(orderSelector, EOCompareAscending)) orderStringFormat = @"(%@) asc"; - else if (sel_eq(orderSelector, EOCompareDescending)) + else if (sel_isEqual(orderSelector, EOCompareDescending)) orderStringFormat = @"(%@) desc"; - else if (sel_eq(orderSelector, EOCompareCaseInsensitiveAscending)) + else if (sel_isEqual(orderSelector, EOCompareCaseInsensitiveAscending)) orderStringFormat = @"upper(%@) asc"; - else if (sel_eq(orderSelector, EOCompareCaseInsensitiveDescending)) + else if (sel_isEqual(orderSelector, EOCompareCaseInsensitiveDescending)) orderStringFormat = @"upper(%@) desc"; key = [sortOrdering key]; @@ -1765,33 +1765,33 @@ value: (id)value { //seems OK - if (sel_eq(selector, EOQualifierOperatorEqual)) + if (sel_isEqual(selector, EOQualifierOperatorEqual)) { if (value==GDL2_EONull) return @"is"; else return @"="; } - else if (sel_eq(selector, EOQualifierOperatorNotEqual)) + else if (sel_isEqual(selector, EOQualifierOperatorNotEqual)) { if (value==GDL2_EONull) return @"is not"; else return @"<>"; } - else if (sel_eq(selector, EOQualifierOperatorLessThan)) + else if (sel_isEqual(selector, EOQualifierOperatorLessThan)) return @"<"; - else if (sel_eq(selector, EOQualifierOperatorGreaterThan)) + else if (sel_isEqual(selector, EOQualifierOperatorGreaterThan)) return @">"; - else if (sel_eq(selector, EOQualifierOperatorLessThanOrEqualTo)) + else if (sel_isEqual(selector, EOQualifierOperatorLessThanOrEqualTo)) return @"<="; - else if (sel_eq(selector, EOQualifierOperatorGreaterThanOrEqualTo)) + else if (sel_isEqual(selector, EOQualifierOperatorGreaterThanOrEqualTo)) return @">="; - else if (sel_eq(selector, EOQualifierOperatorLike)) + else if (sel_isEqual(selector, EOQualifierOperatorLike)) return @"like"; - else if (sel_eq(selector, EOQualifierOperatorCaseInsensitiveLike)) + else if (sel_isEqual(selector, EOQualifierOperatorCaseInsensitiveLike)) return @"like"; //same as sensitive -/* //TODO else if(sel_eq(selector, EOQualifierOperatorContains)) +/* //TODO else if(sel_isEqual(selector, EOQualifierOperatorContains)) return @"like";*/ else { --- gnustep-dl2-0.12.0.orig/EOControl/EOQualifier.m +++ gnustep-dl2-0.12.0/EOControl/EOQualifier.m @@ -934,23 +934,23 @@ + (NSString *)stringForOperatorSelector: (SEL)selector { - if (sel_eq(selector, EOQualifierOperatorEqual)) + if (sel_isEqual(selector, EOQualifierOperatorEqual)) return @"="; - else if (sel_eq(selector, EOQualifierOperatorNotEqual)) + else if (sel_isEqual(selector, EOQualifierOperatorNotEqual)) return @"<>"; - else if (sel_eq(selector, EOQualifierOperatorLessThan)) + else if (sel_isEqual(selector, EOQualifierOperatorLessThan)) return @"<"; - else if (sel_eq(selector, EOQualifierOperatorGreaterThan)) + else if (sel_isEqual(selector, EOQualifierOperatorGreaterThan)) return @">"; - else if (sel_eq(selector, EOQualifierOperatorLessThanOrEqualTo)) + else if (sel_isEqual(selector, EOQualifierOperatorLessThanOrEqualTo)) return @"<="; - else if (sel_eq(selector, EOQualifierOperatorGreaterThanOrEqualTo)) + else if (sel_isEqual(selector, EOQualifierOperatorGreaterThanOrEqualTo)) return @">="; - else if (sel_eq(selector, EOQualifierOperatorContains)) + else if (sel_isEqual(selector, EOQualifierOperatorContains)) return @"doesContain"; - else if (sel_eq(selector, EOQualifierOperatorLike)) + else if (sel_isEqual(selector, EOQualifierOperatorLike)) return @"like"; - else if (sel_eq(selector, EOQualifierOperatorCaseInsensitiveLike)) + else if (sel_isEqual(selector, EOQualifierOperatorCaseInsensitiveLike)) return @"caseInsensitiveLike"; return NSStringFromSelector(selector); --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyComparisonQualifier.m +++ gnustep-dl2-0.12.0/EOControl/EOKeyComparisonQualifier.m @@ -187,41 +187,41 @@ { return (*imp) (leftVal, _selector, rightVal); } - if (sel_eq(_selector, EOQualifierOperatorEqual) == YES) + if (sel_isEqual(_selector, EOQualifierOperatorEqual) == YES) { return [leftVal isEqual: rightVal]; } - else if (sel_eq(_selector, EOQualifierOperatorNotEqual) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorNotEqual) == YES) { return ([leftVal isEqual: rightVal]?NO:YES); } - else if (sel_eq(_selector, EOQualifierOperatorLessThan) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorLessThan) == YES) { return [leftVal compare: rightVal] == NSOrderedAscending; } - else if (sel_eq(_selector, EOQualifierOperatorGreaterThan) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorGreaterThan) == YES) { return [leftVal compare: rightVal] == NSOrderedDescending; } - else if (sel_eq(_selector, EOQualifierOperatorLessThanOrEqualTo) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorLessThanOrEqualTo) == YES) { return [leftVal compare: rightVal] != NSOrderedDescending; } - else if (sel_eq(_selector, EOQualifierOperatorGreaterThanOrEqualTo) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorGreaterThanOrEqualTo) == YES) { return [leftVal compare: rightVal] != NSOrderedAscending; } - else if (sel_eq(_selector, EOQualifierOperatorContains) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorContains) == YES) { return [(id)leftVal rangeOfString: (id)rightVal].location != NSNotFound; } - else if (sel_eq(_selector, EOQualifierOperatorLike) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorLike) == YES) { NSEmitTODO(); //TODO return [leftVal isEqual: rightVal] == NSOrderedSame; } - else if (sel_eq(_selector, EOQualifierOperatorCaseInsensitiveLike) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorCaseInsensitiveLike) == YES) { NSEmitTODO(); //TODO return [[(id)leftVal uppercaseString] isEqual: [(id)rightVal uppercaseString]] --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueQualifier.m +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueQualifier.m @@ -227,15 +227,15 @@ { return (*imp) (objectValue, _selector, selfValue); } - if (sel_eq(_selector, EOQualifierOperatorEqual) == YES) + if (sel_isEqual(_selector, EOQualifierOperatorEqual) == YES) { return [objectValue isEqual: selfValue]; } - else if (sel_eq(_selector, EOQualifierOperatorNotEqual) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorNotEqual) == YES) { return ([objectValue isEqual: selfValue]?NO:YES); } - else if (sel_eq(_selector, EOQualifierOperatorLessThan) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorLessThan) == YES) { if (objectValue==GDL2_EONull) return ((selfValue==GDL2_EONull) ? NO : YES); @@ -244,7 +244,7 @@ else return [objectValue compare: selfValue] == NSOrderedAscending; } - else if (sel_eq(_selector, EOQualifierOperatorGreaterThan) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorGreaterThan) == YES) { if (objectValue==GDL2_EONull) return NO; @@ -253,7 +253,7 @@ else return [objectValue compare: selfValue] == NSOrderedDescending; } - else if (sel_eq(_selector, EOQualifierOperatorLessThanOrEqualTo) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorLessThanOrEqualTo) == YES) { if (objectValue==GDL2_EONull) return YES; @@ -262,7 +262,7 @@ else return [objectValue compare: selfValue] != NSOrderedDescending; } - else if (sel_eq(_selector, EOQualifierOperatorGreaterThanOrEqualTo) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorGreaterThanOrEqualTo) == YES) { if (objectValue==GDL2_EONull) return ((selfValue==GDL2_EONull) ? YES : NO); @@ -271,7 +271,7 @@ else return [objectValue compare: selfValue] != NSOrderedAscending; } - else if (sel_eq(_selector, EOQualifierOperatorContains) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorContains) == YES) { //Philosophical question: does nil contains nil ?? @@ -283,13 +283,13 @@ return [(NSString*)objectValue rangeOfString: (NSString*)selfValue].location != NSNotFound; } - else if (sel_eq(_selector, EOQualifierOperatorLike) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorLike) == YES) { NSEmitTODO(); //TODO //How to handle nil like ? return [objectValue isEqual: selfValue]; } - else if (sel_eq(_selector, EOQualifierOperatorCaseInsensitiveLike) == YES) + else if (sel_isEqual(_selector, EOQualifierOperatorCaseInsensitiveLike) == YES) { NSEmitTODO(); //TODO //How to handle nil like ? debian/patches/fix_missing_include_for_NSArray.diff0000644000000000000000000000264112146133731017742 0ustar # Description: # * EOControl/EOKeyValueArchiver.h: Add forward declaration of # NSMutableArray. # * EOControl/EOQualifier.h: Add missing include for NSArray. # Author: Gregory John Casamento # Last-update: 2009-12-21 Index: gnustep-dl2-0.12.0/EOControl/EOKeyValueArchiver.h =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOKeyValueArchiver.h 2009-12-21 20:28:50.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOKeyValueArchiver.h 2009-12-21 20:29:29.000000000 +0100 @@ -37,6 +37,7 @@ @class NSArray; +@class NSMutableArray; @class NSDictionary; @class NSMutableDictionary; @class NSString; Index: gnustep-dl2-0.12.0/EOControl/EOQualifier.h =================================================================== --- gnustep-dl2-0.12.0.orig/EOControl/EOQualifier.h 2009-12-21 20:29:54.000000000 +0100 +++ gnustep-dl2-0.12.0/EOControl/EOQualifier.h 2009-12-21 20:30:38.000000000 +0100 @@ -27,23 +27,12 @@ #ifndef __EOQualifier_h__ #define __EOQualifier_h__ -#ifdef GNUSTEP -#include -#else #include -#endif #include #include -@class NSArray; -@class NSDictionary; -@class NSString; -@class NSSet; -@class NSMutableSet; -@class NSException; - @class EOClassDescription; @class EOSQLExpression; @class EOQualifier; debian/rules0000755000000000000000000000737112146133731010257 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 include /usr/share/GNUstep/debian/config.mk export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR) DESTDIR := $(CURDIR)/debian/tmp #defined LDFLAGS to prevent dpkg-shlibdeps warnings LDFLAGS := -z relro -Wl,-z,defs -Wl,--as-needed configure: configure-stamp configure-stamp: dh_testdir . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; \ ./configure --prefix=/usr touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir #define ADDITIONAL_OBJCFLAGS to prevent FTBFS (thanks Yavor Doganov) $(MAKE) LDFLAGS="$(LDFLAGS)" ADDITIONAL_OBJCFLAGS=-DDEBUG doc=yes messages=yes # Relink only DBModeler to avoid binary-or-shlib-defines-rpath. for d in DBModeler ; do \ $(RM) $$d/$$d.app/$$d; \ $(MAKE) -C $$d ADDITIONAL_OBJCFLAGS=-DDEBUG messages=yes \ LDFLAGS="$(LDFLAGS) -Wl,-rpath,/usr/lib/gnustep-dl2"; \ done #generate application icon convert DBModeler/Resources/DBModeler.tiff -resize 32x32 DBModeler.xpm touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. [ ! -f GNUmakefile ] || $(MAKE) clean doc=yes rm -rf EOAdaptors/GNUmakefile EOAdaptors/PostgreSQLAdaptor/GNUmakefile EOAdaptors/PostgreSQLAdaptor/config.mak \ EOAdaptors/SQLiteAdaptor/GNUmakefile EOAdaptors/SQLiteAdaptor/config.mak \ EOControl/config.h GNUmakefile config.log config.status gdl2.make rm -f DBModeler.xpm dh_clean install: build dh_testdir dh_testroot dh_prep dh_installdirs # Add here commands to install the package $(MAKE) install GNUSTEP_INSTALLATION_DOMAIN=SYSTEM DESTDIR=$(DESTDIR) doc=yes #install libEOModeler as private library $(RM) $(DESTDIR)/usr/lib/libEOModeler* $(MAKE) -C EOModeler install DESTDIR=$(DESTDIR) \ GNUSTEP_SYSTEM_LIBRARIES=/usr/lib/gnustep-dl2 \ GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rm -f $(DESTDIR)/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop #remove PostgreSQLAdaptor headers as adivised by upstream (David Ayers) rm -rf $(DESTDIR)/usr/lib/GNUstep/Frameworks/PostgreSQLEOAdaptor.framework/Headers #remove empty directory rm -rf $(DESTDIR)/usr/lib/GNUstep/Frameworks/SQLite3EOAdaptor.framework/Versions/0/Headers #remove gsdoc files generated for libgnustep-dl2-dev rm -rf $(DESTDIR)/usr/share/GNUstep/Documentation/EO*/*gsdoc rm -rf $(DESTDIR)/usr/share/GNUstep/Documentation/GDL2/*gsdoc #move resources to /usr/share/GNUstep and add a symlink if the installation is following the FHS ifeq ($(GS_USE_FHS),yes) dh_installdirs usr/share/GNUstep mv $(DESTDIR)$(GNUSTEP_SYSTEM_APPS)/DBModeler.app/Resources \ $(DESTDIR)/usr/share/GNUstep/DBModeler.app dh_link usr/share/GNUstep/DBModeler.app \ $(GNUSTEP_SYSTEM_APPS)/DBModeler.app/Resources endif #install the XPM icon for DBModeler install -D -m 644 DBModeler.xpm \ debian/gnustep-dl2/usr/share/pixmaps/DBModeler.xpm # Build architecture-independent files here. binary-indep: build install # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installdirs dh_installchangelogs ChangeLog dh_installdocs dh_installman dh_installmenu dh_installexamples Examples/* dh_install dh_link dh_strip dh_compress -Xexamples dh_fixperms dh_makeshlibs -V -plibgnustep-dl2-0d dh_shlibdeps # Calculate the adaptor packages' shlibs:Depends separately, to # avoid circular dependencies (#574949). dh_shlibdeps -Ngnustep-dl2-postgresql-adaptor \ -Ngnustep-dl2-sqlite-adaptor dh_shlibdeps -pgnustep-dl2-postgresql-adaptor \ -pgnustep-dl2-sqlite-adaptor -- -xlibgnustep-dl2-0d dh_installdeb dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure debian/DBModeler.desktop0000644000000000000000000000030112146133731012351 0ustar [Desktop Entry] Type=Application Version=1.0 Categories=Database;Development; Name=DBModeler Comment=Database Access Modeler Icon=/usr/share/GNUstep/DBModeler.app/DBModeler.tiff Exec=DBModeler debian/eoutil.10000644000000000000000000001215212146133731010553 0ustar .TH EOUTIL 1 "10 March 2010" .SH NAME eoutil \- Command line utility to perform database and EOF oriented tasks. .SH SYNOPSIS 'nh .fi .ad l \fBeoutil command [command\e-options]\fR \kx .if (\nx>(\n(.l/2)) .nr x (\n(.l/5) 'in \n(.iu+\nxu 'in \n(.iu-\nxu .ad b 'hy .SH DESCRIPTION This manual page describes briefly the \fIeoutil\fR command. .PP \fIeoutil\fR is a command line utility that performs database and Enterprise Objects Framework-related tasks. It allows to connect to data sources, dump data from them or modify model features. .PP \fIeoutil \fRsupports the following commands, with the corresponding command-options: .TP 0.2i \(bu \fIdump [\e-source [sourcefile]] \e-dest [destfile] [\e-schemaCreate ] [\e-schemaDrop ] [\e-postI\e nstall] [\e-force] [\e-connDict ] [\e-entities ] [\e-excludedEntities ] [\e-modelGroup ] [\e-ascii]\fR This command reads data from and dumps it to . The dump may include bits of DML that create bits of database schema. The \e-source flag is optional if only schema is to be created (i.e. no data is being dumped). The following is a list of possible values for each of the arguments in the command: .RS .TP 0.2i \(bu \fImodel\fR -- must be the name of an eomodel or eomodeld file .TP 0.2i \(bu \fIsource\fR -- 'plist' (read from stdin unless source file is specified) or 'database' (uses model to connect) .TP 0.2i \(bu \fIsourcefile\fR -- name of file to read plist from .TP 0.2i \(bu \fIdest\fR -- 'plist' or 'script' (both are written to stdout unless destfile is specified) or 'database' (uses model to connect) .TP 0.2i \(bu \fIdestfile\fR -- name of file to write plist or script .TP 0.2i \(bu \fIoptions\fR -- 'database', 'tables', \&'primaryKeySupport', 'primaryKeyConstraints' or \&'foreignKeyConstraints' .TP 0.2i \(bu \fIpostInstall\fR -- looks in the userInfo dictionary for an array of SQL strings to process after any schema creation and data dumping is done .TP 0.2i \(bu \fIforce\fR -- Do not quit processing after database error .TP 0.2i \(bu \fIconnDict\fR -- A substitute connection dictionary .TP 0.2i \(bu \fIentities\fR -- a subset of the entities in the model (all are used by default) .TP 0.2i \(bu \fIexcludedEntities\fR -- a subset of the entities in the model which shall not be used (all are used by default) .TP 0.2i \(bu \fImodelGroup\fR -- A list of models to create a model group. (Allows you to use models not in a framework. Model names must be absolute paths.) .TP 0.2i \(bu \fIascii\fR -- Convert all non-ASCII characters to their nearest ASCII equivalents. .RE .TP 0.2i \(bu \fIconvert \fR This command converts the type mapping in a model for the data source specified by the connection dictionary URL. The connection dictionary in the new model is set to connectionDictionary. .RS .TP 0.2i \(bu \fImodel\fR -- must be the name of an eomodel or eomodeld file .TP 0.2i \(bu \fIadaptorName\fR -- PostgreSQL, FlatFile, etc. .TP 0.2i \(bu \fIconnectionDictionary\fR -- string in property list format representing a dictionary, specifying the database name for the data source (required) and username and password (if required by that data source). .TP 0.2i \(bu \fIoutFileName\fR -- the name of a directory to write the converted model .RE .TP 0.2i \(bu \fIconnect ( | ( ))\fR This command attempts to connect to a data source using the adaptor named adaptorName with connectionDictionary, or using the connection dictionary in model. It returns an exit status of 0 if successful and 1 otherwise. This is primarily useful for scripts. .RS .TP 0.2i \(bu \fImodel\fR -- must be the name of an eomodel or eomodeld file .TP 0.2i \(bu \fIadaptorName\fR -- PostgreSQL, FlatFile, etc. .TP 0.2i \(bu \fIconnectionDictionary\fR -- string in property list format representing a dictionary, specifying the database name for the data source (required) and username and password (if required by that data source). .RE .SH EXAMPLES # eoutil dump Movies.eomodeld \e-source plist \e-dest database \e-schemaCreate tables primaryKeySupport foreignKeyConstraints < MovieData.plist .PP Creates the tables in the database, reads data in plist format from,stdin stores the data in the database listed in the connection dictionary of model, creates primary key support in the database, and creates foreign key constraints corresponding to the relationship definitions. .PP # eoutil convert Movies.eomodeld PostgreSQL '{ databaseName = test; hostName = localhost; userName = postgres; password = postgres; }' M.eomodeld .PP Converts types in Movies.eomodeld file to PostgreSQL types and writes the converted model to ./M.eomodel .PP # eoutil connect PostgreSQL '{ databaseName = test; hostName = localhost; userName = postgres; password = postgres; }' .PP Attempts to connect to a PostgreSQL database on host localhost. .SH SEE ALSO .BR GNUstep (7). .SH AUTHOR eoutil was written by Stephane Corthesy . .PP This manual page was written by Federico Gim\('enez Nieto for the Debian project (but may be used by others). debian/libgnustep-dl2-0d.install0000644000000000000000000000026512146133731013716 0ustar usr/lib/libEOAccess.*.*.* usr/lib/libEOControl.*.*.* usr/lib/libEOInterface.*.*.* usr/lib/libEOAccess.so.? usr/lib/libEOControl.so.?? usr/lib/libEOInterface.so.? debian/control0000644000000000000000000000625712146133731010604 0ustar Source: gnustep-dl2 Section: gnustep Priority: optional Maintainer: Federico Gimenez Nieto Uploaders: Debian GNUstep maintainers Build-Depends: debhelper (>= 7), libgnustep-gui-dev, libpq-dev, librenaissance0-dev, libsqlite3-dev, gorm.app, texi2html, texinfo, texlive-latex-base, imagemagick Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/pkg-gnustep/gnustep-dl2.git Vcs-Browser: http://git.debian.org/?p=pkg-gnustep/gnustep-dl2.git Homepage: http://www.gnustep.org/experience/GDL2.html Package: gnustep-dl2 Architecture: any Depends: ${shlibs:Depends}, ${gnustep:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: libgnustep-dl2-dev Description: Objective-C Classes needed for Database Access GNUstep Database Library Version 2 is needed by GNUstep applications that communicate with databases. It's an implementation of Apple's Enterprise Objects Framework (EOF) v 3.0 (from NeXT), and Apple's WebObjects 4.5 interface. Package: libgnustep-dl2-0d Architecture: any Section: libs Depends: gnustep-dl2-postgresql-adaptor | gnustep-dl2-sqlite-adaptor, ${misc:Depends}, ${shlibs:Depends} Replaces: gnustep-dl2 (<<0.12) Conflicts: libgnustep-dl2-0 Description: bundle of runtime libraries for gnustep-dl2 This package includes the EOAccess, EOInterface and EOControl runtime libraries. . GNUstep Database Library Version 2 is needed by GNUstep applications that communicate with databases. It's an implementation of Apple's Enterprise Objects Framework (EOF) v 3.0 (from NeXT), and Apple's WebObjects 4.5 interface. Package: libgnustep-dl2-dev Architecture: any Section: libdevel Depends: libgnustep-dl2-0d (= ${binary:Version}), ${misc:Depends}, libgnustep-gui-dev Replaces: gnustep-dl2 (<<0.12) Description: development files for gnustep-dl2 runtime libraries Beside the headers and so symlinks for EOAccess, EOInterface and EOControl libraries, the package includes the general gdl2.make . GNUstep Database Library Version 2 is needed by GNUstep applications that communicate with databases. It's an implementation of Apple's Enterprise Objects Framework (EOF) v 3.0 (from NeXT), and Apple's WebObjects 4.5 interface. Package: gnustep-dl2-postgresql-adaptor Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: gnustep-dl2 (<<0.12) Description: gnustep-dl2 adaptor to connect to PostgreSQL This specific EOAdaptor project supports PostgreSQL 8.1 and higher . GNUstep Database Library Version 2 is needed by GNUstep applications that communicate with databases. It's an implementation of Apple's Enterprise Objects Framework (EOF) v 3.0 (from NeXT), and Apple's WebObjects 4.5 interface. Package: gnustep-dl2-sqlite-adaptor Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: gnustep-dl2 (<<0.12) Description: gnustep-dl2 adaptor to connect to SQLite This specific EOAdaptor project supports SQLite 3.x and higher . GNUstep Database Library Version 2 is needed by GNUstep applications that communicate with databases. It's an implementation of Apple's Enterprise Objects Framework (EOF) v 3.0 (from NeXT), and Apple's WebObjects 4.5 interface. debian/gnustep-dl2-postgresql-adaptor.dirs0000644000000000000000000000002112146133731016040 0ustar usr/lib/GNUstep debian/gnustep-dl2.menu0000644000000000000000000000037712146133731012230 0ustar ?package(gnustep-dl2):needs="X11" \ section="Applications/Data Management" \ hints="GNUstep,EOF,GDL2" \ title="DBModeler" \ longtitle="Create and maintain .eomodel files" \ command="/usr/bin/DBModeler" \ icon="/usr/share/pixmaps/DBModeler.xpm"debian/gnustep-dl2.docs0000644000000000000000000000000512146133731012200 0ustar TODO debian/changelog0000644000000000000000000002657612146133731011061 0ustar gnustep-dl2 (0.12.0-10) unstable; urgency=low * debian/gnustep-dl2.install: exlude removed GDL2intro.info from install (closes: #707514) * debian/control: bumped Standards-Version: 3.9.4 * debian/copyright: updated date -- Federico Gimenez Nieto Sun, 19 May 2013 12:49:36 +0200 gnustep-dl2 (0.12.0-9+nmu1) unstable; urgency=medium * Non-maintainer upload. * Exclude broken eoutil and DBModeler tools (closes: #705602). -- Michael Gilbert Sun, 21 Apr 2013 06:04:15 +0000 gnustep-dl2 (0.12.0-9) unstable; urgency=low * gcc-4.7.patch by Yavor Doganov (Closes: #667871) * debian/control: bumped Standards-Version: 3.9.3 * debian/rules: added "-z relro" to LDFLAGS to prevent hardening-no-relro * debian/copyright: updated date -- Federico Gimenez Nieto Wed, 27 Jun 2012 08:06:36 +0200 gnustep-dl2 (0.12.0-8) unstable; urgency=low * debian/gnustep-dl2.install: Removed empty GDL2 palette generation (closes: #645933) * debian/patches/format-security.patch: modifications to prevent FTBFS with -Werror=format-security compiler option, thanks Ilya Barygin (closes: #647081) * debian/preinst: Removed GDL2 palette resources related move commands * debian/rules: + Removed GDL2 palette resources related move commands + Removed relink for GDL2 palette -- Federico Gimenez Nieto Sun, 30 Oct 2011 10:33:07 +0100 gnustep-dl2 (0.12.0-7) unstable; urgency=low * debian/patches/629204.patch: modifications due to Traditional to Modern GNU Objective-C runtime API (closes: #629204) * debian/gbp.conf: configuration for git-buildpackage tool * debian/control: + Bumped Standards-Version to 3.9.2 (no changes needed) + Added Vcs-Git and Vcs-Browser -- Federico Gimenez Nieto Fri, 26 Aug 2011 08:38:04 +0200 gnustep-dl2 (0.12.0-6) unstable; urgency=low * Removed references to the now missing GNUsteBase/GSCategories.h (closes: #618181) * debian/copyright: updated year -- Federico Gimenez Nieto Tue, 22 Mar 2011 12:10:06 +0100 gnustep-dl2 (0.12.0-5) unstable; urgency=low * debian/control: -stated that libgnustep-dl2-0d conflicts libgnustep-dl2-0 (closes: #594443) -added versioned Replaces relationship for all the packages in which gnustep-dl2 was split with 0.12 version -- Federico Gimenez Nieto Sat, 28 Aug 2010 08:16:31 +0200 gnustep-dl2 (0.12.0-4) unstable; urgency=low [ Yavor Doganov ] * Added patch EOControl/GNUmakefile (EOControl_INTERFACE_VERSION): Define as Debian-specific due to the ABI break. (closes: #581934) * debian/control: Renamed libgnustep-dl2-0 to libgnustep-dl2-0d * debian/libgnustep-dl2-0.install renamed to debian/libgnustep-dl2-0d.install and with the EOControl entry adjusted for soname change. * debian/rules: update references of libgnustep-dl2-0 to libgnustep-dl2-0d [Federico Gimenez Nieto] * debian/control: Bumped standards version (3.9.1) -- Federico Gimenez Nieto Fri, 13 Aug 2010 20:34:31 +0200 gnustep-dl2 (0.12.0-3) unstable; urgency=low * debian/rules: ADDITIONAL_OBJCFLAGS defined to work with gnustep-make/2.4.x (Closes: #583087) Thanks Yavor Doganov * debian/control: made first paragraph of long description a proper sentence for gnustep-dl2-sqlite-adaptor and gnustep-dl2-postgresql-adaptor (Closes: #579673) * Added patch for fixing documentation generation (Thanks Yavor Doganov) -- Federico Gimenez Nieto Tue, 27 May 2010 19:34:31 +0200 gnustep-dl2 (0.12.0-2) unstable; urgency=low [ Yavor Doganov ] * debian/rules (binary-arch): Avoid circular dependencies between the adaptor packages and the library (Closes: #574949). * debian/control (libgnustep-dl2-0) : Tighten depends on the adaptors. Fix typo (Closes: #579002). (libgnustep-dl2-dev) : Added dependency on libgnustep-dl2-0 (Closes: #579003) -- Federico Gimenez Nieto Tue, 27 Apr 2010 19:55:31 +0200 gnustep-dl2 (0.12.0-1) unstable; urgency=low * New maintainer (Closes: #461896) * New upstream version * Fixed "FTBFS: ../EOControl/EOQualifier.h:240: error: cannot find interface declaration for NSArray", patch by Gregory John Casamento * Added source format 3.0 (quilt) * Added debian/watch * debian/control: + Bumped Standards version (3.8.3) + Modified Section from 'libs' to 'gnustep' + Removed version dependency on libgnustep-gui-dev (0.14 is in Lenny) + Added missing dependency on librenaissance0-dev + Removed build dependency on gnustep-make (pulled from the dependency chain) and added ${gnustep:Depends} to Depends as a safety measure (since there is a call to gsdh_gnustep ) Thanks Yavor Doganov + Added missing ${misc:Depends} dependency to gnustep-dl2 + Added package entries for the multiple binary packages (gnustep-dl2, libgnustep-dl2-0, libgnustep-dl2-dev, gnustep-dl2-postgresql-adaptor, gnustep-dl2-sqlite-adaptor) + Added Debian GNUstep maintainers as uploaders + Added libsqlite3-dev build dependency (thanks Yavor) + Added texi2html build dependency + Upgraded versioned build dependency on debhelper to 7 + As gnustep-dl2 is shipping an info file, added dependency on dpkg (>= 1.15.4) | install-info + Added build dependency on imagemagick to generate DBModeler icon * debian/compat: upgraded to 7 to let dh_install to look for files in debian/tmp * debian/copyright: + Added maintainer information + Update License of DBModeler to GPL-3 and everithing except DBModeler to LGPL-3; updated also license links + Added copyright notice for the GDL2Intro HTML manual * debian/rules: + Exported GNUSTEP_MAKEFILES and replaced gs_make by $(MAKE) + Added code to define flags for optimized builds, preventing a GNUstep make bug + Added code to move the Resources directory to /usr/share/GNUstep and add a symlynk if the installation follows the FHS + Added code to remove files left in the build proccess + Added LDFLAGS to prevent dpkg-shlibdeps and a patch to avoid unresolved symbols (thanks Yavor) + Modified the build directory to debian/build to ease the package split in multiple binaries + Removed PostgreSQLAdaptor headers as adivised by upstream (David Ayers) + Added commands to ship libEOModeler as private library (thanks Yavor) + Added doc=yes to the build and install make commands + Added code to clean the documentation files created to the clean target + Replaced dh_clean -k by dh_prep + Added code to remove gsdoc files generated for libgnustep-dl2-dev + Added code to create, install and remove a xpm icon for DBModeler + Added dh_installexamples call to install the Examples/ directory * debian/DBModeler.desktop: + Upgraded Version field (0.94->1.0, the version of the spec) + Added icon reference * debian/menu: moved to gnustep-dl2.menu and added xpm icon reference * Added preinst script to remove Resources dir on updates * Added *.install for each of the binary packages * Added shlibs.libgnustep-dl2-0 * Moved menu to gnustep-dl2.menu, docs to gnustep-dl2.docs * Removed debian/dirs * Added generated documentation files to gnustep-dl2.docs and created libgnustep-dl2-dev.docs * Added gnustep-gl2.doc-base and libgnustep-gl2-dev.doc-base * Added patch to add @direntry to GDL2Intro.texi * Added manpages for DBModeler and eoutil; added debian/gnustep-dl2.manpages * gdlgsdoc binary not being installed, it produces segfault (bug forwarded upstream https://savannah.gnu.org/bugs/index.php?29191) -- Federico Gimenez Nieto Thu, 11 Mar 2010 17:53:31 +0100 gnustep-dl2 (0.11.0-1.2) unstable; urgency=low * Non-maintainer upload. * Fix "FTBFS: ../EOControl/EOQualifier.h:240: error: cannot find interface declaration for SArrayâ Applied patch by Yavor Doganov (Closes: #559884) -- Bastian Venthur Tue, 23 Feb 2010 17:16:12 +0100 gnustep-dl2 (0.11.0-1.1) unstable; urgency=low * Non-maintainer upload. * Fix building against new GNUstep. (Closes: #489694) -- Hubert Chathi Mon, 07 Jul 2008 12:57:31 -0400 gnustep-dl2 (0.11.0-1) unstable; urgency=low * New upstream version. * GNUstep transition. (Closes: #449141) + Updated debian/rules. * Added a desktop file. -- Gürkan Sengün Thu, 25 Oct 2007 12:19:05 +0200 gnustep-dl2 (0.10.1-2) unstable; urgency=low * Update to Debhelper compatibility level 5. * Replaced Brent from Uploaders with GNUstep team. * Dropped "| postgresql-dev" from build-depends. (Closes: #429970) * Fixed indenting of debian/copyright. -- Gürkan Sengün Thu, 21 Jun 2007 18:52:38 +0200 gnustep-dl2 (0.10.1-1) unstable; urgency=low * New maintainer. * New upstream release. (Closes: #383414) * Patch for EOAccess/EOModel.m to fix file permission. -- Gürkan Sengün Sat, 16 Sep 2006 15:30:23 +0200 gnustep-dl2 (0.9.1-2.2) unstable; urgency=low * NMU. * Updated run dependency (libgnustep-base1.11). -- Anibal Monsalve Salazar Wed, 06 Sep 2006 13:16:56 +1000 gnustep-dl2 (0.9.1-2.1) unstable; urgency=low * NMU. * Updated build dependency (libgnustep-base1.11-dev). Closes: #360547. * Fixed "FTBFS (amd64/gcc-4.0): static declaration of 'EOMoreThanOneException' follows non-static declaration". Patch by Anthony W. Juckel . Closes: #293025. -- Anibal Monsalve Salazar Wed, 06 Sep 2006 10:56:16 +1000 gnustep-dl2 (0.9.1-2) unstable; urgency=low * Correct the build again. -- Brent A. Fulgham Sun, 21 Nov 2004 17:58:33 -0800 gnustep-dl2 (0.9.1-1) unstable; urgency=low * Recompile for libgnustep-base1.10-dev. -- Brent A. Fulgham Mon, 15 Nov 2004 21:20:59 -0800 gnustep-dl2 (0.9.1-0.1) unstable; urgency=medium * NMU. * New upstream version. * Fix gnustep-base build dependency. -- Matthias Klose Sat, 7 Aug 2004 10:29:20 +0200 gnustep-dl2 (0.9.0-6) unstable; urgency=low * More shell corrections (bashisms.) Thanks to Sebastian Muszynski for his patch. -- Brent A. Fulgham Sun, 2 May 2004 23:13:01 -0700 gnustep-dl2 (0.9.0-5) unstable; urgency=low * Correct shell sourcing (masked by my local environment). (Closes:#244142) -- Brent A. Fulgham Fri, 16 Apr 2004 22:05:06 -0700 gnustep-dl2 (0.9.0-4) unstable; urgency=low * Clean up some build rules. * Correct typo in shlib handling. -- Brent A. Fulgham Tue, 13 Apr 2004 20:34:52 -0700 gnustep-dl2 (0.9.0-3) unstable; urgency=low * Add build-depends on gnustep-make. (Closes:#239731) -- Brent A. Fulgham Thu, 8 Apr 2004 23:41:22 -0700 gnustep-dl2 (0.9.0-2) unstable; urgency=low * Correct FTBFS bug. Many thanks to Sebastian Muszynski for the patch (Closes:#239731) -- Brent A. Fulgham Sun, 4 Apr 2004 20:18:19 -0700 gnustep-dl2 (0.9.0-1) unstable; urgency=low * Initial Release. -- Brent A. Fulgham Sat, 28 Feb 2004 21:40:30 -0800 debian/libgnustep-dl2-dev.install0000644000000000000000000000055712146133731014175 0ustar usr/include/GNUstep/EOAccess usr/include/GNUstep/EOControl usr/include/GNUstep/EOInterface usr/lib/libEOAccess.so usr/lib/libEOControl.so usr/lib/libEOInterface.so usr/share/GNUstep/Makefiles usr/share/GNUstep/Documentation/EOAccess usr/share/GNUstep/Documentation/EOControl usr/share/GNUstep/Documentation/EOInterface usr/share/GNUstep/Documentation/GDL2 debian/gnustep-dl2.doc-base0000644000000000000000000000062512146133731012735 0ustar Document: gdl2intro Title: GNUstep Database Library Introduction Author: Free Software Foundation Abstract: This document is intended to get people started developing with GDL2. Section: Programming/Objective-C Format: HTML Index: /usr/share/GNUstep/Documentation/GDL2Intro.html Files: /usr/share/GNUstep/Documentation/GDL2Intro_*.html Format: PDF Files: /usr/share/GNUstep/Documentation/GDL2Intro.pdfdebian/gnustep-dl2.manpages0000644000000000000000000000004512146133731013047 0ustar #debian/DBModeler.1 #debian/eoutil.1 debian/copyright0000644000000000000000000000640512146133731011127 0ustar This package was debianized by Brent A. Fulgham on Sat, 28 Feb 2004 21:40:30 -0800 It was downloaded from http://www.gnustep.org/experience/GDL2.html Authors: Mirko Viviani , Gerald Siebke , Manuel Guesdon , David Ayers , Matt Rice License (DBModeler/*): Copyright (C) 2005-2006 Free Software Foundation, Inc. DBModeler is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. DBModeler is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with DBModeler; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. License (/usr/share/GNUstep/Documentation/GDL2Intro*html) Copyright (C) 2006 Free Software Foundation, Inc Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided also that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions. License (everything except DBModeler/* and /usr/share/GNUstep/Documentation/GDL2Intro*html): Copyright (C) 2000-2005 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-3'. The debian packaging is Copyright (c) 2004 Brent A. Fulgham Copyright (c) 2006-2007 Gürkan Sengün Copyright (c) 2010-2013 Federico Gimenez Nieto debian/DBModeler.10000644000000000000000000000246712146133731011057 0ustar .TH DBMODELER 1 "10 March 2010" .SH NAME DBModeler \- graphical management of relational database elements in GNUstep .SH SYNOPSIS 'nh .fi .ad l \fBDBModeler\fR \kx .if (\nx>(\n(.l/2)) .nr x (\n(.l/5) 'in \n(.iu+\nxu 'in \n(.iu-\nxu .ad b 'hy .SH DESCRIPTION This manual page describes briefly the \fIDBModeler\fR command. .PP \fIDBModeler\fR is a GNUstep application that creates EOModels, definitions of mappings between the tables, columns and rows of a relational database to objects within a GNUstep program that uses GNUstep Database Library 2. .PP Existing EOModels may be opened and modified, new ones may be created manually, or even "reverse-engineered" from an existing database if \fIDBModeler\fR is able to connect to an existing database. .PP Some of its main features: .TP 0.2i \(bu create entity-relationship models .TP 0.2i \(bu view models in diagram form .TP 0.2i \(bu reverse-engineer models from existing databases .TP 0.2i \(bu drag-and-drop entities and relationships into Gorm for integration into GUI apps .TP 0.2i \(bu generate databases and table schemas in supported databases .SH SEE ALSO .BR GNUstep (7). .SH AUTHOR DBModeler was written by Matt Rice . .PP This manual page was written by Federico Gim\('enez Nieto for the Debian project (but may be used by others). debian/gnustep-dl2.install0000644000000000000000000000052212146133731012722 0ustar #usr/bin/eoutil #usr/bin/DBModeler usr/include/GNUstep/EOModeler usr/lib/GNUstep/Applications usr/lib/gnustep-dl2/libEOModeler* #debian/*.desktop usr/share/applications/ usr/share/GNUstep/DBModeler.app usr/share/GNUstep/Documentation/GDL2Intro*.html usr/share/GNUstep/Documentation/GDL2Intro.pdf #usr/share/info/GDL2Intro.info debian/source/0000755000000000000000000000000012146133731010467 5ustar debian/source/format0000644000000000000000000000001412146133731011675 0ustar 3.0 (quilt) debian/libgnustep-dl2-dev.doc-base0000644000000000000000000000103712146133731014176 0ustar Document: gdl2api Title: GNUstep Database Library 2 Author: Mirko Viviani Manuel Guesdon David Ayers Matt Rice Abstract: The GNUstep Database Library 2 (GDL2) is a set of libraries to map Objective-C objects to rows of relational database management systems (RDBMS) Section: Programming/Objective-C Format: HTML Index: /usr/share/GNUstep/Documentation/GDL2/GDL2.html Files: /usr/share/GNUstep/Documentation/EO*/*.html debian/gnustep-dl2.dirs0000644000000000000000000000005112146133731012212 0ustar usr/lib/GNUstep usr/share/doc/gnustep-dl2debian/preinst0000644000000000000000000000222212146133731010574 0ustar #!/bin/sh # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `install' # * `install' # * `upgrade' # * `abort-upgrade' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package move_resources() { if [ -d $1 ] && [ ! -L $1 ]; then mkdir -p $2 >/dev/null 2>/dev/null || true # cp + rm is almost equivalent to mv, except that it handles subdirs # properly if the target subdirectory already exists cp -af $1/* $2 >/dev/null 2>/dev/null && rm -rf $1/* || true # just in case cp and rm missed something (dotfiles), move the directory rmdir $1 >/dev/null 2>/dev/null || mv -f $1 "$1.movedbypreinst" fi } case "$1" in install|upgrade) move_resources /usr/lib/GNUstep/Applications/DBModeler.app/Resources \ /usr/share/GNUstep/DBModeler.app ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/watch0000644000000000000000000000017312146133731010221 0ustar version=3 http://www.gnustep.org/experience/GDL2.html ftp://ftp.gnustep.org/pub/gnustep/libs/gnustep-dl2-([\d.]+)\.tar.gz debian/gnustep-dl2-sqlite-adaptor.install0000644000000000000000000000006612146133731015654 0ustar usr/lib/GNUstep/Frameworks/SQLite3EOAdaptor.framework