2010-07-27 23:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

- package/debian
  + debian
  * INSTALL
    * Moved back to root. Seems like this MUST be in root and there 
      is no way to tell debhelper tools otherwise.

  * debian/rules
    % Deleted unnecessary stuff. Pls review me.

  * config/global.mk
    ! Minor in comments.

harbour/ChangeLog

@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-27 23:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - package/debian
+  + debian
+  * INSTALL
+    * Moved back to root. Seems like this MUST be in root and there
+      is no way to tell debhelper tools otherwise.
+
+  * debian/rules
+    % Deleted unnecessary stuff. Pls review me.
+
+  * config/global.mk
+    ! Minor in comments.
+
 2010-07-27 22:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/postinst.hbs
     + Added more feedback.

harbour/INSTALL

@@ -224,7 +224,7 @@ HARBOUR
    Binary .deb on Linux
    --------------------
 
-      $ fakeroot package/debian/rules binary
+      $ fakeroot debian/rules binary
 
    Binary .rpm on Linux
    --------------------

harbour/config/global.mk

@@ -1464,12 +1464,12 @@ ifeq ($(HB_BUILD_PKG),yes)
 
       # HB_TOP             - dir where packages will be created (root of Harbour source tree)
       # HB_INSTALL_PKG_TOP - dir which has to be packed
-      # HB_PKGNAME         - name of the install package on non-*nix
+      # HB_PKGNAME         - name of the install package
       # HB_INSTALL_PREFIX  - dir where Harbour dirs will be created
       #
-      #   <HB_TOP><plat/comp ><HB_PKGNAME>
+      #   <HB_TOP><plat/comp ><HB_BUILD_PKG_PREFIX>
       #   <HB_INSTALL_PKG_TOP>
-      #   <HB_INSTALL_PREFIX             >
+      #   <HB_INSTALL_PREFIX                      >
       #
 
       ifneq ($(HB_SRC_ROOTPATH),)

harbour/debian/rules

@@ -11,19 +11,9 @@ export HB_LIB_INSTALL := $(CURDIR)/debian/harbour/usr/lib/harbour
 export HB_INC_INSTALL := $(CURDIR)/debian/harbour/usr/include/harbour
 export HB_DOC_INSTALL := $(CURDIR)/debian/harbour/usr/share/doc/harbour
 export HB_ETC_INSTALL := $(CURDIR)/debian/harbour/etc/harbour
-
-# is INSTDIR necessary for dpkg? If not then please remove it.
-export INSTDIR := $(CURDIR)/debian/harbour
-
+export HB_BUILD_PKG := no
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-   HB_USER_CFLAGS += -O0
-else
-   HB_USER_CFLAGS += -O3
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
-else
-   HB_USER_CFLAGS := -g
+   export HB_BUILD_OPTIM := no
 endif
 
 build: build-stamp
@@ -51,7 +41,6 @@ install: build
 	dh_installdirs
 
 	make install
-	install -m644 src/rtl/gtcrs/hb-charmap.def $(HB_ETC_INSTALL)/hb-charmap.def
 
 
 # Build architecture-independent files here.