19 commits - client/debian client/rhel rel-eng/packages

Miroslav Suchý msuchy at fedoraproject.org
Fri Jun 15 21:10:34 UTC 2012


 client/debian/rhn-client-tools/debian/changelog                                        |    4 -
 client/debian/rhn-client-tools/debian/copyright                                        |   24 ++--------
 client/debian/rhn-client-tools/debian/pycompat                                         |    1 
 client/debian/rhn-client-tools/debian/rules                                            |    2 
 client/debian/rhnlib/debian/changelog                                                  |    7 +-
 client/debian/rhnlib/debian/control                                                    |   13 ++---
 client/debian/rhnlib/debian/copyright                                                  |    9 ++-
 client/debian/rhnlib/debian/docs                                                       |    2 
 client/debian/rhnlib/debian/pycompat                                                   |    1 
 client/debian/rhnlib/debian/python-rhnlib.dsc                                          |   15 ------
 client/debian/rhnlib/debian/rules                                                      |    8 +--
 client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8                                 |    3 -
 client/rhel/rhn-client-tools/man/en/rhn_check.8                                        |    3 -
 client/rhel/rhn-client-tools/man/en/rhn_register.8                                     |    3 -
 client/rhel/rhn-client-tools/man/en/rhnreg_ks.8                                        |    3 -
 client/rhel/rhn-client-tools/man/en/spacewalk-channel.8                                |    3 -
 client/rhel/rhn-client-tools/man/en/up2date.5                                          |    3 -
 client/rhel/rhn-client-tools/rhn-client-tools.spec                                     |    7 ++
 client/rhel/rhn-client-tools/src/actions/hardware.py                                   |    2 
 client/rhel/rhn-client-tools/src/actions/reboot.py                                     |    2 
 client/rhel/rhn-client-tools/src/actions/rhnsd.py                                      |    2 
 client/rhel/rhn-client-tools/src/actions/systemid.py                                   |    2 
 client/rhel/rhn-client-tools/src/actions/up2date_config.py                             |    2 
 client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py                               |    2 
 client/rhel/rhn-client-tools/src/bin/rhn_register.py                                   |    2 
 client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py                                      |    2 
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py          |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py       |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py      |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py              |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py               |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py              |    3 -
 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py               |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py                       |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py                    |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py                   |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py                           |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py                            |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py              |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_register.py                             |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py                           |    3 -
 client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py                            |    3 -
 client/rhel/rhn-client-tools/src/up2date_client/debUtils.py                            |    2 
 client/rhel/rhn-client-tools/src/up2date_client/getMethod.py                           |    2 
 client/rhel/rhn-client-tools/src/up2date_client/gui.py                                 |    2 
 client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py                            |    2 
 client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py                         |    2 
 client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py                           |    3 -
 client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py                            |    2 
 client/rhel/rhn-client-tools/src/up2date_client/transaction.py                         |    2 
 client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py                       |    2 
 client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py                        |    2 
 client/rhel/rhn-client-tools/test/alltests.py                                          |    3 -
 client/rhel/rhn-client-tools/test/haltreetests.py                                      |    3 -
 client/rhel/rhn-client-tools/test/settestpath.py                                       |    3 -
 client/rhel/yum-rhn-plugin/actions/errata.py                                           |    2 
 rel-eng/packages/rhn-client-tools                                                      |    2 
 58 files changed, 80 insertions(+), 132 deletions(-)

New commits:
commit 05f38a234dc97f44dc79acfa4a4d2e63ff259fd3
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 23:10:20 2012 +0200

    Automatic commit of package [rhn-client-tools] release [1.8.5-1].

diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 67e26e9..5757b03 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhn-client-tools
-Version: 1.8.4
+Version: 1.8.5
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -339,6 +339,11 @@ make -f Makefile.rhn-client-tools test
 %endif
 
 %changelog
+* Fri Jun 15 2012 Miroslav Suchý 1.8.5-1
+- fix files header, filese are not released under GPLv2+ but only GPLv2
+- fix files headers. our code is under gplv2 license
+- %%defattr is not needed since rpm 4.4
+
 * Wed May 02 2012 Milan Zazrivec <mzazrivec at redhat.com> 1.8.4-1
 - 816199 - fix package dependency on newt
 
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 72eb928..235e005 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.4-1 client/rhel/rhn-client-tools/
+1.8.5-1 client/rhel/rhn-client-tools/


