SVN Commit by dpage: r4220 - branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

SVN Commit by dpage: r4220 - branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian

SVN-13
Author: dpage
Date: 2005-05-20 09:09:22 +0100 (Fri, 20 May 2005)
New Revision: 4220

Modified:
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/changelog
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/control
   branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/rules
Log:
here is an update to the pkg/debian for REL-1_2_0_PATCHES branch. After that and the latest acinclude.m4 discussion, it should be fine for me to go for a release.
[Rapha?\195?\171l Enrici]

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/changelog
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/changelog 2005-05-19 14:53:32 UTC (rev 4219)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/changelog 2005-05-20 08:09:22 UTC (rev 4220)
@@ -1,3 +1,17 @@
+pgadmin3 (1.2.1pre1.2.2-0.1) experimental; urgency=low
+
+  * Just a build of what should become 1.2.2.
+  * Replaced libwxgtk2.5-dev by pgadmin3-libwxgtk2ud2.6 in debian/control.
+    until Ron is able to provide an updated wx2.6 package for Debian.
+  * Added automake1.9 and autoconf to debian/control. (automake1.9 should
+    be rechecked...).
+  * Changed wx-config to wx-config-pgadmin3 in debian/rules.
+  * Added bootstrap sequence to the build.
+  * New Adam's acinclude.m4 will be incorporated to this build if not
+    included in the 1.2.x branch.
+
+ -- Raphael Enrici <[hidden email]>  Thu, 19 May 2005 19:13:44 +0000
+
 pgadmin3 (1.2.0-2) unstable; urgency=low
 
   * Renamed debian/NEWS.Debian to debian/pgadmin3.NEWS so that it is correctly

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/control
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/control 2005-05-19 14:53:32 UTC (rev 4219)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/control 2005-05-20 08:09:22 UTC (rev 4220)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Raphael Enrici <[hidden email]>
-Build-Depends: debhelper (>= 4.1.0), postgresql-dev (>=7.3), devscripts, libwxgtk2.5-dev (>= 2.5.3.2)
+Build-Depends: debhelper (>= 4.1.0), postgresql-dev (>=7.3), devscripts, pgadmin3-libwxgtk2ud2.6, automake1.9, autoconf
 Standards-Version: 3.6.1
 
 Package: pgadmin3

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/rules
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/rules 2005-05-19 14:53:32 UTC (rev 4219)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/pkg/debian/rules 2005-05-20 08:09:22 UTC (rev 4220)
@@ -10,7 +10,7 @@
 pkg-data=$(pkg)-data
 
 # The name of the wxWidgets config script we invoke later in configure
-_PGA3_WXCONFIG ?= wx-config
+_PGA3_WXCONFIG ?= wx-config-pgadmin3
 
 # A hack to get it compile without errors concerning MNU_NEW
 _pgsql_inc:="/usr/include/postgresql -I./include"
@@ -42,6 +42,8 @@
 #endif
 
 # Here goes the pgAdmin3 stuff
+configure:
+ sh bootstrap
 
 config.status: configure
  dh_testdir
@@ -72,6 +74,7 @@
  # Add here commands to clean up after the build process.
  -$(MAKE) clean
  -$(MAKE) distclean
+ -rm configure
  -rm config.status
  -rm config.cache
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""


---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
      subscribe-nomail command to [hidden email] so that your
      message can get through to the mailing list cleanly