Author: tille
Date: 2011-02-23 13:20:11 +0000 (Wed, 23 Feb 2011)
New Revision: 6070

Added:
   trunk/packages/libg2/trunk/debian/README.source
   trunk/packages/libg2/trunk/debian/libg2-dev.docs
   trunk/packages/libg2/trunk/debian/libg2-dev.examples
   
trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
   trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff
   trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff
   trunk/packages/libg2/trunk/debian/source/
   trunk/packages/libg2/trunk/debian/source/format
Removed:
   trunk/packages/libg2/trunk/debian/dirs
   trunk/packages/libg2/trunk/debian/docs
   trunk/packages/libg2/trunk/debian/examples
   trunk/packages/libg2/trunk/debian/libg2-dev.files
   trunk/packages/libg2/trunk/debian/libg2-dev.preinst
   trunk/packages/libg2/trunk/debian/libg2-perl.substvars
   trunk/packages/libg2/trunk/debian/libg20.files
   trunk/packages/libg2/trunk/debian/libg20.preinst
Modified:
   trunk/packages/libg2/trunk/debian/changelog
   trunk/packages/libg2/trunk/debian/compat
   trunk/packages/libg2/trunk/debian/control
   trunk/packages/libg2/trunk/debian/patches/series
   trunk/packages/libg2/trunk/debian/rules
Log:
Prepare new upload


Added: trunk/packages/libg2/trunk/debian/README.source
===================================================================
--- trunk/packages/libg2/trunk/debian/README.source                             
(rev 0)
+++ trunk/packages/libg2/trunk/debian/README.source     2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -0,0 +1,4 @@
+This packages uses the quilt patch system. Please read
+/usr/share/doc/quilt/README.source for more information.
+
+ -- Andreas Tille <[email protected]>  Wed, 30 Sep 2009 14:31:20 +0200

Modified: trunk/packages/libg2/trunk/debian/changelog
===================================================================
--- trunk/packages/libg2/trunk/debian/changelog 2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/changelog 2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1,3 +1,29 @@
+g2 (0.72-2) UNRELEASED; urgency=low
+
+  * Took over package in Debian Med team maintenance
+    because it serves as precondition for some Debian Med
+    maintained packages.
+  * debian/control:
+    - debhelper 7
+    - Standards-Version: 3.9.1 (no changes needed)
+    - Added Vcs and Homepage Fields
+    - Added {misc:Depends}
+  * removed debian/{*.files,*.substvars,*.preinst}
+  * Moved debian examples to libg2-dev.examples and
+    docs to libg2-dev.docs
+  * Added README.source
+  * debian/patches/fix_pod2man_errors.diff: Fix Pod2Man
+    errors
+  * debian/source/format: 3.0 (quilt)
+  * debian/patches/fix_linker_libs.diff: Make sure libraries are
+    properly linked
+  * Do not install PostScript version of the doc - PDF is sufficient
+  * debian/rules:
+    - do not delete upstream Makefiles and config* files in clean
+      target
+
+ -- Andreas Tille <[email protected]>  Wed, 23 Feb 2011 07:39:12 +0100
+
 g2 (0.72-1) unstable; urgency=low
 
   * QA upload.

Modified: trunk/packages/libg2/trunk/debian/compat
===================================================================
--- trunk/packages/libg2/trunk/debian/compat    2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/compat    2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1 +1 @@
-5
+7

Modified: trunk/packages/libg2/trunk/debian/control
===================================================================
--- trunk/packages/libg2/trunk/debian/control   2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/control   2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1,14 +1,20 @@
 Source: g2
 Priority: optional
-Maintainer: Debian QA Group <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), quilt, autotools-dev, autoconf, libtool, 
libgd2-noxpm-dev | libgd2-xpm-dev | libgd2-dev | libgd-dev (>> 1.6.1), 
xutils-dev, perl, libx11-dev, chrpath
-Standards-Version: 3.8.1
+Maintainer:  Debian Med Packaging Team 
<[email protected]>
+DM-Upload-Allowed: yes
+Uploaders: Andreas Tille <[email protected]>
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, autoconf, libtool, 
libx11-dev, chrpath,
+ libgd2-noxpm-dev | libgd2-xpm-dev | libgd2-dev | libgd-dev (>> 1.6.1), 
xutils-dev
+Standards-Version: 3.9.1
 Section: libs
+Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/libg2/trunk
+Vcs-Browser: 
http://svn.debian.org/wsvn/debian-med/trunk/packages/libg2/trunk/?rev=0&sc=0
+Homepage: http://g2.sourceforge.net/
 
 Package: libg2-dev
 Section: libdevel
 Architecture: any
-Depends: libg20 (= ${binary:Version}), libc6-dev
+Depends: libg20 (= ${binary:Version}), libc6-dev, ${misc:Depends}
 Description: g2 2D graphics library (development files)
  g2 is an easy to use, portable and powerful 2D graphics library. It provides a
  comprehensive set of functions for simultaneous generation of graphical output
@@ -19,7 +25,7 @@
 
 Package: libg20
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: g2 2D graphics library
  g2 is an easy to use, portable and powerful 2D graphics library. It provides a
  comprehensive set of functions for simultaneous generation of graphical output
@@ -29,7 +35,7 @@
 Package: libg20-perl
 Section: perl
 Architecture: any
-Depends: ${shlibs:Depends}, libg20 (>= ${binary:Version}), ${perl:Depends}
+Depends: ${shlibs:Depends}, libg20 (>= ${binary:Version}), ${perl:Depends}, 
${misc:Depends}
 Description: g2 2D graphics library (Perl module)
  g2 is an easy to use, portable and powerful 2D graphics library. It provides a
  comprehensive set of functions for simultaneous generation of graphical output

Deleted: trunk/packages/libg2/trunk/debian/dirs
===================================================================
--- trunk/packages/libg2/trunk/debian/dirs      2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/dirs      2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

Deleted: trunk/packages/libg2/trunk/debian/docs
===================================================================
--- trunk/packages/libg2/trunk/debian/docs      2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/docs      2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1,4 +0,0 @@
-README
-TODO
-doc/refman.pdf
-doc/refman.ps

Deleted: trunk/packages/libg2/trunk/debian/examples
===================================================================
--- trunk/packages/libg2/trunk/debian/examples  2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/examples  2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1,21 +0,0 @@
-demo/Makefile
-demo/demo_cpp.cpp
-demo/demo_f.f
-demo/descrip.mms
-demo/g2_anim.c
-demo/g2_arc.c
-demo/g2_splines_demo.c
-demo/g2_test.c
-demo/g2_test.f
-demo/handles.c
-demo/penguin.c
-demo/penguin.inc
-demo/pointer.c
-demo/simple_FIG.c
-demo/simple_PS.c
-demo/simple_X11.c
-demo/simple_gd.c
-demo/simple_win32.c
-demo/xlink.opt
-descrip.mms
-g2_perl/test.pl

Added: trunk/packages/libg2/trunk/debian/libg2-dev.docs
===================================================================
--- trunk/packages/libg2/trunk/debian/libg2-dev.docs                            
(rev 0)
+++ trunk/packages/libg2/trunk/debian/libg2-dev.docs    2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -0,0 +1,3 @@
+README
+TODO
+doc/refman.pdf

Added: trunk/packages/libg2/trunk/debian/libg2-dev.examples
===================================================================
--- trunk/packages/libg2/trunk/debian/libg2-dev.examples                        
        (rev 0)
+++ trunk/packages/libg2/trunk/debian/libg2-dev.examples        2011-02-23 
13:20:11 UTC (rev 6070)
@@ -0,0 +1,21 @@
+demo/Makefile
+demo/demo_cpp.cpp
+demo/demo_f.f
+demo/descrip.mms
+demo/g2_anim.c
+demo/g2_arc.c
+demo/g2_splines_demo.c
+demo/g2_test.c
+demo/g2_test.f
+demo/handles.c
+demo/penguin.c
+demo/penguin.inc
+demo/pointer.c
+demo/simple_FIG.c
+demo/simple_PS.c
+demo/simple_X11.c
+demo/simple_gd.c
+demo/simple_win32.c
+demo/xlink.opt
+descrip.mms
+g2_perl/test.pl

