opkg: Enable Debian style revision field by default and remove "familiar" specific...

[oweals/opkg-lede.git] / libopkg / pkg_parse.c

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index 0bb4433c8d85229fff4a6ab15bea0007359e9d93..a8a1f2ab98d27d206b52ea6c2e7985dc040fe7c2 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -105,9 +105,7 @@ void parseConffiles(pkg_t * pkg, char * raw)
 int parseVersion(pkg_t *pkg, char *raw)
 {
   char *colon, *eepochcolon;
 int parseVersion(pkg_t *pkg, char *raw)
 {
   char *colon, *eepochcolon;

-#ifdef USE_DEBVERSION

   char *hyphen;
   char *hyphen;

-#endif

   unsigned long epoch;
 
   if (!*raw) {
   unsigned long epoch;
 
   if (!*raw) {


@@ -149,23 +147,12 @@ int parseVersion(pkg_t *pkg, char *raw)
   }
   strcpy(pkg->version, raw);
 
   }
   strcpy(pkg->version, raw);
 

-#ifdef USE_DEBVERSION

   hyphen= strrchr(pkg->version,'-');
 
   if (hyphen) {
     *hyphen++= 0;
   hyphen= strrchr(pkg->version,'-');
 
   if (hyphen) {
     *hyphen++= 0;

-    if (strncmp("fam", hyphen, 3) == 0) {
-      pkg->familiar_revision=hyphen+3;
-      hyphen= strrchr(pkg->version,'-');
-      if (hyphen) {
-       *hyphen++= 0;
-       pkg->revision = hyphen;
-      }
-    } else {

       pkg->revision = hyphen;
       pkg->revision = hyphen;

-    }

   }
   }

-#endif

 
 /*
   fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
 
 /*
   fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",