some cleanup

.gitignore

@@ -2,25 +2,6 @@
 *~
 *.save
 
-## ignored package stuff
-/*/*.build
-/*/*.changes
-/*/*.deb
-/*/*.dsc
-/*/*.tar.xz
-/*/*.tar.bz2
-/*/*.upload
-
-
 # ignored debian $foo
-/*/*/debian/thunderstruck-*/
-/*/*/debian/paintitblack-*/
-/*/*/debian/whiteroom-*/
-
-/*/*/debian/files
-/*/*/debian/debhelper-build-stamp
-/*/*/debian/*.debhelper
-/*/*/debian/*.log
-/*/*/debian/*.substvars
-/*/*/debian/tmp
+/debian
 

bootstrap

@@ -2,7 +2,7 @@
 set -e
 
 
-. templates/functions.sh
+source ./functions.sh
 
 source_version_info
 debian_changelog
@@ -12,48 +12,59 @@ debian_foo_basics
 basic_control lightdm
 debian_rules
 
-# lightdm
-# ==============
-[ -d lightdm ] && rm -r lightdm
-cp -a templates/lightdm .
+# debian
 
+sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
+    -e "s/\@FLAVOUR\@/${FLAVOUR}/g" \
+    ./debtemplate/copyright \
+    > ./debian/copyright
+
+sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
+    -e "s/\@DISPLAY\@/${DISPLAY}/g" \
+    ./debtemplate/get-template \
+    > ./debian/get-template
+chmod 755 ./debian/get-template
 
 ## GTK
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/debian/lightdm-gtk-settings.install \
-    > debian/${CODENAME_SAFE}-lightdm-gtk-settings.install
+    ./debtemplate/gtk-settings.install \
+    > ./debian/${CODENAME_SAFE}-lightdm-gtk-settings.install
+
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/debian/lightdm-gtk-settings.postinst \
-    > debian/${CODENAME_SAFE}-lightdm-gtk-settings.postinst
+    ./debtemplate/gtk-settings.postinst \
+    > ./debian/${CODENAME_SAFE}-lightdm-gtk-settings.postinst
+
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/debian/lightdm-gtk-settings.prerm \
-    > debian/${CODENAME_SAFE}-lightdm-gtk-settings.prerm
+    ./debtemplate/gtk-settings.prerm \
+    > ./debian/${CODENAME_SAFE}-lightdm-gtk-settings.prerm
 
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/lightdm/lightdm-gtk-greeter.conf \
-    > lightdm/lightdm-gtk-greeter.conf
+    ./template/gtk-greeter.conf \
+    > ./lightdm-gtk-greeter.conf
 
 ## KDE
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/debian/lightdm-kde-settings.install \
-    > debian/${CODENAME_SAFE}-lightdm-kde-settings.install
+    ./debtemplate/kde-settings.install \
+    > ./debian/${CODENAME_SAFE}-lightdm-kde-settings.install
+
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/debian/lightdm-kde-settings.postinst \
-    > debian/${CODENAME_SAFE}-lightdm-kde-settings.postinst
+    ./debtemplate/kde-settings.postinst \
+    > ./debian/${CODENAME_SAFE}-lightdm-kde-settings.postinst
+
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/debian/lightdm-kde-settings.prerm \
-    > debian/${CODENAME_SAFE}-lightdm-kde-settings.prerm
+    ./debtemplate/kde-settings.prerm \
+    > ./debian/${CODENAME_SAFE}-lightdm-kde-settings.prerm
 sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
     -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-    templates/lightdm/lightdm-kde-greeter.conf \
-    > lightdm/lightdm-kde-greeter.conf
+    ./template/lightdm-kde-greeter.conf \
+    > lightdm-kde-greeter.conf
 
 
 exit 0

debtemplate/lightdm-control → debtemplate/control

@@ -7,10 +7,9 @@ Uploaders: Torsten Wohlfarth <towo@siduction.org>,
 Build-Depends: debhelper (>= 9),
                dh-systemd
 Standards-Version: 3.9.8
-Homepage: http://bugs.siduction.org/projects/siduction-settings
-Vcs-Git: git://git.siduction.org/code/siduction-settings.git
-Vcs-Browser: http://git.siduction.org/?p=code/siduction-settings.git;a=summary
-
+Homepage: https://git.siduction.org/extra/settings-@FLAVOUR@
+Vcs-Git: https://git.siduction.org/extra/settings-@FLAVOUR@.git
+Vcs-Browser: https://git.siduction.org/extra/settings-@FLAVOUR@.git
 
 Package: @CODENAME_SAFE@-@FLAVOUR@-gtk-settings
 Architecture: all
