Renamed deb package from ananas4 to ananas

diff --git a/Makefile b/Makefile
index 6af533d..d87c472 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME    = ananas4
+NAME    = ananas
 VERSION = $(shell cat VERSION)
 NAMEV  = $(NAME)-$(VERSION)
 MAKE = make

diff --git a/applications/money/money.rc b/applications/money/money.rc
index 6906350..7a1091d 100644 (file)
--- a/applications/money/money.rc
+++ b/applications/money/money.rc
@@ -1,9 +1,9 @@
 dbpass=111111
-workdir=/usr/share/ananas4/applications/money/
+workdir=/usr/share/ananas/applications/money/
 dbhost=localhost
 dbtitle=Ananas-money
 dbtype=mysql
 dbuser=root
 dbname=ananas_money
-configfile=/usr/share/ananas4/applications/money/money.cfg
+configfile=/usr/share/ananas/applications/money/money.cfg
 dbport=0

diff --git a/build/ubuntu/changelog b/build/ubuntu/changelog
index c6c3741..eb2c742 100644 (file)
--- a/build/ubuntu/changelog
+++ b/build/ubuntu/changelog
@@ -1,4 +1,4 @@
-ananas4 (0.9.5-1~ppa1) karmic; urgency=high
+ananas (0.9.6-1~ppa.1) xenial; urgency=high
 
   * Initial release of debian package
   * Новое расширение для прямой работы с SQL сервером. Предназначено для 
@@ -29,4 +29,4 @@ ananas4 (0.9.5-1~ppa1) karmic; urgency=high
   * Обновлены изображения на заставках, отображаемых при запуске Ананаса и 
   Дизайнера. 
 
- -- Andrey Paskal (app) <apaskal@gmail.com>  Sun, 18 Jan 2009 12:13:55 +0300
+ -- Ananas Project <project@ananas.su>  Mon, 16 Oct 2017 16:00:11 +0300

diff --git a/build/ubuntu/control b/build/ubuntu/control
index 5de3cae..8954000 100644 (file)
--- a/build/ubuntu/control
+++ b/build/ubuntu/control
@@ -1,11 +1,11 @@
-Source: ananas4
+Source: ananas
 Section: utils
 Priority: optional
 Maintainer: Andrey Paskal (app) <apaskal@gmail.com>
 Build-Depends: debhelper (>= 5), qt4-dev-tools, libqt4-dev, libmysqlclient-dev, libqt4-qdataschema, qt4-qmake, libqtassistantclient-dev
 Standards-Version: 3.7.2
 
-Package: ananas4
+Package: ananas
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, zip, unzip, libqtgui4, mysql-client (>=4.1), mysql-server (>=4.1), libqt4-scripttools, libqt4-qdataschema
 Description: Runtime and development environment of Finance Applications

diff --git a/build/ubuntu/postinst b/build/ubuntu/postinst
index ecb17fd..70b4321 100644 (file)
--- a/build/ubuntu/postinst
+++ b/build/ubuntu/postinst
@@ -32,7 +32,7 @@ case "$1" in
        #creates system base for mysql
 #      mysqlshow -u root| grep ananas_system > /dev/null || mysqladmin -u root create ananas_system || :
 
-#      ln -fs /usr/lib/libananasplugin.so /usr/lib/ananas4/libananasplugin.so
+#      ln -fs /usr/lib/libananasplugin.so /usr/lib/ananas/libananasplugin.so
 #      chmod 666 /etc/ananas/* || :
 #      chmod 777 /etc/ananas
     ;;

diff --git a/build/ubuntu/rules b/build/ubuntu/rules
index 6326ccd..377dbcc 100755 (executable)
--- a/build/ubuntu/rules
+++ b/build/ubuntu/rules
@@ -59,20 +59,20 @@ install: build
 
        # Add here commands to install the package into debian/ananas.
 
