General cleanup

Changes on Makefile to fix lack of soft links on shared lib.
Changes on md5.h to reflect md5c.c.
Fixed few packaging problems.

diff --git a/ChangeLog b/ChangeLog
index 22bb3b398897953cfebb9beb88788918a7e6a833..42e37ec4eba703144b9655b9aa541acaf72a8380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-03  Hector Garcia  <hector@debian.org>
+
+       * Makefile: Fixed to place soft links instead in soname and shared_so
+       instead of copying files.
+       * debian/rules: Added --sourcedir=debian/tmp to dh_install so it works
+       properly.
+       * md5.h: Commented out all the functions not available on md5c.c
+       * debian/libbsd-dev: Changed usr/include/bsd/ to usr/include
+       
 2005-07-26  Guillem Jover  <guillem@debian.org>
 
        * Makefile (LIB_INCLUDES): Add "md5.h".

diff --git a/Makefile b/Makefile
index 3fd83ff8d5a857f12d619d23e8e9598ae0d00ef9..1a08c258ce3a3ed94dab6cdd11919a94bf45a907 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,12 @@ install: libs
        mkdir -p $(DESTDIR)/usr/lib/
        mkdir -p $(DESTDIR)/usr/include/bsd/
        install -m644 $(LIB_STATIC) $(DESTDIR)/usr/lib/
-       install -m644 $(LIB_SONAME) $(DESTDIR)/usr/lib/
+       #install -m644 $(LIB_SONAME) $(DESTDIR)/usr/lib/
        install -m644 $(LIB_SHARED) $(DESTDIR)/usr/lib/
-       install -m644 $(LIB_SHARED_SO) $(DESTDIR)/usr/lib/
+       #install -m644 $(LIB_SHARED_SO) $(DESTDIR)/usr/lib/
        install -m644 $(LIB_INCLUDES) $(DESTDIR)/usr/include/bsd/
+       cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SHARED_SO)
+       cd $(DESTDIR)/usr/lib/ ; ln -fs $(LIB_SHARED) $(LIB_SONAME)
 
 clean:
        rm -f $(LIB_STATIC_OBJS)

diff --git a/md5.h b/md5.h
index 4eabbf9fc7f8601672de4bb245ca8fedcb5ec84c..8d709aa835048836ede3c6fe0bf91dbb8e843d42 100644 (file)
--- a/md5.h
+++ b/md5.h
@@ -40,9 +40,9 @@ void   MD5Init (MD5_CTX *);
 void   MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
 void   MD5Pad (MD5_CTX *);
 void   MD5Final (unsigned char [16], MD5_CTX *);
-char * MD5End(MD5_CTX *, char *);
-char * MD5File(const char *, char *);
-char * MD5FileChunk(const char *, char *, off_t, off_t);
-char * MD5Data(const unsigned char *, unsigned int, char *);
+//char * MD5End(MD5_CTX *, char *);
+//char * MD5File(const char *, char *);
+//char * MD5FileChunk(const char *, char *, off_t, off_t);
+//char * MD5Data(const unsigned char *, unsigned int, char *);
 __END_DECLS
 #endif /* _SYS_MD5_H_ */