@@ -18,7 +17,7 @@ Pre-Depends: lightdm,
              lightdm-gtk-greeter
 Depends: ${misc:Depends}
 Description: @DISPLAY@ GTK settings in installed mode
- add description here
+ Meta-Package add description here
 
 Package: @CODENAME_SAFE@-@FLAVOUR@-gtk-livesettings
 Architecture: all
@@ -30,14 +29,14 @@ Depends: ${misc:Depends}
 Description: @DISPLAY@ GTK settings in live mode
  Meta-Package
 
-# LightDM KDE
+
 Package: @CODENAME_SAFE@-@FLAVOUR@-kde-settings
 Architecture: all
 Pre-Depends: lightdm,
              lightdm-kde-greeter
 Depends: ${misc:Depends}
 Description: @DISPLAY@ GTK settings in installed mode
- add description here
+ Meta-Package add description here
 
 Package: @CODENAME_SAFE@-@FLAVOUR@-kde-livesettings
 Architecture: all
@@ -47,4 +46,4 @@ Pre-Depends: libpam-systemd,
              @CODENAME_SAFE@-lightdm-kde-settings
 Depends: ${misc:Depends}
 Description: @DISPLAY@ KDE settings in live mode
- add description here
+ Meta-Package add description here

debtemplate/copyright

@@ -1,95 +1,20 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: siduction-settings
-Source: http://git.siduction.org/?p=code/siduction-settings.git;a=summary
+Upstream-Name: settings-@FLAVOUR@
+Source: https://git.siduction.org/extra/settings-@FLAVOUR@.git
 
