Rename squeeze -> wheezy.

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index df3da5e..5639ddb 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -20,15 +20,15 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../templates:1001
-msgid "CARNet Debian 6.0 (squeeze) nadogradnja"
+msgid "CARNet Debian 7 (wheezy) nadogradnja"
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../templates:1001
 msgid ""
-"Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian 5.0 "
-"(lenny) na CARNet Debian 6.0 (squeeze)."
+"Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian 6 "
+"(squeeze) na CARNet Debian 7 (wheezy)."
 msgstr ""
 
 #. Type: note

diff --git a/debian/templates b/debian/templates
index 7c0d6d4..e95e672 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -1,8 +1,8 @@
 Template: carnet-upgrade/short-instructions
 Type: note
-_Description: CARNet Debian 6.0 (squeeze) nadogradnja
+_Description: CARNet Debian 7 (wheezy) nadogradnja
  Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian
- 5.0 (lenny) na CARNet Debian 6.0 (squeeze).
+ 6 (squeeze) na CARNet Debian 7 (wheezy).
  .
  Prije pocetka nadogradnje napravite backup cijelog sustava i
  procitajte dokumentaciju u /usr/share/doc/carnet-upgrade/ ili na
@@ -13,4 +13,4 @@ _Description: CARNet Debian 6.0 (squeeze) nadogradnja
  100 MB slobodnog mjesta na / particiji procitajte upute na webu: 
  http://sistemac.carnet.hr/node/795
  .
- Nadogradnju pokrenite kao root sa 'carnet-upgrade'.
+ Nadogradnju pokrenite kao root naredbom 'carnet-upgrade'.

diff --git a/doc/carnet-upgrade-src.sgml b/doc/carnet-upgrade-src.sgml
index ee5ceda..4f7aaaa 100644 (file)
--- a/doc/carnet-upgrade-src.sgml
+++ b/doc/carnet-upgrade-src.sgml
@@ -3,7 +3,7 @@
   <book>
 
     <titlepag>
-      <title>CARNet Debian 6.0 (squeeze) nadogradnja</title>
+      <title>CARNet Debian 7 (wheezy) nadogradnja</title>
       <author>
         <name>Grupa za izradu paketa</name>
         <email>paketi@carnet.hr</email>
@@ -11,16 +11,16 @@
       <version>Verzija %PKG_VERSION%</version>
 
       <abstract>
-        CARNet Debian <em>squeeze</em> je peta generacija CARNet Debian
-        distribucije i temelji se na Debian GNU/Linux <em>squeeze</em>.
+        CARNet Debian <em>wheezy</em> je šesta generacija CARNet Debian
+        distribucije i temelji se na Debian GNU/Linux <em>wheezy</em>.
         Ovaj priručnik opisuje postupak nadogradnje CARNet Debian
-        distribucije sa inačice 5.0 <em>lenny</em> na inačicu 6.0
-        <em>squeeze</em>.  Priručnik je zamišljen kao pomoć CARNetovim
+        distribucije sa inačice 6 <em>squeeze</em> na inačicu 7
+        <em>wheezy</em>.  Priručnik je zamišljen kao pomoć CARNetovim
         sistem inženjerima koji na svojim poslužiteljima imaju instaliran
         CARNet Debian i trebao bi obuhvatiti cjelokupan postupak
         nadogradnje, kao i tipične probleme na koje se može naići. Za tu
         svrhu pripremili smo paket <package>carnet-upgrade</package> inačice
-        6.0, koji se nalazi na CARNetovom FTP poslužitelju u <em>lenny</em>
+        7, koji se nalazi na CARNetovom FTP poslužitelju u <em>lenny</em>
         repozitoriju paketa.
       </abstract>
     </titlepag>
@@ -133,8 +133,8 @@
       <sect>
         <heading>Prije početka</heading>
         <p>
-        Prije nadogradnje na <em>squeeze</em> distribuciju, potrebno je
-        izvršiti nadogradnju <em>lenny</em> distribucije na najsvježije
+        Prije nadogradnje na <em>wheezy</em> distribuciju, potrebno je
+        izvršiti nadogradnju <em>squeeze</em> distribucije na najsvježije
         pakete. To se najjednostavnije izvodi naredbom <prgn>apt-get</prgn>:
 
 <example>
@@ -420,7 +420,7 @@ CN: run_actions (main) started...
 
         <p>
         Slijedi instalacija <file>/etc/apt/sources.list</file> datoteke
-        podešene za CARNet Debian <em>squeeze</em> i osvježavanje baze paketa.
+        podešene za CARNet Debian <em>wheezy</em> i osvježavanje baze paketa.
         Eventualne dodatne repozitorije nakon nadogradnje možete kopirati iz
         stare <file>sources.list</file> datoteke, koja će biti spremljena
         kao <file>/etc/apt/sources.list.cn6-upgrade</file>.
@@ -432,15 +432,15 @@ CN: run_actions (main) started...
 | Novi sadrzaj datoteke /etc/apt/sources.list:                    |
 |                                                                 |
 | # See sources.list(5) for more information                      |