Deleted: trunk/packages/libg2/trunk/debian/libg2-dev.files
===================================================================
--- trunk/packages/libg2/trunk/debian/libg2-dev.files   2011-02-23 13:13:42 UTC 
(rev 6069)
+++ trunk/packages/libg2/trunk/debian/libg2-dev.files   2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-/usr/lib/*.la

Deleted: trunk/packages/libg2/trunk/debian/libg2-dev.preinst
===================================================================
--- trunk/packages/libg2/trunk/debian/libg2-dev.preinst 2011-02-23 13:13:42 UTC 
(rev 6069)
+++ trunk/packages/libg2/trunk/debian/libg2-dev.preinst 2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#remove old doc symlink left by previous installations
-if [ -h /usr/share/doc/libg2-dev ]; then
-       rm /usr/share/doc/libg2-dev
-fi
-
-#DEBHELPER#

Deleted: trunk/packages/libg2/trunk/debian/libg2-perl.substvars
===================================================================
--- trunk/packages/libg2/trunk/debian/libg2-perl.substvars      2011-02-23 
13:13:42 UTC (rev 6069)
+++ trunk/packages/libg2/trunk/debian/libg2-perl.substvars      2011-02-23 
13:20:11 UTC (rev 6070)
@@ -1,2 +0,0 @@
-perl:Depends=perl (>= 5.8.4-2), perlapi-5.8.4
-shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libg20, libgd2-noxpm (>= 2.0.23) | 
libgd2-xpm (>= 2.0.23), libx11-6 | xlibs (>> 4.1.0)

Deleted: trunk/packages/libg2/trunk/debian/libg20.files
===================================================================
--- trunk/packages/libg2/trunk/debian/libg20.files      2011-02-23 13:13:42 UTC 
(rev 6069)
+++ trunk/packages/libg2/trunk/debian/libg20.files      2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*

Deleted: trunk/packages/libg2/trunk/debian/libg20.preinst
===================================================================
--- trunk/packages/libg2/trunk/debian/libg20.preinst    2011-02-23 13:13:42 UTC 
(rev 6069)
+++ trunk/packages/libg2/trunk/debian/libg20.preinst    2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#remove old doc symlink left by previous installations
-if [ -h /usr/share/doc/libg2-dev ]; then
-       rm /usr/share/doc/libg2-dev
-fi
-
-#DEBHELPER#

Added: 
trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
===================================================================
--- 
trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
                         (rev 0)
+++ 
trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
 2011-02-23 13:20:11 UTC (rev 6070)
@@ -0,0 +1,45 @@
+Author:  Andreas Tille <[email protected]>
+Date:  Wed, 23 Feb 2011 07:39:12 +0100
+Description: Upstream clean target removes files which are provided
+    in downloadable source tarball.  Just keep these files
+
+--- g2-0.72.orig/Makefile.in
++++ g2-0.72/Makefile.in
+@@ -119,7 +119,7 @@
+ 
+ 
+ clean:
+-      -(cd ./demo ; make clean)
++      #(cd ./demo ; make clean)
+       -(cd ./g2_python ; make clean)
+       -rm -f $(OBJ)
+       -rm -f libg2.a config.cache config.log Makefile.bak config.status
+@@ -134,7 +134,7 @@
+       -rm -f ./libg2.@LD_SHARED_EXT@
+       -rm -f libg2.$(G2_VERSION).a
+       -rm -f a.out
+-      -rm -fr doc/html/ doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
++      -rm -fr doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
+ 
+ demo: libg2.a
+       (cd ./demo ; make)
+--- g2-0.72.orig/Makefile
++++ g2-0.72/Makefile
+@@ -119,7 +119,7 @@
+ 
+ 
+ clean:
+-      -(cd ./demo ; make clean)
++      #(cd ./demo ; make clean)
+       -(cd ./g2_python ; make clean)
+       -rm -f $(OBJ)
+       -rm -f libg2.a config.cache config.log Makefile.bak config.status
+@@ -134,7 +134,7 @@
+       -rm -f ./libg2.so.0.$(G2_VERSION)
+       -rm -f libg2.$(G2_VERSION).a
+       -rm -f a.out
+-      -rm -fr doc/html/ doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
++      -rm -fr doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
+ 
+ demo: libg2.a
+       (cd ./demo ; make)

Added: trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff              
                (rev 0)
+++ trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff      
2011-02-23 13:20:11 UTC (rev 6070)
@@ -0,0 +1,11 @@
+--- g2-0.72.orig/configure.in
++++ g2-0.72/configure.in
+@@ -16,7 +16,7 @@
+   *-linux* | *-k*bsd*-gnu)
+               LD_SHARED='ld'
+               LD_SHARED_FLAGS='-shared -soname libg2.so.0'
+-              LD_SHARED_OPT='-lc'
++              LD_SHARED_OPT='-lc -lm -lX11 -lgd'
+               LD_SHARED_EXT='so.$(RVERSION)'
+               AC_DEFINE(LINUX);;
+     *-aix*)

Added: trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff           
                (rev 0)
+++ trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff   
2011-02-23 13:20:11 UTC (rev 6070)
@@ -0,0 +1,36 @@
+--- g2-0.72.orig/g2_perl/G2.pm
++++ g2-0.72/g2_perl/G2.pm
+@@ -148,8 +148,12 @@
+ Drawing in both windows is performed by one single command to the virtual
+ device.
+ 
++=back
++
+ =head2 Device Functions
+ 
++=over 5
++
+ =item C<>
+ 
+ C<G2::Device::attach(dev)> I<object method>
+@@ -226,8 +230,11 @@
+ 
+ C<G2::Device::set_background(color)> I<object method>
+ 
++=back
++
+ =head2 Drawing Functions
+ 
++=over 5
+ 
+ =item C<move>
+ 
+@@ -335,6 +342,8 @@
+ 
+ C<G2::Device::plot_QP(x, y)> I<object method>
+ 
++=back
++
+ =head1 AUTHORS
+ 
+ Horst Wagner (wagner/users-sourceforge.net) and Ljubomir Milanovic 
(ljubo/users-sourceforge-net)

Modified: trunk/packages/libg2/trunk/debian/patches/series
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/series    2011-02-23 13:13:42 UTC 
(rev 6069)
+++ trunk/packages/libg2/trunk/debian/patches/series    2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -1,3 +1,6 @@
 010_configure_in.diff
+do_not_remove_files_from_orig_source.diff
 020_makefile_pl_in.diff
 030_makefile_in.diff
+fix_pod2man_errors.diff
+fix_linker_libs.diff

Modified: trunk/packages/libg2/trunk/debian/rules
===================================================================
--- trunk/packages/libg2/trunk/debian/rules     2011-02-23 13:13:42 UTC (rev 
6069)
+++ trunk/packages/libg2/trunk/debian/rules     2011-02-23 13:20:11 UTC (rev 
6070)
@@ -1,16 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Modified for g2 by Eric Cain
+# debian/rules for libg2
+# Author: Eric Cain
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -74,12 +69,7 @@
        [ ! -f Makefile ] || $(MAKE) RVERSION=$(rversion) MVERSION=$(major) 
clean
 
        QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-       rm -f config.sub
-       rm -f config.guess
-       rm -f configure
        rm -f ltmain.sh
-       rm -f g2_perl/Makefile.PL
-       find ./ -name Makefile -delete
        rm -rf .pc
 
        dh_clean 
@@ -87,7 +77,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
 
        # install the package into debian/tmp

Added: trunk/packages/libg2/trunk/debian/source/format
===================================================================
--- trunk/packages/libg2/trunk/debian/source/format                             
(rev 0)
+++ trunk/packages/libg2/trunk/debian/source/format     2011-02-23 13:20:11 UTC 
(rev 6070)
@@ -0,0 +1 @@
+3.0 (quilt)


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit

Reply via email to