commit df96bfa09f6afedeb2b925da79d0d7b01fe24c28
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 23:09:06 2012 +0200

    fix files header, filese are not released under GPLv2+ but only GPLv2

diff --git a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8 b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
index 8ea1ff4..c916304 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
@@ -2,8 +2,7 @@
 .\"
 .\" This man page is free documentation; 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.
+.\" the Free Software Foundation; version 2 of the License
 .\"
 .\" This program is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_check.8 b/client/rhel/rhn-client-tools/man/en/rhn_check.8
index 34a7820..a9236cf 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_check.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_check.8
@@ -2,8 +2,7 @@
 .\"
 .\" This man page is free documentation; 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.
+.\" the Free Software Foundation; version 2 of the License.
 .\"
 .\" This program is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_register.8 b/client/rhel/rhn-client-tools/man/en/rhn_register.8
index a295348..6f50193 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_register.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_register.8
@@ -2,8 +2,7 @@
 .\"
 .\" This man page is free documentation; 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.
+.\" the Free Software Foundation; version 2 of the License.
 .\"
 .\" This program is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
index aac4bb9..a4d58df 100644
--- a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
+++ b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
@@ -2,8 +2,7 @@
 .\"
 .\" This man page is free documentation; 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.
+.\" the Free Software Foundation; version 2 of the License.
 .\"
 .\" This program is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
index 5c0edc6..8bb986d 100644
--- a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -2,8 +2,7 @@
 .\"
 .\" This man page is free documentation; 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.
+.\" the Free Software Foundation; version 2 of the License.
 .\"
 .\" This program is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/up2date.5 b/client/rhel/rhn-client-tools/man/en/up2date.5
index 23b02a2..925cb2b 100644
--- a/client/rhel/rhn-client-tools/man/en/up2date.5
+++ b/client/rhel/rhn-client-tools/man/en/up2date.5
@@ -2,8 +2,7 @@
 .\"
 .\" This man page is free documentation; 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.
+.\" the Free Software Foundation; version 2 of the License.
 .\"
 .\" This program is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
index f82921b..3580acb 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
@@ -3,8 +3,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
index 7865c2b..6b7a3f2 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
index d35218c..ed68ad0 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
@@ -5,8 +5,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
index ef22afe..5e3356c 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
index 267c44c..ba6adc9 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
@@ -5,8 +5,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
index 41b8f73..190e348 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
index 8baaa1f..145fd13 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
index 5fd6f27..10ab1c6 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
index f82921b..3580acb 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
@@ -3,8 +3,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
index 0ec28b1..26ab09b 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
index 55420bb..0bfdc9f 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
@@ -3,8 +3,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
index 2da0898..c7d2753 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
index c1a9c3b..3b8eeed 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
@@ -3,8 +3,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
index 68aeebc..7d15316 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
index 9258310..6d1081e 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
index 5dd3b42..ced8655 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
index bb6b719..3f883a0 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
@@ -2,8 +2,7 @@
 #
 # 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.
+# the Free Software Foundation; version 2 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
index e61864c..7fe173f 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
@@ -5,8 +5,7 @@
 #
 #   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.
+#   the Free Software Foundation; version 2 of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/test/alltests.py b/client/rhel/rhn-client-tools/test/alltests.py
index 47e75c9..2aba59f 100644
--- a/client/rhel/rhn-client-tools/test/alltests.py
+++ b/client/rhel/rhn-client-tools/test/alltests.py
@@ -4,8 +4,7 @@
 #
 #   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.
+#   the Free Software Foundation; version 2 of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/test/haltreetests.py b/client/rhel/rhn-client-tools/test/haltreetests.py
index fd27488..1d942d5 100644
--- a/client/rhel/rhn-client-tools/test/haltreetests.py
+++ b/client/rhel/rhn-client-tools/test/haltreetests.py
@@ -4,8 +4,7 @@
 #
 #   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.
+#   the Free Software Foundation; version 2 of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/test/settestpath.py b/client/rhel/rhn-client-tools/test/settestpath.py
index 8da064e..aef55f2 100644
--- a/client/rhel/rhn-client-tools/test/settestpath.py
+++ b/client/rhel/rhn-client-tools/test/settestpath.py
@@ -4,8 +4,7 @@
 #
 #   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.
+#   the Free Software Foundation; version 2 of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of


commit 570c16991880e187e52af14d3845e181a9210df0
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 22:50:49 2012 +0200

    fix files headers. our code is under gplv2 license