-| deb http://ftp.hr.debian.org/debian/ squeeze main contrib non-fr|
-| deb http://ftp.hr.debian.org/debian/ squeeze-updates main contri|
-| deb http://security.debian.org/ squeeze/updates main contrib non|
+| deb http://ftp.hr.debian.org/debian/ wheezy main contrib non-fr|
+| deb http://ftp.hr.debian.org/debian/ wheezy-updates main contri|
+| deb http://security.debian.org/ wheezy/updates main contrib non|
 |                                                                 |
 | # CARNet Debian Linux                                           |
-| deb http://ftp.carnet.hr/carnet-debian/ carnet-squeeze main non-|
+| deb http://ftp.carnet.hr/carnet-debian/ carnet-wheezy main non-|
 |                                                                 |
 | # SRCE AAI@EduHr                                                |
-| deb http://ftp.srce.hr/srce-debian/ srce-squeeze main           |
+| deb http://ftp.srce.hr/srce-debian/ srce-wheezy main           |
 |                                                                 |
 +-----------------------------------------------------------------+
 |                           < U redu >                            |

diff --git a/files/etc/apt/sources.list.template b/files/etc/apt/sources.list.template
index 4950d82..63a5454 100644 (file)
--- a/files/etc/apt/sources.list.template
+++ b/files/etc/apt/sources.list.template
@@ -1,17 +1,17 @@
 # See sources.list(5) for more information
-deb http://ftp.hr.debian.org/debian/ squeeze main contrib non-free
-deb http://ftp.hr.debian.org/debian/ squeeze-updates main contrib non-free
-deb http://security.debian.org/ squeeze/updates main contrib non-free
+deb http://ftp.hr.debian.org/debian/ wheezy main contrib non-free
+deb http://ftp.hr.debian.org/debian/ wheezy-updates main contrib non-free
+deb http://security.debian.org/ wheezy/updates main contrib non-free
 
 # CARNet Debian Linux
-deb http://ftp.carnet.hr/carnet-debian/ carnet-squeeze main non-free
+deb http://ftp.carnet.hr/carnet-debian/ carnet-wheezy main non-free
 
 # SRCE AAI@EduHr
-deb http://ftp.srce.hr/srce-debian/ srce-squeeze main
+deb http://ftp.srce.hr/srce-debian/ srce-wheezy main
 
 # Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.hr.debian.org/debian/ squeeze main contrib non-free
-#deb-src http://ftp.hr.debian.org/debian/ squeeze-updates main contrib non-free
-#deb-src http://security.debian.org/ squeeze/updates main contrib non-free
-#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-squeeze main non-free
-#deb-src http://ftp.srce.hr/srce-debian/ srce-squeeze main
+#deb-src http://ftp.hr.debian.org/debian/ wheezy main contrib non-free
+#deb-src http://ftp.hr.debian.org/debian/ wheezy-updates main contrib non-free
+#deb-src http://security.debian.org/ wheezy/updates main contrib non-free
+#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-wheezy main non-free
+#deb-src http://ftp.srce.hr/srce-debian/ srce-wheezy main

diff --git a/src/actions/upgrade.queue b/src/actions/upgrade.queue
index 5215f5e..96a9062 100644 (file)
--- a/src/actions/upgrade.queue
+++ b/src/actions/upgrade.queue
@@ -1,4 +1,4 @@
-# akcije za update squeeze instalacije, slicno post_upgrade
+# akcije za update instalacije, slicno post_upgrade
 # veci broj paketa koji se ne daju upgradeati s obicnim
 # apt-get upgrade se forsirano upgradea
 true                           check_services preupgrade       # spremi stanje

diff --git a/src/data.sh b/src/data.sh
index ae05bbd..5ad74e4 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -37,7 +37,7 @@ webalizer-cn  2.01.10-32.4lenny1
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-squeeze/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-wheezy/main/binary-i386/Packages'
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.

diff --git a/src/messages.sh b/src/messages.sh
index 23ea728..0e389f6 100644 (file)
--- a/src/messages.sh
+++ b/src/messages.sh
@@ -91,16 +91,16 @@ Koristenje: $(basename $0) [<akcija>] | -h | --help
 
 <akcija> moze biti:
   - main 
-         izvrsava potpunu proceduru za nadogradnju sa CARNet Debian 5.x (lenny)
-         na CARNet Debian 6.x (squeeze) distribuciju.  Ovo je pretpostavljena
+         izvrsava potpunu proceduru za nadogradnju sa CARNet Debian 6 (squeeze)
+         na CARNet Debian 7 (wheezy) distribuciju.  Ovo je pretpostavljena
          vrijednost.
          
   - post_upgrade
          izvrsava samo one akcije iz procedure za nadogradnju koje dolaze
          nakon apt-get dist-upgrade.
 
-  - squeeze
-         izvrsava akcije podobne za CARNet Debian 6.x (squeeze) instalaciju.
+  - wheezy
+         izvrsava akcije podobne za CARNet Debian 7 (wheezy) instalaciju.
          
   - new
          izvrsava samo akcije koje su dodane u ovoj inacici.