-       mkdir -p $(CURDIR)/debian/ananas4/usr/share/ananas4/translations
-       mkdir -p $(CURDIR)/debian/ananas4/usr/share/ananas4/templates
-       mkdir -p $(CURDIR)/debian/ananas4/usr/share/applications
-       mkdir -p $(CURDIR)/debian/ananas4/usr/share/pixmaps
-       mkdir -p $(CURDIR)/debian/ananas4/usr/lib/menu
+       mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/translations
+       mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/templates
+       mkdir -p $(CURDIR)/debian/ananas/usr/share/applications
+       mkdir -p $(CURDIR)/debian/ananas/usr/share/pixmaps
+       mkdir -p $(CURDIR)/debian/ananas/usr/lib/menu
        cd src && \
        $(MAKE) install \
-       INSTALL_ROOT=$(CURDIR)/debian/ananas4 LIBDIR=/usr/lib \
-       BINDIR=/usr/bin INCLUDEDIR=/usr/include/ananas4 
+       INSTALL_ROOT=$(CURDIR)/debian/ananas LIBDIR=/usr/lib \
+       BINDIR=/usr/bin INCLUDEDIR=/usr/include/ananas 
        #cd ../doc && qmake doc.pro -o Makefile && make install INSTALL_ROOT=$(CURDIR)/debian/ananas \
        #DOCDIR=$(CURDIR)/debian/ananas/usr/share/doc/ananas
 