diff --git a/client/rhel/rhn-client-tools/src/actions/hardware.py b/client/rhel/rhn-client-tools/src/actions/hardware.py
index 115f8ad..f1ea787 100644
--- a/client/rhel/rhn-client-tools/src/actions/hardware.py
+++ b/client/rhel/rhn-client-tools/src/actions/hardware.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Adrian Likins <alikins at redhat.com>
 
diff --git a/client/rhel/rhn-client-tools/src/actions/reboot.py b/client/rhel/rhn-client-tools/src/actions/reboot.py
index 2c52e05..4d3a6fb 100644
--- a/client/rhel/rhn-client-tools/src/actions/reboot.py
+++ b/client/rhel/rhn-client-tools/src/actions/reboot.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Adrian Likins <alikins at redhat.com
 #
diff --git a/client/rhel/rhn-client-tools/src/actions/rhnsd.py b/client/rhel/rhn-client-tools/src/actions/rhnsd.py
index 83ed22b..6966c9a 100644
--- a/client/rhel/rhn-client-tools/src/actions/rhnsd.py
+++ b/client/rhel/rhn-client-tools/src/actions/rhnsd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Adrian Likins <alikins at redhat.com>
 #
diff --git a/client/rhel/rhn-client-tools/src/actions/systemid.py b/client/rhel/rhn-client-tools/src/actions/systemid.py
index f08226b..4282ddc 100644
--- a/client/rhel/rhn-client-tools/src/actions/systemid.py
+++ b/client/rhel/rhn-client-tools/src/actions/systemid.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Adrian Likins <alikins at redhat.com>
 
diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
index c050bcc..ae714a1 100644
--- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py
+++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Adrian Likins <alikins at redhat.com>
 #
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
index ee8f8e9..2259770 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -2,7 +2,7 @@
 #
 # Red Hat Network registration tool
 # Adapted from wrapper.py
-# Copyright (c) 1999-2006 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2006 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Authors:
 #       Adrian Likins <alikins at redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_register.py b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
index 568d82c..db081ce 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn_register.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
@@ -2,7 +2,7 @@
 #
 # Red Hat Network registration tool
 # Adapted from wrapper.py
-# Copyright (c) 1999-2010 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2010 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Authors:
 #       Adrian Likins <alikins at redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index f5abcaa..cf1c2f5 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # Registration client for the Red Hat Network for useage with kickstart 
-# Copyright (c) 1999--2012 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999--2012 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Authors:
 #       Adrian Likins <alikins at redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
index ab8fc64..9ff0209 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
@@ -1,5 +1,5 @@
 # Client code for Update Agent
-# Copyright (c) 2011--2011 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 2011--2011 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Simon Lukasik
 #         Lukas Durfina
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
index 423ca35..6257c89 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
@@ -1,7 +1,7 @@
 # Retrieve action method name given queued action information.
 #
 # Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # An allowable xmlrpc method is retrieved given a base location, a
 # hierarchical route to the class/module, and method name.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/gui.py b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
index a0d9509..53603a4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/gui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
@@ -1,6 +1,6 @@
 #
 # GUI for Update Agent
-# Copyright (c) 1999-2010 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2010 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Authors:
 #    Preston Brown <pbrown at redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py
index 97de80e..b070f00 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py
@@ -1,5 +1,5 @@
 # Client code for Update Agent
-# Copyright (c) 2011--2012 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 2011--2012 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Simon Lukasik
 
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py b/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py
index 01420dc..3dd6359 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py
@@ -1,5 +1,5 @@
 # Client code for Update Agent
-# Copyright (c) 2011--2012 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 2011--2012 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Simon Lukasik
 #
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
index 20abfd5..e89e08b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
@@ -1,7 +1,7 @@
 # some high level utility stuff for rpm handling
 
 # Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Preston Brown <pbrown at redhat.com>
 #         Adrian Likins <alikins at redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/transaction.py b/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
index c5195c0..c0eca49 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
@@ -1,7 +1,7 @@
 
 #
 # Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 #         Adrian Likins <alikins at redhat.com
 #
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 170570d..ae5bdc8 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -1,6 +1,6 @@
 #
 # Client code for Update Agent
-# Copyright (c) 1999--2012 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999--2012 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Preston Brown <pbrown at redhat.com>
 #         Adrian Likins <alikins at redhat.com
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
index 845bdd9..0da6978 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
@@ -1,5 +1,5 @@
 # Client code for Update Agent
