From: Michael Casadevall <sonicmctails@gmail.com>
Date: Thu, 1 Jan 2009 16:37:37 +0000 (-0500)
Subject: Merge branch 'master' into dm_upload_allowed
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=961f0edec10429397e6db7ff1feac5f343f682c4;hp=0f0cdbd437412d9a01db71a0fc50df4f4357cfdb;p=dak.git

Merge branch 'master' into dm_upload_allowed
---

diff --git a/ChangeLog b/ChangeLog
index 946cf32a..f86cf42f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-30  Michael Casadevall  <sonicmctails@gmail.com>
+
+	* src/sql-aptvc.cpp	- Fixed to work on modern postgresql version
+
+	* src/Makefile		- Gave it a brain on finding postgres headers
+
+        * queue-report.py	- Added changes file to the 822 output for QA team
+
 2008-12-30  Joerg Jaspert  <joerg@debian.org>
 
 	* config/debian/cron.hourly: Generate the 822 format for accepted,
diff --git a/dak/queue_report.py b/dak/queue_report.py
index 9e73d1c3..dfd28616 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -400,7 +400,7 @@ def process_changes_files(changes_files, type, log):
             note = " | [N]"
         else:
             note = ""
-        entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby])
+        entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, cache[filename]["filename"]])
 
     # direction entry consists of "Which field, which direction, time-consider" where
     # time-consider says how we should treat last_modified. Thats all.
@@ -442,7 +442,7 @@ def process_changes_files(changes_files, type, log):
     if Cnf.has_key("Queue-Report::Options::822"):
         # print stuff out in 822 format
         for entry in entries:
-            (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
+            (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry
 
             # We'll always have Source, Version, Arch, Mantainer, and Dist
             # For the rest, check to see if we have them, then print them out
@@ -471,6 +471,7 @@ def process_changes_files(changes_files, type, log):
                 for bugs in closes:
                     bug_string += "#"+bugs+", "
                 log.write("Closes: " + bug_string[:-2] + "\n")
+            log.write("Changes-File: " + os.path.basename(changes_file) + "\n")
             log.write("\n")
 
     if Cnf.has_key("Queue-Report::Options::New"):
diff --git a/src/Makefile b/src/Makefile
index b45b07d8..206f320b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-CXXFLAGS	= -I/usr/include/postgresql/ -I/usr/include/postgresql/server/ -fPIC -Wall
-CFLAGS		= -fPIC -Wall
-LDFLAGS		= -fPIC
-LIBS		= -lapt-pkg
+CXXFLAGS	= -I/usr/include/postgresql/ -I`pg_config --includedir-server` -fPIC -Wall
+CFLAGS		= -fFIC -Wall `pg_config --cflags`
+LDFLAGS		= `pg_config --ldflags`
+LIBS		= -lapt-pkg `pg_config --libs`
 
 C++		= g++
 
diff --git a/src/sql-aptvc.cpp b/src/sql-aptvc.cpp
index 54ba9e92..a9c3e53e 100644
--- a/src/sql-aptvc.cpp
+++ b/src/sql-aptvc.cpp
@@ -26,6 +26,11 @@ extern "C"
 {
 
 #include <postgres.h>
+#include <fmgr.h>
+
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
+#endif
 
   int versioncmp(text *A, text *B);