-       cp -f ./translations/*.qm $(CURDIR)/debian/ananas4/usr/share/ananas4/translations
-       cp -f ./src/designer/templates/*.* $(CURDIR)/debian/ananas4/usr/share/ananas4/templates
+       cp -f ./translations/*.qm $(CURDIR)/debian/ananas/usr/share/ananas/translations
+       cp -f ./src/designer/templates/*.* $(CURDIR)/debian/ananas/usr/share/ananas/templates
 
 
        # clear debug info
@@ -83,9 +83,9 @@ install: build
 #      strip $(CURDIR)/debian/$(package)/usr/lib/ananas/qt4plugins/sqldrivers/libqsqlmysqlu.so
        
 
-       cp -f ./build/menus/kde/ananas.desktop $(CURDIR)/debian/ananas4/usr/share/applications/
-       cp -f ./build/menus/kde/ananas-designer.desktop $(CURDIR)/debian/ananas4/usr/share/applications/
-       cp -f ./build/icons/*.png $(CURDIR)/debian/ananas4/usr/share/pixmaps/
+       cp -f ./build/menus/kde/ananas.desktop $(CURDIR)/debian/ananas/usr/share/applications/
+       cp -f ./build/menus/kde/ananas-designer.desktop $(CURDIR)/debian/ananas/usr/share/applications/
+       cp -f ./build/icons/*.png $(CURDIR)/debian/ananas/usr/share/pixmaps/
 
        # inventory
 #      mkdir -p $(CURDIR)/debian/ananas/etc/ananas
@@ -102,7 +102,7 @@ install: build
 
 #      rm -Rf $(CURDIR)/debian/ananas/usr/include/ananas || :
 #      rm -f $(CURDIR)/debian/ananas/usr/share/doc/ananas/*.tex || :
-       find $(CURDIR)/debian/ananas4/ || :
+       find $(CURDIR)/debian/ananas/ || :
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/src/admin/admin.pro b/src/admin/admin.pro
index dd15806..f33daaa 100644 (file)
--- a/src/admin/admin.pro
+++ b/src/admin/admin.pro
@@ -1,5 +1,5 @@
 #project for Administrator application from Ananas automation accounting system
-TARGET = ananas4-administrator
+TARGET = ananas-administrator
 include ( ../lib/lib.pri )
 include ( ../plugins/plugins.pri )
 include ( ../ananas.pri )
@@ -11,8 +11,8 @@ TEMPLATE      = app
 LANGUAGE       = C++
 DESTDIR = ../../bin
 
-LIBS   += -L../../lib -lananas4 
-LIBS    += -L../../lib/designer -lananasplugin4 -lqt4-qdataschema -L$(QTDIR)/lib
+LIBS   += -L../../lib -lananas 
+LIBS    += -L../../lib/designer -lananasplugin -lqt4-qdataschema -L$(QTDIR)/lib
 
 INCLUDEPATH    += ../lib ../lib/tmp/ui ../lib/.ui
 
@@ -62,8 +62,8 @@ TRANSLATIONS = \
 
 unix {
         target.path = /$(BINDIR)
-#        aadmin.files = ananas4-administrator
-#        aadmin.extra = cp -df ananas4-administrator $(INSTALL_ROOT)$(BINDIR)
+#        aadmin.files = ananas-administrator
+#        aadmin.extra = cp -df ananas-administrator $(INSTALL_ROOT)$(BINDIR)
      }
 
 INSTALLS += target

diff --git a/src/ananas/ananas.pro b/src/ananas/ananas.pro
index b8acc6b..1f60af7 100644 (file)
--- a/src/ananas/ananas.pro
+++ b/src/ananas/ananas.pro
@@ -6,14 +6,14 @@ QT += script
 QT += scripttools
 
 
-TARGET = ananas4
+TARGET = ananas
 TEMPLATE = app
 
 DESTDIR = ../../bin
 
 INCLUDEPATH += ../lib ../../tmp/ui/ananas ../plugins
-#LIBS += -L../../lib -lananas4 -L../../lib/designer -lananasplugin4 
-LIBS += -L../../lib -lananas4 -L../../lib/designer -lananasplugin4 -lqt4-qdataschema 
+#LIBS += -L../../lib -lananas -L../../lib/designer -lananasplugin 
+LIBS += -L../../lib -lananas -L../../lib/designer -lananasplugin -lqt4-qdataschema 
 
 HEADERS = \
     mainform.h
@@ -33,7 +33,7 @@ TRANSLATIONS = \
     
 unix {
     target.path = /$(BINDIR)
-#    ananas.files = ananas4
+#    ananas.files = ananas
 }
 win32{
 #    ananas.path =.

diff --git a/src/ananas/main.cpp b/src/ananas/main.cpp
index 1aefbe2..ee78c1e 100644 (file)
--- a/src/ananas/main.cpp
+++ b/src/ananas/main.cpp
@@ -145,7 +145,7 @@ int main( int argc, char ** argv )
        qApp->addLibraryPath( qApp->applicationDirPath() );
 #else
        pixmap = QPixmap( "/usr/share/ananas/designer/locale/engine-splash-"+lang+".png" );
-       qApp->addLibraryPath( "/usr/lib/ananas4" );
+       qApp->addLibraryPath( "/usr/lib/ananas" );
 #endif
        //--printf("extensions: \n%s\n",( const char *) AExtensionFactory::keys().join("\n") );
 // Test create extension

diff --git a/src/designer/designer.pro b/src/designer/designer.pro
index 554a054..1fc1cbe 100644 (file)
--- a/src/designer/designer.pro
+++ b/src/designer/designer.pro
@@ -1,6 +1,6 @@
 include(../plugins/plugins.pri)
 include(../lib/lib.pri)
-TARGET = ananas4-designer
+TARGET = ananas-designer
 TEMPLATE = app
 
 CONFIG += designer
@@ -8,7 +8,7 @@ CONFIG += designer
 DESTDIR = ../../bin
 
 INCLUDEPATH += . ./formdesigner ./formdesigner/private  ../lib ../../tmp/ui/ananas ../plugins ../editor
-LIBS += -L../../lib -lananas4 -lqt4designer -L../../lib/designer -lananasplugin4 -lqt4-qdataschema -L../editor -lqtscriptedit
+LIBS += -L../../lib -lananas -lqt4designer -L../../lib/designer -lananasplugin -lqt4-qdataschema -L../editor -lqtscriptedit
 unix {
     #LIBS += -L$(QTINC)/QtDesigner
     LIBS += -lQtDesignerComponents

diff --git a/src/designer/main.cpp b/src/designer/main.cpp
index 6eaeb83..19f1257 100644 (file)
--- a/src/designer/main.cpp
+++ b/src/designer/main.cpp
@@ -57,7 +57,7 @@ int setTranslator(QString langdir, QString lang)
 //#ifdef Q_OS_WIN32
 //     langdir = qApp->applicationDirPath()+"/translations/";
 //#else
-//     langdir = "/usr/share/ananas4/translations/";
+//     langdir = "/usr/share/ananas/translations/";
 //#endif
        tr_app.load( langdir+"ananas-designer-"+lang+".qm",".");
        tr_lib.load( langdir+"ananas-lib-"+lang+".qm",".");
@@ -159,9 +159,9 @@ int main( int argc, char ** argv )
        pixmap = QPixmap( qApp->applicationDirPath()+"/designer-splash-"+lang+".png" );
        qApp->addLibraryPath( qApp->applicationDirPath() );
 #else
-       pixmap = QPixmap( "/usr/share/ananas4/designer/locale/designer-splash-"+lang+".png" );
-//     qApp->addLibraryPath( "/usr/lib/ananas4/" );
-//     qApp->setLibraryPaths( QStringList() <<"/usr/lib/ananas4/" );
+       pixmap = QPixmap( "/usr/share/ananas/designer/locale/designer-splash-"+lang+".png" );
+//     qApp->addLibraryPath( "/usr/lib/ananas/" );
+//     qApp->setLibraryPaths( QStringList() <<"/usr/lib/ananas/" );
 #endif
        foreach (QString path, app.libraryPaths())
            printf("%s\n", path.toUtf8().data());

diff --git a/src/extensions/aextsql/aextsql.pro b/src/extensions/aextsql/aextsql.pro
index 4012370..4ce8912 100644 (file)
--- a/src/extensions/aextsql/aextsql.pro
+++ b/src/extensions/aextsql/aextsql.pro
@@ -17,14 +17,14 @@ TEMPLATE    =lib
 CONFIG += plugin
 
 INCLUDEPATH    += ../../lib 
-LIBS   += -L../../../lib -lananas4
+LIBS   += -L../../../lib -lananas
 
 LANGUAGE       = C++
 win32:DESTDIR = ..
 #win32:DLLDESTDIR      = ..
 
 unix{
-       target.path = /$(LIBDIR)/ananas4 
+       target.path = /$(LIBDIR)/ananas 
 #      libext.files = libaextsql.so
        INSTALLS += target
 }

diff --git a/src/extensions/example/example.pro b/src/extensions/example/example.pro
index adfeb02..090aab8 100644 (file)
--- a/src/extensions/example/example.pro
+++ b/src/extensions/example/example.pro
@@ -9,7 +9,7 @@ win32:DEFINES+= ANANAS_DLL
 win32:DEFINES   += ANANAS_NO_DLL
 }
 TEMPLATE       =lib
-LIBS   += -L../../../lib -lananas4
+LIBS   += -L../../../lib -lananas
 CONFIG         += plugin
 INCLUDEPATH    += ../../lib 
 LANGUAGE       = C++

diff --git a/src/extensions/meta/meta.pro b/src/extensions/meta/meta.pro
index bfe2fec..3e0ce38 100644 (file)
--- a/src/extensions/meta/meta.pro
+++ b/src/extensions/meta/meta.pro
@@ -9,14 +9,14 @@ win32:DEFINES+= ANANAS_DLL
 win32:DEFINES   += ANANAS_NO_DLL
 }
 TEMPLATE       =lib
-LIBS   += -L../../../lib -lananas4
+LIBS   += -L../../../lib -lananas
 CONFIG         += plugin
 INCLUDEPATH    += ../../lib 
 LANGUAGE       = C++
 win32:DESTDIR = ..
 
 unix{
-        target.path = $$(LIBDIR)/ananas4
+        target.path = $$(LIBDIR)/ananas
 #        libmeta.files = libaext_meta.so
         INSTALLS += libmeta
 }

diff --git a/src/extensions/service/service.pro b/src/extensions/service/service.pro
index 61a6931..c7ef993 100644 (file)
--- a/src/extensions/service/service.pro
+++ b/src/extensions/service/service.pro
@@ -16,13 +16,13 @@ TEMPLATE    =lib
 CONFIG += plugin
 
 INCLUDEPATH    += ../../lib 
-LIBS   += -L../../../lib -lananas4
+LIBS   += -L../../../lib -lananas
 
 LANGUAGE       = C++
 win32:DESTDIR = ..
 
 unix{
-       target.path = /$(LIBDIR)/ananas4
+       target.path = /$(LIBDIR)/ananas
 #      libext.files = libaextservice.so
         INSTALLS += target
 }

diff --git a/src/extensions/te/te.pro b/src/extensions/te/te.pro
index d2c5543..64010af 100644 (file)
--- a/src/extensions/te/te.pro
+++ b/src/extensions/te/te.pro
@@ -26,7 +26,7 @@ win32 {
 win32:DESTDIR = ..
 
 unix{
-        target.path = $$(LIBDIR)/ananas4
+        target.path = $$(LIBDIR)/ananas
 #        libext.files = libaextte.so
         INSTALLS += target
 }

diff --git a/src/extensions/text/text.pro b/src/extensions/text/text.pro
index 5dcbb03..3bca810 100644 (file)
--- a/src/extensions/text/text.pro
+++ b/src/extensions/text/text.pro
@@ -10,13 +10,13 @@ win32:DEFINES   += ANANAS_NO_DLL
 }
 TEMPLATE       =lib
 CONFIG += plugin
-LIBS   += -L../../../lib -lananas4
+LIBS   += -L../../../lib -lananas
 INCLUDEPATH    += ../../lib 
 LANGUAGE       = C++
 win32:DESTDIR = ..
 
 unix{
-        target.path = /$(LIBDIR)/ananas4
+        target.path = /$(LIBDIR)/ananas
 #        libext.files = libaexttext.so
         INSTALLS += target
 }

diff --git a/src/extensions/xml/xml.pro b/src/extensions/xml/xml.pro
index a4d4325..504f638 100644 (file)
--- a/src/extensions/xml/xml.pro
+++ b/src/extensions/xml/xml.pro
@@ -16,13 +16,13 @@ TEMPLATE    =lib
 CONFIG += plugin
 
 INCLUDEPATH    += ../../lib 
-LIBS   += -L../../../lib -lananas4
+LIBS   += -L../../../lib -lananas
 
 LANGUAGE       = C++
 win32:DESTDIR = ..
 
 unix{
-        target.path = /$(LIBDIR)/ananas4
+        target.path = /$(LIBDIR)/ananas
 #        libext.files = libaextxml.so
         INSTALLS += target
 }

diff --git a/src/lib/aextensionfactory.cpp b/src/lib/aextensionfactory.cpp
index 9992629..ee1a44a 100644 (file)
--- a/src/lib/aextensionfactory.cpp
+++ b/src/lib/aextensionfactory.cpp
@@ -59,7 +59,7 @@ AExtensionFactoryPrivate::AExtensionFactoryPrivate()
 #ifdef Q_OS_WIN32
     extensionsDirName = qApp->applicationDirPath()+"/extensions";
 #else
-    extensionsDirName = "/usr/lib/ananas4";
+    extensionsDirName = "/usr/lib/ananas";
 #endif
 
     hash.clear();

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 6b81639..39b3818 100644 (file)
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -5,7 +5,7 @@ QT += script
 QT += scripttools
 
 
-TARGET = ananas4
+TARGET = ananas
 TEMPLATE = lib 
 shared:CONFIG += dll
 unix:VERSION = 1.0.1
@@ -107,8 +107,8 @@ unix{
 
 win32 {
     alib.path = $$(QTDIR)\lib
-    alib.files += ananas4.dll
-    alib.files += ananas4.lib
+    alib.files += ananas.dll
+    alib.files += ananas.lib
 #    alibheader.path = $(INCLUDEDIR)
 #    alibheader.files = $$HEADERS
 #    alibheader.files += tmp\ui\*h

diff --git a/src/lib/sys/aapplication.cpp b/src/lib/sys/aapplication.cpp
index b0f0046..d3cd518 100644 (file)
--- a/src/lib/sys/aapplication.cpp
+++ b/src/lib/sys/aapplication.cpp
@@ -61,7 +61,7 @@ AApplication::langDir()
 #ifdef _Windows
        return applicationDirPath()+"/";
 #else
-       return "/usr/share/ananas4/translations/";
+       return "/usr/share/ananas/translations/";
 #endif
 }
 

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 92e2c45..2876c66 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,5 +1,5 @@
 #!define TARGET first for correct temporray paths definitions
-TARGET = ananasplugin4
+TARGET = ananasplugin
 
 include( plugins.pri )
 include( ../lib/lib.pri )
@@ -15,7 +15,7 @@ DESTDIR = ../../lib/designer
 DLLDESTDIR = ../../bin
 
 INCLUDEPATH += ../plugins ../lib 
-LIBS += -L../../lib -lananas4 
+LIBS += -L../../lib -lananas 
 
 shared {
     win32:DEFINES+= QT_PLUGIN # ANANAS_DLL
@@ -55,8 +55,8 @@ TRANSLATIONS = \
 #SLASH = /
 unix {
     target.path = /$(LIBDIR)
-#    lplugin.files = libananasplugin4.so
-#    lplugin.extra = cp -f $(DESTDIR)/libananasplugin4.so $(INSTALL_ROOT)$(LIBDIR) || true
+#    lplugin.files = libananasplugin.so
+#    lplugin.extra = cp -f $(DESTDIR)/libananasplugin.so $(INSTALL_ROOT)$(LIBDIR) || true
     lpluginheader.path = /$(INCLUDEDIR)
     lpluginheader.files = $$HEADERS
 }  
@@ -64,8 +64,8 @@ unix {
 win32 {
 #   target.path = $(QTDIR)\plugins\designer
     lplugin.path = $(QTDIR)\plugins\designer
-    lplugin.files = ananasplugin4.*
-    lplugin.extra = copy ananasplugin4.* $(QTDIR)\lib
+    lplugin.files = ananasplugin.*
+    lplugin.extra = copy ananasplugin.* $(QTDIR)\lib
     INSTALLS += lplugin 
 }  
 

diff --git a/src/test/test.pro b/src/test/test.pro
index fefd2e3..f0ffb83 100644 (file)
--- a/src/test/test.pro
+++ b/src/test/test.pro
@@ -1,4 +1,4 @@
-TARGET = ananas4-test 
+TARGET = ananas-test 
 include(../lib/lib.pri)
 include(../plugins/plugins.pri)
 include(../ananas.pri )
@@ -16,5 +16,5 @@ CONFIG +=qtestlib
 FORMS  = 
 TEMPLATE       =app
 INCLUDEPATH    += ../lib ../plugins
-LIBS   += -L$(QTDIR)/lib -lqsa -L../../lib -lananas4
-LIBS   += -L../../lib/designer -lananasplugin4 -lqt4-qdataschema
+LIBS   += -L$(QTDIR)/lib -lqsa -L../../lib -lananas
+LIBS   += -L../../lib/designer -lananasplugin -lqt4-qdataschema