-# Copyright (c) 1999--2012 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999--2012 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Preston Brown <pbrown at redhat.com>
 #         Adrian Likins <alikins at redhat.com>
diff --git a/client/rhel/yum-rhn-plugin/actions/errata.py b/client/rhel/yum-rhn-plugin/actions/errata.py
index 03a4bb9..4891483 100644
--- a/client/rhel/yum-rhn-plugin/actions/errata.py
+++ b/client/rhel/yum-rhn-plugin/actions/errata.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPLv2.
 #
 # Author: Adrian Likins <alikins at redhat.com
 #


commit 44ebba4c636796fe12e753ddc25c4799be60a0c8
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:29:44 2012 +0200

    build with python2

diff --git a/client/debian/rhn-client-tools/debian/rules b/client/debian/rhn-client-tools/debian/rules
index 91bf044..b4e3304 100755
--- a/client/debian/rhn-client-tools/debian/rules
+++ b/client/debian/rhn-client-tools/debian/rules
@@ -13,5 +13,5 @@ override_dh_auto_install:
 	$(MAKE) $(params) install
 
 %:
-	dh $@
+	dh $@ --with python2
 


commit 03d1c2d9232f022564b5a563aa7c23a9ca28daae
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:28:30 2012 +0200

    update changelog for python-rhn-client-tools

diff --git a/client/debian/rhn-client-tools/debian/changelog b/client/debian/rhn-client-tools/debian/changelog
index 445740a..b5d9d66 100644
--- a/client/debian/rhn-client-tools/debian/changelog
+++ b/client/debian/rhn-client-tools/debian/changelog
@@ -1,6 +1,6 @@
 python-rhn-client-tools (1.6.41-1) unstable; urgency=low
 
-  * Rebase to upstream version
+  * Initial Debian release
   * 703833 - if /sbin/service is not available, try to use /usr/sbin/service
 
- -- Šimon Lukašík <isimluk at fedoraproject.org>  Mon, 12 Dec 2011 12:53:49 +0200
+ -- Miroslav Suchy <miroslav at suchy.cz>  Fri, 15 Jun 2012 18:17:35 +0200


commit f5449316d2d69ce2b792f5457890db89382ca44f
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:27:05 2012 +0200

    update copyright file for rhn-client-tools

diff --git a/client/debian/rhn-client-tools/debian/copyright b/client/debian/rhn-client-tools/debian/copyright
index c1b899c..9a578ea 100644
--- a/client/debian/rhn-client-tools/debian/copyright
+++ b/client/debian/rhn-client-tools/debian/copyright
@@ -22,23 +22,9 @@ License: GPL-2
  <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
  of the GNU General Public License.
 
