Browse Source

some robbery from upstream

master
Alf Gaida 3 years ago
parent
commit
53767200a7
5 changed files with 35 additions and 3 deletions
  1. 11
    0
      next-xfce
  2. 15
    0
      pyfll/debian/changelog
  3. 6
    0
      pyfll/pyfll
  4. 1
    1
      pyfll/setup.py
  5. 2
    2
      xperimental-nox

+ 11
- 0
next-xfce View File

@@ -0,0 +1,11 @@
1
+#!/bin/bash
2
+
3
+## defaults
4
+options="-vv "
5
+confpath="./pyfll/conf/"
6
+flavour=xfce
7
+release=next
8
+arch=amd64
9
+aptcache="-t http://192.168.150.41:3142"
10
+
11
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 

+ 15
- 0
pyfll/debian/changelog View File

@@ -148,6 +148,21 @@ pyfll (2013.02) UNRELEASED; urgency=low
148 148
   * gnome-desktop: disable f-spot and epiphany-extensions.
149 149
   * add apt-transport-https.
150 150
   * s/kgamma/kgamma5/.
151
+  * s/iceweasel/firefox/, prefer the non-ESR variants.
152
+  * drop nbd support for the time being.
153
+  * fix F.U.L.L.S.T.O.R.Y. homepage URL.
154
+  * s/epdfview/mupdf/.
155
+  * add thermald, which improves the cpufreq scaling on pstate enabled CPUs.
156
+  * ensure that the target directory exists, before trying to write a file
157
+    from pyfll.
158
+  * no longer clobber /etc/network/interfaces, ifupdown >= 0.7.50 takes care
159
+    of creating a loopback interface in the absence of an explicit
160
+    configuration stanza for lo and the default template is sufficient for
161
+    Ceni.
162
+  * fluxbox: add a simple x-terminal-emulator, rxvt-unicode-lite.
163
+  * minimal-x: add slim as display manager.
164
+  * add xserver-xorg-input-all and xserver-xorg-video-all to the automated
165
+    recommends handling.
151 166
 
152 167
  -- Niall Walsh <niallwalsh@celtux.org>  Tue, 09 Jun 2015 18:49:51 +0100
153 168
 

+ 6
- 0
pyfll/pyfll View File

@@ -1199,6 +1199,12 @@ class FLLBuilder(object):
1199 1199
             fn = os.path.join(chroot, file.lstrip('/'))
1200 1200
             if os.path.isfile(fn):
1201 1201
                 mode = None
1202
+            if not os.path.exists(os.path.dirname(fn)):
1203
+                try:
1204
+                    os.makedirs(os.path.dirname(fn), 0755)
1205
+                except OSError as exc:
1206
+                    if exc.errno != errno.EEXIST:
1207
+                        raise
1202 1208
             f = open(fn, 'w')
1203 1209
             self.log.debug('writing file: %s' % file)
1204 1210
             if file == '/etc/default/distro':

+ 1
- 1
pyfll/setup.py View File

@@ -15,7 +15,7 @@ setup(
15 15
     author_email='kel@otaku42.de',
16 16
     license='GPL-2',
17 17
     description='FULLSTORY live linux media mastering utility',
18
-    url='http://developer.berlios.de/projects/fullstory/',
18
+    url='https://github.com/fullstory/',
19 19
     scripts=['fll'],
20 20
     data_files=[
21 21
         ('/usr/share/fll/', fll_prog),

+ 2
- 2
xperimental-nox View File

@@ -1,11 +1,11 @@
1 1
 #!/bin/bash
2 2
 
3 3
 ## defaults
4
-options="-vv "
4
+options="-vvv -P "
5 5
 confpath="./pyfll/conf/"
6 6
 flavour=nox
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
9
+#aptcache="-t http://192.168.150.41:3142"
10 10
 
11 11
 time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 

Loading…
Cancel
Save