Hi,

Before to check-in this fix, i would like to check-in the attached patch which
fixes errors with the Debian package.
May i check-in these modifications into trunk?

Regards,



Quoting Geoffroy Vallee <[EMAIL PROTECTED]>:

> Sure i think i have a write access. Will try to fix that tomorrow.
>
> On Mon, 2007-12-17 at 23:58 +0100, Erich Focht wrote:
> > Hmm, strange. Looks like I forgot to tag the version. I created the tag
> > corresponding to 2.2.11-1.
> >
> > Geoffroy, thanks for noticing this. Could you please fix the debian
> > changelog issues?
> >
> > Thanks,
> > best regards,
> > Erich
> >
> > On Monday 17 December 2007 22:03, Geoffroy Vallee wrote:
> > > Hi all,
> > >
> > > Few questions about systemconfiguration:
> > > - systemconfigurator-2.2.11 has been released but no tags exist in SVN.
> > > The latest tag in 2.2.10-2. Is it normal?
> > > - for Debian packages, the Debian changelog includes the
> > > systemconfigurator changelog and the changelog at the top directory is
> > > out-of-date. At least for Debian packages, the two changelogs are
> > > different: the changelog in the debian directory has to be used only for
> > > modifications related to the Debian package, not for modifications
> > > related to the "upstream developments." Is it normal if these changelogs
> > > are mixed?
> > >
> > > Regards,
>
>
> -------------------------------------------------------------------------
> SF.Net email is sponsored by:
> Check out the new SourceForge.net Marketplace.
> It's the best place to buy or sell services
> for just about anything Open Source.
> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
> _______________________________________________
> sisuite-devel mailing list
> sisuite-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/sisuite-devel
>


Index: debian/changelog
===================================================================
--- debian/changelog	(revision 710)
+++ debian/changelog	(working copy)
@@ -1,3 +1,11 @@
+systemconfigurator (2.2.11-2) unstable; urgency=low
+
+  * Fix the installation path of man1 pages (/usr/man instead of /usr/share).
+  * Fix the copyright file.
+  * Remove the unused README.Debian file.
+
+ -- Geoffroy Vallee <[EMAIL PROTECTED]>  Tue, 18 Dec 2007 15:46:28 -0500
+
 systemconfigurator (2.2.11-1) unstable; urgency=low
 
   * allowing UUID and LABEL device names
Index: debian/copyright
===================================================================
--- debian/copyright	(revision 710)
+++ debian/copyright	(working copy)
@@ -1,19 +1,38 @@
 This package was debianized by Geoffroy Vallee <[EMAIL PROTECTED]> on
 Tue, 25 apr 2006 21:34:23 -0500.
 
-License: 
+Upstream Authors:
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+    International Business Machines
+    Erich Focht <[EMAIL PROTECTED]>
+    David Muir Sharnoff
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+Copyright:
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    <Copyright (C) 2001-2005 International Business Machines>
+    <Copyright (C) 2006-2007 Erich Focht [EMAIL PROTECTED]>
+    <Copyright (C) 1998, 2001 David Muir Sharnoff>
 
+License:
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+    MA 02110-1301, USA.
+
+The Debian packaging is (C) 2006, Geoffroy Vallee <[EMAIL PROTECTED]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+
Index: debian/rules
===================================================================
--- debian/rules	(revision 710)
+++ debian/rules	(working copy)
@@ -58,7 +58,8 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/hawknl.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/systemconfigurator
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/systemconfigurator \
+					SITEPREFIX=$(DESTDIR)/usr/share
 
 
 # Build architecture-independent files here.
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
sisuite-devel mailing list
sisuite-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sisuite-devel

Reply via email to