r16495 - in /desktop/unstable/system-tools-backends/debian: changelog control.in patches/04_correct_perl_command.patch rules

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Tue Jul 8 18:49:56 UTC 2008 

Author: pochu-guest
Date: Tue Jul  8 18:49:56 2008
New Revision: 16495

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16495
Log:
* debian/patches/04_correct_perl_command.patch:
  - Use the system perl, thanks to James Westby and Sebastien Bacher.
    Closes: #488793.
* debian/rules:
  - Cleanup
* debian/control:
  - Updated Standards-Version to 3.8.0, no changes needed.

Added:
    desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch
Modified:
    desktop/unstable/system-tools-backends/debian/changelog
    desktop/unstable/system-tools-backends/debian/control.in
    desktop/unstable/system-tools-backends/debian/rules

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=16495&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Tue Jul  8 18:49:56 2008
@@ -1,3 +1,15 @@
+system-tools-backends (2.6.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/04_correct_perl_command.patch:
+    - Use the system perl, thanks to James Westby and Sebastien Bacher.
+      Closes: #488793.
+  * debian/rules:
+    - Cleanup
+  * debian/control:
+    - Updated Standards-Version to 3.8.0, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 08 Jul 2008 20:34:57 +0200
+
 system-tools-backends (2.6.0-1) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/system-tools-backends/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/control.in?rev=16495&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control.in (original)
+++ desktop/unstable/system-tools-backends/debian/control.in Tue Jul  8 18:49:56 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
 Uploaders: @GNOME_TEAM@, Niv Sardi <xaiki at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools (>= 0.10),

Added: desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch?rev=16495&op=file
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch (added)
+++ desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch Tue Jul  8 18:49:56 2008
@@ -1,0 +1,72 @@
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/SystemToolsBackends.pl.in system-tools-backends-2.6.0.new/SystemToolsBackends.pl.in
+--- system-tools-backends-2.6.0/SystemToolsBackends.pl.in	2008-03-09 14:21:45.000000000 +0100
++++ system-tools-backends-2.6.0.new/SystemToolsBackends.pl.in	2008-03-13 18:55:25.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # Loader for the system tools backends.
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Backend.pm system-tools-backends-2.6.0.new/Utils/Backend.pm
+--- system-tools-backends-2.6.0/Utils/Backend.pm	2007-12-12 01:31:03.000000000 +0100
++++ system-tools-backends-2.6.0.new/Utils/Backend.pm	2008-03-13 18:55:55.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # Common stuff for the ximian-setup-tools backends.
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/File.pm system-tools-backends-2.6.0.new/Utils/File.pm
+--- system-tools-backends-2.6.0/Utils/File.pm	2008-03-09 14:21:45.000000000 +0100
++++ system-tools-backends-2.6.0.new/Utils/File.pm	2008-03-13 18:55:51.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # Functions for file manipulation. Find, open, read, write, backup, etc.
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Parse.pm system-tools-backends-2.6.0.new/Utils/Parse.pm
+--- system-tools-backends-2.6.0/Utils/Parse.pm	2008-03-09 14:21:45.000000000 +0100
++++ system-tools-backends-2.6.0.new/Utils/Parse.pm	2008-03-13 18:55:47.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # parse.pl: Common parsing stuff for the ximian-setup-tools backends.
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Platform.pm system-tools-backends-2.6.0.new/Utils/Platform.pm
+--- system-tools-backends-2.6.0/Utils/Platform.pm	2008-03-13 18:55:25.000000000 +0100
++++ system-tools-backends-2.6.0.new/Utils/Platform.pm	2008-03-13 18:55:44.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # Determine the platform we're running on.
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Report.pm system-tools-backends-2.6.0.new/Utils/Report.pm
+--- system-tools-backends-2.6.0/Utils/Report.pm	2007-12-12 01:31:03.000000000 +0100
++++ system-tools-backends-2.6.0.new/Utils/Report.pm	2008-03-13 18:55:40.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # /* Functions for on-the-fly commentary on a tool's work. */
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Util.pm system-tools-backends-2.6.0.new/Utils/Util.pm
+--- system-tools-backends-2.6.0/Utils/Util.pm	2007-10-09 00:18:53.000000000 +0200
++++ system-tools-backends-2.6.0.new/Utils/Util.pm	2008-03-13 18:55:37.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # Utility functions.
+diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/XML.pm system-tools-backends-2.6.0.new/Utils/XML.pm
+--- system-tools-backends-2.6.0/Utils/XML.pm	2007-10-09 00:18:53.000000000 +0200
++++ system-tools-backends-2.6.0.new/Utils/XML.pm	2008-03-13 18:55:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ 
+ # XML printing, scanning and parsing.

Modified: desktop/unstable/system-tools-backends/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/rules?rev=16495&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/rules (original)
+++ desktop/unstable/system-tools-backends/debian/rules Tue Jul  8 18:49:56 2008
@@ -1,44 +1,14 @@
 #!/usr/bin/make -f
 
-# To Upload only to experimental
-# include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-
-# Gnome Team
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-# Including this file gets us a simple patch system.  You can just
-# drop patches in debian/patches, and they will be automatically
-# applied and unapplied.
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Inclusing this file permits comparing of file installed in the DESTDIR
-# installation directory and files in resulting Debian packages with
-# "debian/rules list-missing".
-include /usr/share/cdbs/1/rules/utils.mk
-# Including this gives us a number of rules typical to a GNOME
-# program, including setting GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1.
-# Note that this class inherits from autotools.mk and docbookxml.mk,
-# so you don't need to include those too.
-include /usr/share/cdbs/1/class/gnome.mk
-
-DEB_BUILDDIR := $(CURDIR)/debian/build
 
 DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share/ \
 		 	     --with-net-dbus=/usr/lib/perl5 \
 			     --with-stb-group=stb-admin
 
 DEB_DH_INSTALLINIT_ARGS := -- start 30 2 3 4 5 . stop 30 0 1 6 .
-
-build/system-tools-backends::
-	# generate POT file for translators
-	cd po ; intltool-update --verbose -p
-
-clean::
-	# GNOME Team 'uploaders.mk' should not override this behavior, here is a workaround :
-	sed -i "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" debian/control
-	rm -f po/setup-tools-backends.pot
-	rm -rf $(DEB_BUILDDIR)
-
-
-

More information about the pkg-gnome-commits mailing list