the previously used VERSION didn't work everywhere so we are switching

to the more standard PACKAGE_VERSION and make it work in every file

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index a1c47c030ae2ff41eb3c79b5855d5bae52e2b646..76278921f7e29ed60e770a479cdd97947b489e8d 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -24,7 +24,7 @@
 
 #define Stringfy_(x) # x
 #define Stringfy(x)  Stringfy_(x)
-const char *pkgVersion = VERSION;
+const char *pkgVersion = PACKAGE_VERSION;
 const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
                             Stringfy(APT_PKG_MINOR) "." 
                             Stringfy(APT_PKG_RELEASE);

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 4798fe3f53d487c4f18e065d0f7eb4fc05cc7fa1..87918bbec27b41d063bda7ec46ca0206c64504fc 100644 (file)
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -39,10 +39,10 @@
 /* Define the arch name string */
 #undef COMMON_ARCH
 
-/* The version number string */
-#undef VERSION
-
 /* The package name string */
 #undef PACKAGE
 
+/* The version number string */
+#undef PACKAGE_VERSION
+
 #define APT_8_CLEANER_HEADERS

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index fdac3e6c3ec6b9c77c28c9634f17433497bed9f9..b8ddb34a2a3fb3019c33efaade74210fdc5705f5 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -2,6 +2,7 @@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 
 # C++ compiler options
 CC = @CC@

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 94654ffd4c8864cd5227aa064f7bfa660fe17193..ce869581b47d3228fdb09ba87b4507ce09565adb 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1676,7 +1676,7 @@ bool GenCaches(CommandLine &Cmd)
 /* */
 bool ShowHelp(CommandLine &Cmd)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
    
    if (_config->FindB("version") == true)

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 0017d954e874e3ae293f54ef790b34f7bc2c3662..2551f49161e9fc07fe5b775a708e339a6e816eb9 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -195,7 +195,7 @@ bool DoIdent(CommandLine &)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 47bedfe3f4d10280465720264a92aa8a0711f353..79ae944df1f8e0e2417789b4d535b04ddf2743aa 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -72,7 +72,7 @@ bool DoDump(CommandLine &CmdL)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;

diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index e82e15c6e3a5c6c791d42f8b6baffb17f80a06ae..aa16b127149f74fe2114e720aa23d3520498c9ea 100644 (file)
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -21,7 +21,7 @@
 bool ShowHelp() {
 
        std::cout <<
-               PACKAGE " " VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
+               PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index dc4c110a122fbbd0261c808f8039bd7c4325f14b..60efafba544283d9b0ee0c569abfab0297bbe2f1 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -224,7 +224,7 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
 
        if (_config->FindB("version") == true) 

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index f4ad75d1c5ba4a820d7a752e9cd3cc5c4cfe1973..ac1566f307ba566f497f79937d6bf582cacb8f58 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -3295,7 +3295,7 @@ bool DoMoo(CommandLine &CmdL)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
            
    if (_config->FindB("version") == true)

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 1b636e4d5fe6c6851a7cc5f718cdb07e455bc30f..25ecb7af1d0773c13fb5bed21c4ef7367b192fb0 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -29,7 +29,7 @@
 // ---------------------------------------------------------------------
 /* */
 bool ShowHelp(CommandLine &CmdL) {
-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index ef43317142210573455bc40aff6b6a0f2df70c50..2d5eed29d273d4d0e21ef98f9645b64b630e44d6 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -360,7 +360,7 @@ bool ShowHold(CommandLine &CmdL)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
 
    cout <<

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 20ae14f2abf8e52e292a286f1eb066abec3d2c6b..46989044e6cb49088fbd745afbfda24c15972439 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -144,7 +144,7 @@ bool DoIt(string InFile)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;

diff --git a/configure.in b/configure.in
index 065afccf1f47f9e6d519d864a3cea9657ee4dea7..78ad06b724bf5e41113c79fe3d9ef90ad9711861 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,11 +17,12 @@ AC_INIT(configure.in)
 AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
-dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp9")
 PACKAGE="apt"
+PACKAGE_VERSION="0.8.16~exp14"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 AC_SUBST(PACKAGE)
+AC_SUBST(PACKAGE_VERSION)
 
 dnl Check the archs, we want the target type.
 AC_CANONICAL_SYSTEM
@@ -218,4 +219,4 @@ fi
 AC_SUBST(USE_NLS)
 AC_PATH_PROG(BASH, bash)
 
-AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs)
+AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs)

diff --git a/debian/rules b/debian/rules
index 9eda3a8fa0056f8cef5c827f7ea69a5b4ff5f0cc..00e6bd4b7e5aaa159285d4b4cd4b63375fdf8bc8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ build:
 PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//')
-APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
+APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')
 
 # Determine the build directory to use

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 43d961443dc3d86ca4460f8d80a16599b6f90b7f..cf79aff8596a8b6d823f0c525c7b6a1edf1d4b99 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -31,7 +31,7 @@ PROJECT_NAME           = @PACKAGE@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @VERSION@
+PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

diff --git a/doc/makefile b/doc/makefile
index fca0bfa0d38c25ceefaf1ab8af9ebc15d3d1b417..0817821b602a708a985c7b23d293d2f77f7c6d1e 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -91,9 +91,6 @@ doxygen-clean:
        rm -fr $(BUILD)/doc/doxygen
        rm -f $(BUILD)/doc/doxygen-stamp
 
-$(BUILD)/doc/Doxyfile: Doxyfile.in
-       (cd $(BUILD) && ./config.status doc/Doxyfile)
-
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
        rm -fr $(BUILD)/doc/doxygen
        mkdir $(BUILD)/doc/doxygen  # some versions seem to not create this directory #628799

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index f289eb00dbe0334155c55ea25a0fe4aae1d18b0d..4efbecc8ced7606ce3269335e56e6459c14f91b0 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -587,7 +587,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return true;

diff --git a/methods/http.cc b/methods/http.cc
index d2e03cfbc13352c295e13080d38c3f20a8beed73..c62ca71d38e51a0569d244ec39b983e6b6cc4965 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -758,7 +758,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
-               "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
+               "Debian APT-HTTP/1.3 ("PACKAGE_VERSION")") + "\r\n\r\n";
    
    if (Debug == true)
       cerr << Req << endl;

diff --git a/methods/https.cc b/methods/https.cc
index 4f2d581d26ab544382116761b81fe1849b66da6e..fac7ba7907eab896027cd7d743f6e0ad901d10d5 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -219,7 +219,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
        _config->Find("Acquire::https::User-Agent",
                _config->Find("Acquire::http::User-Agent",
-                       "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
+                       "Debian APT-CURL/1.0 ("PACKAGE_VERSION")").c_str()).c_str());
 
    // set timeout
    int const timeout = _config->FindI("Acquire::https::Timeout",

diff --git a/po/makefile b/po/makefile
index 6a2bc416d1d45a0d63be1aaf49dd7cd1e900c125..46b75ff4f721ce814a3716fc0107f13b5367606d 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -70,7 +70,7 @@ $(PACKAGE)-all.pot: $(POTFILES)
        # but we want a header for our master-pot file, so we use a dummy pot with nothing but the header
        $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \
                -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name=$(PACKAGE) \
-               --package-version=$(VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null
+               --package-version=$(PACKAGE_VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null
        $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot
        rm -f $(PO)/$(PACKAGE)-dummy.pot