-
-Files: TODO VERSION
-Copyright: 2014-2015 Alf Gaida <agaida@siduction.org>
-License: GPL-2.0+
-
-
-Files: debian/*
-Copyright: 2012-2015 Alf Gaida <agaida@siduction.org>
+Files: *
+Copyright: 2012-2016 Alf Gaida <agaida@siduction.org>
            2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-           2011-2012 Torsten Wohlfarth <towo@siduction.org>
 License: GPL-2.0
 
+Files: debian/*
+Copyright: 2012-2016 Alf Gaida <agaida@siduction.org>
+License: GPL-2.0
 
-Files: common/*
-Copyright: 2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-           2013-2015 Alf Gaida <agaida@siduction.org>
-           2011-2012 Torsten Wohlfarth <towo@siduction.org>
-           2008-2010 Stefan Lippers-Hollmann <s.l-h@gmx.de>
-           2007-2008 Kel Modderman <kel@otaku42.de>
-           2006-2010 Bernard Gray <bernard.gray@gmail.com>
-License: GPL-3.0+
-
-
-Files: gdm3/*
-Copyright: 2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-           2013-2015 Alf Gaida <agaida@siduction.org>
-License: GPL-3.0+
-
-Files: lightdm/*
-Copyright: 2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-           2013-2015 Alf Gaida <agaida@siduction.org>
-License: GPL-3.0+
-
-
-Files: cinnamon/*
-Copyright: 2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-           2013-2015 Alf Gaida <agaida@siduction.org>
-License: GPL-3.0+
-
-Files: gnome/*
-Copyright: 2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-           2013-2015 Alf Gaida <agaida@siduction.org>
-License: GPL-3.0+
-
-Files: kde/*
-Copyright: 2012-2015 Alf Gaida <agaida@siduction.org>
-           2011-2012 Ferdinand Thommes <devil@siduction.org>
-           2007-2010 Stefan Lippers-Hollmann <s.l-h@gmx.de>
-           2007-2009 Bernard Gray <bernard.gray@gmail.com>
-           2007-2009 Kel Modderman <kel@otaku42.de>
-License: GPL-3.0+
-
-Files: lxde/*
-Copyright: 2012-2015 Alf Gaida <agaida@siduction.org>
-           2012      Markus Meyer <coruja@siduction.org>
-License: GPL-3.0+
-
-Files: lxqt/*
-Copyright: 2014-2015 Alf Gaida <agaida@siduction.org>
-License: GPL-3.0+
-
-Files: mate/*
-Copyright: 2012-2015 Ovidiu Angelescu <convbsd@siduction.net>
-License: GPL-3.0+
-
-Files: nox/*
-Copyright: 2012-2015 Alf Gaida <agaida@siduction.org>
-           2012      Ferdinand Thommes <devil@siduction.org>
-License: GPL-3.0+
-
-Files: xfce/*
-Copyright: 2012-2015 Alf Gaida <agaida@siduction.org>
-           2011-2014 Torsten Wohlfarth <towo@siduction.org>
-           2008-2010 Stefan Lippers-Hollmann <s.l-h@gmx.de>
-           2008      Kel Modderman <kel@otaku42.de>
-           2006-2010 Bernard Gray <bernard.gray@gmail.com>
-License: GPL-3.0+
-
-Files: xorg/*
-Copyright: 2012-2015 Alf Gaida <agaida@siduction.org>
-           2011-2014 Torsten Wohlfarth <towo@siduction.org>
-License: GPL-3.0+
-
-License: GPL-2.0+
+License: GPL-2.0
  This package 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 package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -101,20 +26,3 @@ License: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: GPL-3.0+
- 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 3 of the License, or
- (at your option) any later version.
- .
- This package 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, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debtemplate/get-template

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Copyright 2016 Alf Gaida <agaida@siduction.org>
+# License: WTFPL-2
+
+source VERSION
+
+[ -d ./debtemplate ] && rm -rf debtemplate
+
+git checkout templates -- bootstrap
+git checkout templates -- debtemplate
+git checkout templates -- functions.sh
+git checkout templates -- template
+
+[ -f ./debian/rules ] && ./bootstrap && echo 'Bootstrap first run ...'
+[ ! -f ./debian/rules ] && ./bootstrap && echo 'Bootstrap second run ...'
+
+[ -f ./debian/rules ] && rm -f bootstrap
+[ -f ./debian/rules ] && rm -rf debtemplate
+[ -f ./debian/rules ] && rm -f functions.sh
+[ -f ./debian/rules ] && rm -rf template
+
+
+[ ! -f ./debian/rules ] && echo 'Something went wrong, debian/rules not created! Check bootstrap!'
+
+git add .

functions.sh

@@ -56,8 +56,8 @@ function debian_changelog {
             -e "s/\@VERSION\@/${VERSION}/g" \
             -e "s/\@FLAVOUR\@/${FLAVOUR}/g" \
             -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-            templates/debian/changelog \
-            > debian/changelog
+            ./debtemplate/changelog \
+            > ./debian/changelog
     fi
 }
 
@@ -70,22 +70,22 @@ function basic_control {
         -e "s/\@VERSION\@/${VERSION}/g" \
         -e "s/\@FLAVOUR\@/${FLAVOUR}/g" \
         -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-        templates/debian/${1}-control \
-        > debian/control
+        ./debtemplate/control \
+        > ./debian/control
 }
 
 
 # grub template
 # =============
 function grub_template {
-    mkdir -p ${1}/etc/default/grub.d
+    mkdir -p ./etc/default/grub.d
     sed -e "s/\@CODENAME_SAFE\@/${CODENAME_SAFE}/g" \
         -e "s/\@DISTRIBUTION\@/${DISTRIBUTION}/g" \
         -e "s/\@VERSION\@/${VERSION}/g" \
         -e "s/\@FLAVOUR\@/${1}/g" \
         -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-        templates/grub/template.cfg \
-        > ${1}/etc/default/grub.d/siduction.cfg
+        ./template/etc/default/grub.d/siduction.cfg \
+        > ./etc/default/grub.d/siduction.cfg
 }
 
 
@@ -97,14 +97,17 @@ function debian_rules {
         -e "s/\@VERSION\@/${VERSION}/g" \
         -e "s/\@FLAVOUR\@/${FLAVOUR}/g" \
         -e "s/\@DISPLAY\@/${DISPLAY}/g" \
-        templates/debian/rules \
-        > debian/rules
+        ./debtemplate/rules \
+        > ./debian/rules
     chmod 755 debian/rules
 }
 
-# debian foo basics
+
+# debian_foo_basics
+# =================
 function debian_foo_basics {
-    cp -a templates/debian/source debian
-    cp    templates/debian/compat debian
+    mkdir -p ./debian/source
+    echo 1.0 > ./debian/source/format
+    echo 9   > ./debian/compat
 }