[med-svn] r4147 - in trunk/packages/gdpc/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Sun Oct 4 20:52:16 UTC 2009
Author: tille
Date: 2009-10-04 20:52:16 +0000 (Sun, 04 Oct 2009)
New Revision: 4147
Added:
trunk/packages/gdpc/trunk/debian/README.source
trunk/packages/gdpc/trunk/debian/gdpc.docs
trunk/packages/gdpc/trunk/debian/manpages
trunk/packages/gdpc/trunk/debian/patches/20_Makefile_options.patch
trunk/packages/gdpc/trunk/debian/patches/series
Removed:
trunk/packages/gdpc/trunk/debian/patches/Makefile.diff
Modified:
trunk/packages/gdpc/trunk/debian/changelog
trunk/packages/gdpc/trunk/debian/compat
trunk/packages/gdpc/trunk/debian/control
trunk/packages/gdpc/trunk/debian/gdpc.install
trunk/packages/gdpc/trunk/debian/rules
Log:
New upstream version; changed packaging to not use cdbs any more but rather dh; bumped standards version; other minor changes; Nelson, would you mind if I upload this tomorrow?
Added: trunk/packages/gdpc/trunk/debian/README.source
===================================================================
--- trunk/packages/gdpc/trunk/debian/README.source (rev 0)
+++ trunk/packages/gdpc/trunk/debian/README.source 2009-10-04 20:52:16 UTC (rev 4147)
@@ -0,0 +1,4 @@
+This packages uses the quilt patch system. Please read
+/usr/share/doc/quilt/README.source for more information.
+
+ -- Andreas Tille <tille at debian.org> Mon, 31 Aug 2009 14:50:19 +0200
Modified: trunk/packages/gdpc/trunk/debian/changelog
===================================================================
--- trunk/packages/gdpc/trunk/debian/changelog 2009-10-04 20:21:36 UTC (rev 4146)
+++ trunk/packages/gdpc/trunk/debian/changelog 2009-10-04 20:52:16 UTC (rev 4147)
@@ -1,10 +1,20 @@
-gdpc (2.2.4-4) UNRELEASED; urgency=low
+gdpc (2.2.5-1) UNRELEASED; urgency=low
+ [ Charles Plessy ]
* Removed category 'Utility' in debian/gdpc.desktop as it was making the
entry appear in the 'Accessories' section of the GNOME menu.
- -- Charles Plessy <plessy at debian.org> Thu, 21 Aug 2008 19:25:45 +0900
+ [ Andreas Tille ]
+ * New upstream version
+ * debian/control:
+ - Added myself to uploaders
+ - Standards-Version: 3.8.3 (added README.source)
+ - Debhelper 7
+ - use quilt instead of simple-patchsys
+ * debian/rules: short rules file using dh
+ -- Andreas Tille <tille at debian.org> Sun, 04 Oct 2009 09:59:31 +0200
+
gdpc (2.2.4-3) unstable; urgency=low
* Updated gdpc homepage (Closes: #451920). Thanks Charles!
Modified: trunk/packages/gdpc/trunk/debian/compat
===================================================================
--- trunk/packages/gdpc/trunk/debian/compat 2009-10-04 20:21:36 UTC (rev 4146)
+++ trunk/packages/gdpc/trunk/debian/compat 2009-10-04 20:52:16 UTC (rev 4147)
@@ -1 +1 @@
-5
+7
Modified: trunk/packages/gdpc/trunk/debian/control
===================================================================
--- trunk/packages/gdpc/trunk/debian/control 2009-10-04 20:21:36 UTC (rev 4146)
+++ trunk/packages/gdpc/trunk/debian/control 2009-10-04 20:52:16 UTC (rev 4147)
@@ -1,11 +1,12 @@
Source: gdpc
Section: science
Priority: optional
-Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Nelson A. de Oliveira <naoliv at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libgtk2.0-dev
-Standards-Version: 3.7.3
+Uploaders: Nelson A. de Oliveira <naoliv at debian.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 7.1), libgtk2.0-dev, quilt
+Standards-Version: 3.8.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gdpc/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdpc/trunk/
Homepage: http://www.frantz.fi/software/gdpc.php
@@ -22,7 +23,7 @@
Package: gdpc-examples
Architecture: all
-Recommends: gdpc (>= ${source:Version})
+Recommends: gdpc (>= ${source:Version}), ${misc:Depends}
Description: example files for the gdpc program
gpdc is a graphical program for visualising output data from
molecular dynamics simulations. It reads input in the standard xyz
Added: trunk/packages/gdpc/trunk/debian/gdpc.docs
===================================================================
--- trunk/packages/gdpc/trunk/debian/gdpc.docs (rev 0)
+++ trunk/packages/gdpc/trunk/debian/gdpc.docs 2009-10-04 20:52:16 UTC (rev 4147)
@@ -0,0 +1 @@
+README
Modified: trunk/packages/gdpc/trunk/debian/gdpc.install
===================================================================
--- trunk/packages/gdpc/trunk/debian/gdpc.install 2009-10-04 20:21:36 UTC (rev 4146)
+++ trunk/packages/gdpc/trunk/debian/gdpc.install 2009-10-04 20:52:16 UTC (rev 4147)
@@ -1 +1,2 @@
debian/gdpc.desktop usr/share/applications/
+gdpc usr/bin
Added: trunk/packages/gdpc/trunk/debian/manpages
===================================================================
--- trunk/packages/gdpc/trunk/debian/manpages (rev 0)
+++ trunk/packages/gdpc/trunk/debian/manpages 2009-10-04 20:52:16 UTC (rev 4147)
@@ -0,0 +1 @@
+debian/gdpc.1
Added: trunk/packages/gdpc/trunk/debian/patches/20_Makefile_options.patch
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/20_Makefile_options.patch (rev 0)
+++ trunk/packages/gdpc/trunk/debian/patches/20_Makefile_options.patch 2009-10-04 20:52:16 UTC (rev 4147)
@@ -0,0 +1,27 @@
+Author: Andreas Tille <tille at debian.org> (adopted from previous patch of Nelson A. de Oliveira <naoliv at debian.org>)
+Description: Enable Debian comppile options into upstream Makefile,
+ Fix clean target to work also on already cleaned upstream source
+--- gdpc-2.2.5.orig/Makefile
++++ gdpc-2.2.5/Makefile
+@@ -4,10 +4,10 @@
+ bindir ?= /usr/bin
+
+ .c.o:
+- $(CC) -c $(FLAGS) $(CPPFLAGS) $<
++ $(CC) -c $(COPTIONS) $(FLAGS) $(CPPFLAGS) $<
+
+ gdpc: main.o colors.o sort.o drawatoms.o readinput.o init.o rotate.o setup.o Makefile
+- $(CC) $(CFLAGS) -o gdpc main.o colors.o drawatoms.o init.o sort.o rotate.o setup.o readinput.o $(LIBS)
++ $(CC) $(COPTIONS) $(CFLAGS) -o gdpc main.o colors.o drawatoms.o init.o sort.o rotate.o setup.o readinput.o $(LIBS)
+
+ main.o: main.c parameters.h
+
+@@ -26,7 +26,7 @@
+ setup.o: setup.c parameters.h tooltips.h
+
+ clean:
+- rm *.o gdpc
++ rm -f *.o gdpc
+
+ install:
+ install -p -m 755 -D gdpc $(bindir)/gdpc
Deleted: trunk/packages/gdpc/trunk/debian/patches/Makefile.diff
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/Makefile.diff 2009-10-04 20:21:36 UTC (rev 4146)
+++ trunk/packages/gdpc/trunk/debian/patches/Makefile.diff 2009-10-04 20:52:16 UTC (rev 4147)
@@ -1,21 +0,0 @@
---- old/Makefile 2005-06-01 19:30:55.000000000 -0300
-+++ new/Makefile 2005-06-01 19:31:18.000000000 -0300
-@@ -1,13 +1,13 @@
--CC = gcc -g
--CFLAGS=-Wall `pkg-config --cflags gtk+-2.0 gthread-2.0` -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-+CC = gcc
-+COPTIONS=`pkg-config --cflags gtk+-2.0 gthread-2.0`
- LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0`
--bindir ?= /usr/bin
-+bindir = $(DESTDIR)/usr/bin
-
- .c.o:
-- $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-+ $(CC) -c $(COPTIONS) $(CFLAGS) $(CPPFLAGS) $<
-
- gdpc: main.o colors.o sort.o drawatoms.o readinput.o init.o rotate.o setup.o Makefile
-- $(CC) $(CFLAGS) -o gdpc main.o colors.o drawatoms.o init.o sort.o rotate.o setup.o readinput.o $(LIBS)
-+ $(CC) $(COPTIONS) $(CFLAGS) -o gdpc main.o colors.o drawatoms.o init.o sort.o rotate.o setup.o readinput.o $(LIBS)
-
- main.o: main.c parameters.h
-
Added: trunk/packages/gdpc/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/series (rev 0)
+++ trunk/packages/gdpc/trunk/debian/patches/series 2009-10-04 20:52:16 UTC (rev 4147)
@@ -0,0 +1 @@
+20_Makefile_options.patch
Modified: trunk/packages/gdpc/trunk/debian/rules
===================================================================
--- trunk/packages/gdpc/trunk/debian/rules 2009-10-04 20:21:36 UTC (rev 4146)
+++ trunk/packages/gdpc/trunk/debian/rules 2009-10-04 20:52:16 UTC (rev 4147)
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+ dh --with quilt $@
-DEB_DESTDIR = $(CURDIR)/debian/gdpc
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR)
-DEB_INSTALL_MANPAGES_gdpc := debian/gdpc.1
+override_dh_auto_clean:
+ touch gdpc.o gdpc # ugly hack to let unpatched Makefile work
+ $(MAKE) clean
+ dh_clean
+
+override_dh_auto_install:
+ # do nothing
More information about the debian-med-commit
mailing list