Minor changes in package building

git-svn-id: file:///svnroot/mdictionary/trunk@101 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/Makefile b/Makefile
index d358d3d..838aea9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ APP_NAME = whitestork
 #versions
 MAJOR_VER = 0
 MINOR_VER = 6
-RELEASE_MAJOR_VER = 0
-RELEASE_MINOR_VER = 6
-RELEASE_PATCH_VER = 0
+RELEASE_MAJOR_VER = 1
+RELEASE_MINOR_VER = 0
+RELEASE_PATCH_VER = RC
 PACK_VER = 1
 FRM_VER = 0.1
 
@@ -83,7 +83,7 @@ ALL_LINGUAS="en_GB"
 
 
 ifeq (${MAKECMDGOALS}, release-package)
-       APP_VER = ${RELEASE_MAJOR_VER}.${RELEASE_MINOR_VER}.`svn info | grep "Revision:" | awk '{print $$2}'`
+       APP_VER = ${RELEASE_MAJOR_VER}.${RELEASE_MINOR_VER}.${RELEASE_PATCH_VER}
 else
        APP_VER = ${MAJOR_VER}.${MINOR_VER}.`svn info | grep "Revision:" | awk '{print $$2}'`
 endif
@@ -317,10 +317,9 @@ mng-deb: ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStorkManager ${BINARIES}/ws_book
                @cp -rf ${MNG_OTHER} ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork
                @install -d ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork/dictionaries/bookmarks
                @cp -rf ${MNG_BOOKMARKS} ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork/dictionaries/bookmarks
-               @echo ${PACKAGES}/${MNG_PACK_NAME}
-#              @-find ${PACKAGES}/${MNG_PACK_NAME} -type d -name .svn -exec echo "jest" \;>> ${LOG_DEBS} 2>> ${LOG_DEBS}
-#              @-find ${PACKAGES}/${MNG_PACK_NAME} -type d -name .svn -exec rm -rf {} \;>> ${LOG_DEBS} 2>> ${LOG_DEBS}
-               @echo po
+               
+               @-find ${PACKAGES}/${MNG_PACK_NAME} -type d -name .svn -exec rm -rf {} \; >> ${LOG_DEBS} 2>> ${LOG_DEBS}
+               
                @sed 's/Version:/Version: '${APP_VER}-${PACK_VER}'/ ' ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control > ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control_backup
                @sed 's/Installed-Size:/Installed-Size: '`du -s ${PACKAGES}/${MNG_PACK_NAME} | awk {'print $$1'}`'/ ' ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control_backup > ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control
                @rm ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control_backup