-Files: debian/*
-Copyright: Copyright 2011 Šimon Lukašík <xlukas08 at stud.fit.vutbr.cz>
-License: GPL-2
- 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.
- .
- 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.
- .
- See /usr/share/common-licenses/GPL-2, or
- <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
- of the GNU General Public License.
+The Debian packaging is
+    Copyright 2010-2012 by Red Hat Inc.
+    Copyright 2012 Bernd Zeimetz <bzed at debian.org>
+    Copyright 2012 Šimon Lukašík <xlukas08 at stud.fit.vutbr.cz>
+and licensed under the same license as rhnlib, see above
 


commit 6958820cafb1ffb079dff88099a7eae01ead07af
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:11:35 2012 +0200

    pycompat is deprecated

diff --git a/client/debian/rhn-client-tools/debian/pycompat b/client/debian/rhn-client-tools/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/client/debian/rhn-client-tools/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2


commit bb08d4cca7839be5ae1d5a3f80d2b73b59ca47fe
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:06:34 2012 +0200

    dsc file is deprecated, it is build in runtime

diff --git a/client/debian/rhnlib/debian/python-rhnlib.dsc b/client/debian/rhnlib/debian/python-rhnlib.dsc
deleted file mode 100644
index 217c99a..0000000
--- a/client/debian/rhnlib/debian/python-rhnlib.dsc
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: 1.0  
-Source: python-rhnlib 
-Binary: python-rhnlib
-Architecture: all  
-Version: 2.5.27-1
-Maintainer: Miroslav Suchý <miroslav at suchy.cz>
-Homepage: https://fedorahosted.org/spacewalk/
-Standards-Version: 3.7.3 
-Build-Depends: python-all-dev, python-support (>= 0.8), debhelper (>= 7)  
-Checksums-Sha1:   
- 444fe0994b77e6a9cc8a006fd1bcb003115c9091 51389 rhnlib-2.5.27.tar.gz
-Checksums-Sha256:   
- 31394cab7c60f25707c704ff2a1a722e335626ae20fc165db61d20b6be856291 51389 rhnlib-2.5.27.tar.gz
-Files:
- 3b5541a03a0690b26a2691d44076fa81 rhnlib-2.5.27.tar.gz


commit 4ca4cfaeb76b24c41bd4f34b02508f499789902f
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:05:11 2012 +0200

    build it with python2

diff --git a/client/debian/rhnlib/debian/rules b/client/debian/rhnlib/debian/rules
index d581922..e6b3ba2 100755
--- a/client/debian/rhnlib/debian/rules
+++ b/client/debian/rhnlib/debian/rules
@@ -10,16 +10,16 @@
 #export DH_VERBOSE=1
 
 
-override_dh_auto_build:
-	if [ ! -e setup.py ]; then sed -e "s/\@VERSION\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )/" -e 's/\@NAME\@/rhnlib/' setup.py.in > setup.py; fi
+override_dh_auto_configure:
+	if [ ! -e setup.py ]; then sed -e "s/\@VERSION\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )/" -e 's/\@NAME\@/rhn/' setup.py.in > setup.py; fi
 	if [ ! -e setup.cfg ]; then sed 's/\@RELEASE\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f2 -d- )/' setup.cfg.in > setup.cfg; fi
 	dh_auto_configure --buildsystem=python_distutils
 
 clean:
-	if [ -f setup.py ]; then dh --buildsystem=python_distutils $@; fi
+	if [ -f setup.py ]; then dh $@ --with python2 --buildsystem=python_distutils; fi
 	rm -f setup.py setup.cfg
 	rm -rf build
 
 %:
-	dh --buildsystem=python_distutils $@
+	dh $@ --with python2 --buildsystem python_distutils
 


commit 6c9eb4e179d07ac71e776a2a4a51c83cb432551b
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:04:38 2012 +0200

    if python directory is rhn, then package must be python-rhn -- debian policy

diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 0849589..13b5ab6 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -7,7 +7,7 @@ Build-Depends: python (>= 2.6.6-3~), debhelper (>= 7.0.50~)
 Standards-Version: 3.9.3
 Homepage: https://fedorahosted.org/spacewalk
 
-Package: python-rhnlib
+Package: python-rhn
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-openssl
 Description: Python libraries for the RHN project


commit 969ee99aaeeda7ba47b38f74ec0776c3ee56a13c
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:03:24 2012 +0200

    fix build deps

diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 34d163e..0849589 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -2,9 +2,9 @@ Source: rhnlib
 Section: python
 Priority: extra
 Maintainer: Miroslav Suchý <miroslav at suchy.cz>
-Build-Depends: python, debhelper (>= 7.0.50~)
-Build-Depends-Indep: python-support (>= 0.8)
-Standards-Version: 3.9.1
+Uploaders: Bernd Zeimetz <bzed at debian.org>
+Build-Depends: python (>= 2.6.6-3~), debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
 Homepage: https://fedorahosted.org/spacewalk
 
 Package: python-rhnlib


commit dd1e40e023eebd9a12b6141e64e5945b5cc2c205
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 18:02:15 2012 +0200

    when source tar.gz is rhnlib.tar.gz we have to name Source: rhnlib

diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 9af4c79..34d163e 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -1,4 +1,4 @@
-Source: python-rhnlib
+Source: rhnlib
 Section: python
 Priority: extra
 Maintainer: Miroslav Suchý <miroslav at suchy.cz>


commit a3866d1dfa1f7f22ed0f492ad9a8279fe4a42d05
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 17:55:51 2012 +0200

    update copyright information and add debian packaging license

diff --git a/client/debian/rhnlib/debian/copyright b/client/debian/rhnlib/debian/copyright
index 52c8c06..2d21ef7 100644
--- a/client/debian/rhnlib/debian/copyright
+++ b/client/debian/rhnlib/debian/copyright
@@ -1,11 +1,11 @@
-Rhnlib is copyright 2010 by Red Hat Inc.
+Rhnlib is copyright 2010-2012 by Red Hat Inc.
 Rhnlib is currently developed by Spacewalk Development Team <spacewalk-devel at redhat.com>.
 
 License: GPLv2
 
     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.
+    the Free Software Foundation; version 2 of the License.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,3 +19,8 @@ License: GPLv2
 See /usr/share/common-licenses/GPL-2, or
 <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
 of the GNU General Public License.
+
+The Debian packaging is
+    Copyright 2010-2012 by Red Hat Inc.
+    Copyright 2012 Bernd Zeimetz <bzed at debian.org>
+and licensed under the same license as rhnlib, see above.


commit 89480aeffda1b8ec519d7d7ce2f0280341849485
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 17:54:59 2012 +0200

    update changelog

diff --git a/client/debian/rhnlib/debian/changelog b/client/debian/rhnlib/debian/changelog
index e8e9ee3..1c9aa21 100644
--- a/client/debian/rhnlib/debian/changelog
+++ b/client/debian/rhnlib/debian/changelog
@@ -1,6 +1,5 @@
-python-rhnlib (2.5.52-1) unstable; urgency=low
+rhnlib (2.5.52-1) unstable; urgency=low
 
-  * Initial debian release
-
- -- Miroslav Suchy <miroslav at suchy.cz>  Fri, 15 Jun 2012 17:43:13 +0200
+  * Initial release (Closes: #597490)
 
+ -- Bernd Zeimetz <bzed at debian.org>  Fri, 15 Jun 2012 17:25:38 +0200


commit 1d3e1f85b9c7482a0b8bb201b9c194a7f97284bd
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Jun 15 17:21:12 2012 +0200

    update short summary

diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 9185a3a..9af4c79 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -10,7 +10,7 @@ Homepage: https://fedorahosted.org/spacewalk
 Package: python-rhnlib
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-openssl
-Description: Collection of Python modules used by the Spacewalk software
+Description: Python libraries for the RHN project
  Collection of base Python modules used by the Red Hat Network
  (http://rhn.redhat.com) and Spacewalk software.
  This is common library used by both clients and server.


commit 41dae9769939dc812cc9e4105110d12275ec980e
Author: Miroslav Suchy <msuchy at redhat.com>
Date:   Fri Jun 15 17:18:28 2012 +0200

    update debian changelog for rhnlib

diff --git a/client/debian/rhnlib/debian/changelog b/client/debian/rhnlib/debian/changelog
index a265c40..e8e9ee3 100644
--- a/client/debian/rhnlib/debian/changelog
+++ b/client/debian/rhnlib/debian/changelog
@@ -1,6 +1,6 @@
-python-rhnlib (2.5.40-1) unstable; urgency=low
+python-rhnlib (2.5.52-1) unstable; urgency=low
 
-  * Rebased to upstream version
+  * Initial debian release
 
- -- Šimon Lukašík <xlukas08 at stud.fit.vutbr.cz>  Sat, 16 Apr 2011 17:43:13 +0200
+ -- Miroslav Suchy <miroslav at suchy.cz>  Fri, 15 Jun 2012 17:43:13 +0200
 


commit e90390429a3b6d266179057c0c3c71aea6c1c2f9
Author: Miroslav Suchy <msuchy at redhat.com>
Date:   Fri Jun 15 17:14:14 2012 +0200

    python:Provides is depracated

diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 71f580c..9185a3a 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -10,7 +10,6 @@ Homepage: https://fedorahosted.org/spacewalk
 Package: python-rhnlib
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-openssl
-Provides: ${python:Provides}, rhnlib
 Description: Collection of Python modules used by the Spacewalk software
  Collection of base Python modules used by the Red Hat Network
  (http://rhn.redhat.com) and Spacewalk software.


commit ecbc94036abadad70ff2723302bc65ad72430b76
Author: Miroslav Suchy <msuchy at redhat.com>
Date:   Fri Jun 15 17:08:50 2012 +0200

    Changelog is not needed and copyright is not allowed

diff --git a/client/debian/rhnlib/debian/docs b/client/debian/rhnlib/debian/docs
index 70cfe37..724e084 100644
--- a/client/debian/rhnlib/debian/docs
+++ b/client/debian/rhnlib/debian/docs
@@ -1,4 +1,2 @@
-ChangeLog
-copyright
 README
 TODO


commit 8594a4127db1ca232e25622f9698ff233ab77f84
Author: Miroslav Suchy <msuchy at redhat.com>
Date:   Fri Jun 15 17:14:43 2012 +0200

    pycompat is depracated

diff --git a/client/debian/rhnlib/debian/pycompat b/client/debian/rhnlib/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/client/debian/rhnlib/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2




More information about the spacewalk-commits mailing list