Thread: debian package patch

Dear all,

here is a patch for pkg/debian tree in cvs:
- adds support for the .desktop file.
- adds entries that were done in 1.0.2 maintenance update to the
debian/changelog.
- corrects the wx build dependencies

I hope to produce another patch soon including the "one shot package"
which should become the official package for debian

If someone can apply it to cvs... :)

Regards,
Raphaël.
diff -ru pkg.orig/debian/changelog pkg/debian/changelog
--- pkg.orig/debian/changelog    Fri Sep  5 09:28:33 2003
+++ pkg/debian/changelog    Sun Nov 30 17:15:59 2003
@@ -1,3 +1,23 @@
+pgadmin3 (1.0.2-0.1) unstable; urgency=low
+
+  * Second maintenance update.
+  * Added desktop file
+
+ -- Raphael Enrici <pgadmin-hackers@postgresql.org>  Sat, 29 Nov 2003 18:06:42 +0000
+
+pgadmin3 (1.0.1-0.1) unstable; urgency=low
+
+  * First maintenance update.
+  * SSL support should be ok
+
+ -- Raphael Enrici <pgadmin-hackers@postgresql.org>  Sat, 18 Oct 2003 09:27:12 +0000
+
+pgadmin3 (1.0.0-0.1) unstable; urgency=low
+
+  * First stable release.
+
+ -- Raphael Enrici <pgadmin-hackers@postgresql.org>  Fri, 26 Sep 2003 20:43:49 +0000
+
 pgadmin3 (0.9.2-0.0) unstable; urgency=low

   * Second BETA Release.
diff -ru pkg.orig/debian/control pkg/debian/control
--- pkg.orig/debian/control    Fri Sep  5 09:28:33 2003
+++ pkg/debian/control    Sun Nov 30 17:15:59 2003
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: pgAdmin project <pgadmin-hackers@postgresql.org>
-Build-Depends: debhelper (>> 3.0.0), postgresql-dev, pgadmin3-libwxgtk2ud2.5-dev (>= 2.5.0-0.0+cvs20030831.1),
pgadmin3-libwxgtk2ud2.5-contrib(>= 2.5.0-0.0+cvs20030831.1) 
+Build-Depends: debhelper (>> 3.0.0), postgresql-dev, pgadmin3-libwxgtk2ud2.5-dev (>= 2.5.0-0.0+cvs20031010.7),
pgadmin3-libwxgtk2ud2.5-contrib(>= 2.5.0-0.0+cvs20031010.7) 
 Standards-Version: 3.5.2

 Package: pgadmin3
diff -ru pkg.orig/debian/dirs pkg/debian/dirs
--- pkg.orig/debian/dirs    Fri Sep  5 09:28:33 2003
+++ pkg/debian/dirs    Sun Nov 30 17:15:59 2003
@@ -1,3 +1,4 @@
 usr/bin
 usr/sbin
 usr/share/pixmaps
+usr/share/applications
diff -ru pkg.orig/debian/rules pkg/debian/rules
--- pkg.orig/debian/rules    Fri Sep  5 09:28:33 2003
+++ pkg/debian/rules    Sun Nov 30 17:16:00 2003
@@ -59,7 +59,7 @@
     dh_testdir

     # Add here commands to compile the package.
-    $(MAKE)
+    $(MAKE) WX_HOME=/usr
     #/usr/bin/docbook-to-man debian/pgadmin3.sgml > pgadmin3.1

     touch build-stamp
@@ -90,7 +90,19 @@
     # Add here commands to install the package into debian/pgadmin3.
     $(MAKE) install prefix=$(CURDIR)/debian/pgadmin3/usr
     cp $(CURDIR)/src/include/images/elephant48.xpm $(CURDIR)/debian/pgadmin3/usr/share/pixmaps/pgadmin3.xpm
+    cp $(CURDIR)/src/include/images/elephant48.xpm $(CURDIR)/debian/pgadmin3/usr/share/pgadmin3/pgadmin3.xpm
     chmod 644 $(CURDIR)/debian/pgadmin3/usr/share/pixmaps/pgadmin3.xpm
+    chmod 644 $(CURDIR)/debian/pgadmin3/usr/share/pgadmin3/pgadmin3.xpm
+    #
+    # desktop files
+    # TODO:
+    # May be we should use desktop-file-install but it does not exist in woody...
+    #
+    cp $(CURDIR)/pkg/pgadmin3.desktop $(CURDIR)/debian/pgadmin3/usr/share/applications/.
+    chmod 644 $(CURDIR)/debian/pgadmin3/usr/share/applications/pgadmin3.desktop
+    #
+    # Avoid dpkg-buildpackage errors
+    #
     touch TODO.txt    # To avoid error while building package if this file does not exist

Sorry, maybe it's late, but which branch am I applying this to - 1.0.2 or 1.1.0?

Regards, Dave.

> -----Original Message-----
> From: Raphaël Enrici [mailto:blacknoz@club-internet.fr]
> Sent: 30 November 2003 16:23
> To: pgadmin-hackers
> Subject: [pgadmin-hackers] debian package patch
>
> Dear all,
>
> here is a patch for pkg/debian tree in cvs:
> - adds support for the .desktop file.
> - adds entries that were done in 1.0.2 maintenance update to
> the debian/changelog.
> - corrects the wx build dependencies
>
> I hope to produce another patch soon including the "one shot package"
> which should become the official package for debian
>
> If someone can apply it to cvs... :)
>
> Regards,
> Raphaël.
>

Dave Page wrote:

>Sorry, maybe it's late, but which branch am I applying this to - 1.0.2 or 1.1.0?
>
>
Hi Dave,
sorry I didn't tell it.
It would be nice if you could apply them to both branches: 1.0.2 in case
we produce a 1.0.3 and 1.1.0 because that's what they were designed for.

Regards,
Raphaël

>Regards, Dave.
>
>
>
>>-----Original Message-----
>>From: Raphaël Enrici [mailto:blacknoz@club-internet.fr]
>>Sent: 30 November 2003 16:23
>>To: pgadmin-hackers
>>Subject: [pgadmin-hackers] debian package patch
>>
>>Dear all,
>>
>>here is a patch for pkg/debian tree in cvs:
>>- adds support for the .desktop file.
>>- adds entries that were done in 1.0.2 maintenance update to
>>the debian/changelog.
>>- corrects the wx build dependencies
>>
>>I hope to produce another patch soon including the "one shot package"
>>which should become the official package for debian
>>
>>If someone can apply it to cvs... :)
>>
>>Regards,
>>Raphaël.
>>
>>
>>
>
>
>

Thanks, patch applied.

> -----Original Message-----
> From: Raphaël Enrici [mailto:blacknoz@club-internet.fr]
> Sent: 30 November 2003 16:23
> To: pgadmin-hackers
> Subject: [pgadmin-hackers] debian package patch
>
> Dear all,
>
> here is a patch for pkg/debian tree in cvs:
> - adds support for the .desktop file.
> - adds entries that were done in 1.0.2 maintenance update to
> the debian/changelog.
> - corrects the wx build dependencies
>
> I hope to produce another patch soon including the "one shot package"
> which should become the official package for debian
>
> If someone can apply it to cvs... :)
>
> Regards,
> Raphaël.
>